From b00ef832ca21e52617e9b5efe379d896221e8584 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 10 Sep 2023 08:19:07 +0200 Subject: [PATCH 1/3] Now llvm-16 is built everywhere, add spirv --- debian/changelog | 8 ++++++-- debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3a4ea10a..4bd4dfed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -llvm-toolchain-16 (1:16.0.6-14) UNRELEASED; urgency=medium +llvm-toolchain-16 (1:16.0.6-14) unstable; urgency=medium + [ Sylvestre Ledru ] * On bionic & buster, for apt.llvm.org, pass -DLLVM_ENABLE_ZSTD=OFF as libzstd is too old - -- Sylvestre Ledru Fri, 08 Sep 2023 17:26:20 +0200 + [ Gianfranco Costamagna ] + * Add i386 and mips64el to spirv architectures. + + -- Gianfranco Costamagna Sun, 10 Sep 2023 08:14:36 +0200 llvm-toolchain-16 (1:16.0.6-13) unstable; urgency=medium diff --git a/debian/control b/debian/control index c08a065d..bd8fbba0 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] | hello [!i386], + llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], libcurl4-openssl-dev | libcurl-dev, diff --git a/debian/control.in b/debian/control.in index d390d38a..6df959fa 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-16 [ amd64 arm64 armel armhf ppc64el riscv64 s390x ] | hello [!i386], + llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], libcurl4-openssl-dev | libcurl-dev, From 9467550d9170c2f2068a88fc767eae59a1bc717a Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 10 Sep 2023 08:23:15 +0200 Subject: [PATCH 2/3] Don't depend on spirv, the version 16 is too old to work [2747/2769] cd "/<>/libclc/build" && "/<>/build-llvm/tools/clang/stage2-bins/bin/opt" -o builtins.opt.spirv-mesa3d-.bc builtins.link.spirv-mesa3d-.bc [2748/2769] cd "/<>/libclc/build" && /usr/bin/llvm-spirv-16 --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc FAILED: spirv-mesa3d-.spv /<>/libclc/build/spirv-mesa3d-.spv cd "/<>/libclc/build" && /usr/bin/llvm-spirv-16 --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc Not implemented! UNREACHABLE executed at ./lib/SPIRV/SPIRVWriter.cpp:477! PLEASE submit a bug report to https://github.com/llvm/llvm-project/issues/ and include the crash backtrace. Stack dump: 0. Program arguments: /usr/bin/llvm-spirv-16 --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc Stack dump without symbol names (ensure you have llvm-symbolizer in your PATH or set the environment var `LLVM_SYMBOLIZER_PATH` to point to it): 0 libLLVM-16.so.1 0x00007fd129ae9be6 llvm::sys::PrintStackTrace(llvm::raw_ostream&, int) + 54 1 libLLVM-16.so.1 0x00007fd129ae7e30 llvm::sys::RunSignalHandlers() + 80 2 libLLVM-16.so.1 0x00007fd129aea3bb 3 libc.so.6 0x00007fd128720510 4 libc.so.6 0x00007fd12876e0fc 5 libc.so.6 0x00007fd128720472 gsignal + 18 6 libc.so.6 0x00007fd12870a4b2 abort + 211 7 libLLVM-16.so.1 0x00007fd129a31a30 LLVMInstallFatalErrorHandler + 0 8 libLLVMSPIRVLib.so.16 0x00007fd1303695af 9 libLLVMSPIRVLib.so.16 0x00007fd13036c630 10 libLLVMSPIRVLib.so.16 0x00007fd13036ca2f 11 libLLVMSPIRVLib.so.16 0x00007fd13036f66e 12 libLLVMSPIRVLib.so.16 0x00007fd13037311f 13 libLLVMSPIRVLib.so.16 0x00007fd1303734b7 14 libLLVMSPIRVLib.so.16 0x00007fd13037363a 15 libLLVMSPIRVLib.so.16 0x00007fd1303737b1 16 libLLVMSPIRVLib.so.16 0x00007fd130352d4e 17 llvm-spirv-16 0x0000564c5c1d6cd0 18 libc.so.6 0x00007fd12870b6ca 19 libc.so.6 0x00007fd12870b785 __libc_start_main + 133 20 llvm-spirv-16 0x0000564c5c1d73d1 Aborted [2749/2769] cd "/<>/libclc/build" && "/<>/build-llvm/tools/clang/stage2-bins/bin/opt" -O3 -o builtins.opt.cedar-r600--.bc builtins.link.cedar-r600--.bc [2750/2769] cd "/<>/libclc/build" && "/<>/build-llvm/tools/clang/stage2-bins/bin/opt" -O3 -o builtins.opt.cayman-r600--.bc builtins.link.cayman-r600--.bc --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 4b8ec767..ba78b466 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], +# llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], libcurl4-openssl-dev | libcurl-dev, diff --git a/debian/control.in b/debian/control.in index 6df959fa..43f5aae9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], +# llvm-spirv-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], libcurl4-openssl-dev | libcurl-dev, From b6d28f83468404404dd8837a561e88af9eacad8b Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sun, 10 Sep 2023 08:49:46 +0200 Subject: [PATCH 3/3] Update changelog --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5009b132..d4ae8966 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium + [ Gianfranco Costamagna ] + * Don't depend on spirv, the version 16 is too old to work + + [ Sylvestre Ledru ] * Also ignore "-mbranch-protection=standard" (used on arm64) -- Sylvestre Ledru Fri, 08 Sep 2023 13:49:38 +0200