From fe53b80fb8a39f773b574eedf0a14cfdac3e5411 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 11 Aug 2021 13:10:34 +0200 Subject: [PATCH 01/11] Add symbol clang_CompileCommand_getNumMappedSources to libclang --- debian/changelog | 6 ++++++ debian/libclang1-X.Y.symbols.in | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 335372d2..41f6f07a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-13 (1:13~++20210731010128+6eaf46beb462-1~exp2) experimental; urgency=medium + + * Add symbol clang_CompileCommand_getNumMappedSources to libclang + + -- + llvm-toolchain-13 (1:13~++20210731010128+6eaf46beb462-1~exp1) experimental; urgency=medium * Branching of snapshot into 13 diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index f16b3ea1..4b13e9a8 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -41,6 +41,7 @@ libclang-@LLVM_VERSION@.so.13 libclang1-@LLVM_VERSION@ #MINVER# clang_CompileCommand_getMappedSourceContent@LLVM_13 1:5.0~svn298832-1~ clang_CompileCommand_getMappedSourcePath@LLVM_13 1:5.0~svn298832-1~ clang_CompileCommand_getNumArgs@LLVM_13 1:5.0~svn298832-1~ + clang_CompileCommand_getNumMappedSources@LLVM_13 1:13.0.0~++20210811042606+b33de5411594-1~ clang_CompileCommands_dispose@LLVM_13 1:5.0~svn298832-1~ clang_CompileCommands_getCommand@LLVM_13 1:5.0~svn298832-1~ clang_CompileCommands_getSize@LLVM_13 1:5.0~svn298832-1~ From f572d3695eceeeaf897631c3c12679dc00190c57 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 9 Jul 2021 11:42:10 -0700 Subject: [PATCH 02/11] libclc: Include libclc spir-v outputs (used by Mesa opencl) This adds the following to the libclc-12 package: /usr/lib/clc/spirv64-mesa3d-.spv /usr/lib/clc/spirv-mesa3d-.spv Signed-off-by: Jordan Justen --- debian/changelog | 4 ++++ debian/control | 3 ++- debian/libclc-X.Y.install.in | 1 + debian/patches/libclc-llvm-spirv.diff | 13 +++++++++++++ debian/patches/series | 2 ++ debian/rules | 22 +++++++++++++++++++++- 6 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 debian/patches/libclc-llvm-spirv.diff diff --git a/debian/changelog b/debian/changelog index 7facbc21..8aa9764f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-12 (1:12.0.1-4) UNRELEASED; urgency=medium + [ Sylvestre Ledru ] * Make libunwind-dev depends on libunwind * Don't build libunwind on hurd, armel, powerpc & mipsel + [ Jordan Justen ] + * libclc: Include libclc spir-v outputs (used by Mesa opencl) + -- Sylvestre Ledru Sun, 08 Aug 2021 10:58:54 +0200 llvm-toolchain-12 (1:12.0.1-3) unstable; urgency=medium diff --git a/debian/control b/debian/control index 9ce586c5..52dc92ac 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,8 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, ocaml-findlib [amd64 arm64 armhf ppc64el s390x], libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev + libpfm4-dev [linux-any], python3-setuptools, libz3-dev, + llvm-spirv, spirv-tools Build-Conflicts: oprofile, ocaml Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ diff --git a/debian/libclc-X.Y.install.in b/debian/libclc-X.Y.install.in index 36023694..679ba86f 100644 --- a/debian/libclc-X.Y.install.in +++ b/debian/libclc-X.Y.install.in @@ -1 +1,2 @@ usr/lib/clc/*.bc +usr/lib/clc/*.spv diff --git a/debian/patches/libclc-llvm-spirv.diff b/debian/patches/libclc-llvm-spirv.diff new file mode 100644 index 00000000..d6a57203 --- /dev/null +++ b/debian/patches/libclc-llvm-spirv.diff @@ -0,0 +1,13 @@ +diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt +index b8b5ceff086c..5964468358f2 100644 +--- a/libclc/CMakeLists.txt ++++ b/libclc/CMakeLists.txt +@@ -95,7 +95,7 @@ find_program( LLVM_CLANG clang PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) + find_program( LLVM_AS llvm-as PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) + find_program( LLVM_LINK llvm-link PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) + find_program( LLVM_OPT opt PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) +-find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) ++find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_BINDIR}) + + # Print toolchain + message( "clang: ${LLVM_CLANG}" ) diff --git a/debian/patches/series b/debian/patches/series index 11663d97..aa6a7590 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -144,3 +144,5 @@ lld-use-link-atomic-i386.diff D99501-ignore-lto-auto.diff scan-build-py-fix-analyze-path.diff scan-build-py-fix-default-bin.diff + +libclc-llvm-spirv.diff diff --git a/debian/rules b/debian/rules index 3cf10352..5d083797 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,7 @@ endif VENDOR=$(shell lsb_release -is) DISTRO=$(shell lsb_release -sc) +DISTRO_RELEASE=$(shell lsb_release -sr) DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') @@ -132,6 +133,25 @@ else control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev' endif +ENABLE_SPRIV = yes +# Disable spirv on Debian older than bullseye (11) +ifeq ($(shell dpkg-vendor --is Debian && echo yes),yes) +ifeq ($(shell dpkg --compare-versions $(DISTRO_RELEASE) lt 11 ; echo $$?),0) + ENABLE_SPRIV = no +endif +endif +# Disable spirv on Ubuntu older than focal (20.04) +ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes) +ifeq ($(shell dpkg --compare-versions $(DISTRO_RELEASE) lt 20 ; echo $$?),0) + ENABLE_SPRIV = no +endif +endif + +LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" +ifeq ($(ENABLE_SPRIV),yes) + LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-" +endif + # Disabled: # Host compiler does not support '-fuse-ld=lld' # USE_LLD_ARCHS := amd64 @@ -541,7 +561,7 @@ debian-libclc-build: -DCMAKE_INSTALL_DATADIR=lib \ -DCMAKE_INSTALL_INCLUDEDIR=include \ -DLLVM_CONFIG=$(CURDIR)/$(TARGET_BUILD_STAGE2)/bin/llvm-config \ - -DLIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl"; \ + -DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \ make $(NJOBS) $(VERBOSE) touch $@ From 9a0b8c2663f2ee6ad527a55d55324e5a21937553 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 16 Aug 2021 15:49:00 +0200 Subject: [PATCH 03/11] Add a new variable called SONAME_CLANG as clang soname has started with llvm-toolchain-13. it is normal that 13 is what is seen in 14 or later version as it is bumped only with abi changes --- debian/changelog | 6 +++++- debian/prepare-new-release.sh | 1 + debian/rules | 8 ++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 41f6f07a..165f5a4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ llvm-toolchain-13 (1:13~++20210731010128+6eaf46beb462-1~exp2) experimental; urgency=medium * Add symbol clang_CompileCommand_getNumMappedSources to libclang + * Add a new variable called SONAME_CLANG as + clang soname has started with llvm-toolchain-13. + it is normal that 13 is what is seen in 14 or later version as + it is bumped only with abi changes - -- + -- Sylvestre Ledru Mon, 16 Aug 2021 15:48:27 +0200 llvm-toolchain-13 (1:13~++20210731010128+6eaf46beb462-1~exp1) experimental; urgency=medium diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 867af120..28ea6d16 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -14,6 +14,7 @@ for F in $LIST; do done echo "once you copy the old version into a new branch" +echo "edit debian/rules, maybe update SONAME_CLANG" echo "edit debian/control, update the VCS links" echo "edit debian/control, update the source pkg name" echo "edit debian/changelog, update the source pkg name" diff --git a/debian/rules b/debian/rules index 1a82e4ac..aeb4f26a 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,10 @@ ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL)) endif SONAME_EXT := 1 +# clang soname has started with llvm-toolchain-13. +# it is normal that 13 is what is seen in 14 or later version as +# it is bumped only with abi changes +SONAME_CLANG := 13 SONAME_OPENMP := 5 # Manage the case when the version is 3.5~svn213052-1~exp1 or 3.4.2-1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p") @@ -621,8 +625,8 @@ override_dh_auto_install: : # libclang cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ - ln -s libclang-$(LLVM_VERSION).so libclang.so.$(SONAME_EXT) && \ - ln -s libclang-$(LLVM_VERSION).so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) + ln -s libclang-$(SONAME_CLANG).so libclang.so.$(SONAME_EXT) && \ + ln -s libclang-$(SONAME_CLANG).so libclang-$(SONAME_CLANG).so.$(SONAME_EXT) : # libomp cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \ From 7682e85772772877b73db44f6590585702486db5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 16 Aug 2021 21:56:33 +0200 Subject: [PATCH 04/11] fix conflict in a script --- debian/qualify-clang.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 0edb2596..c9e5642b 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -813,15 +813,9 @@ if ! grep "No such file or directory" foo.log; then # This isn't failing on 64, so, look at the results if ! ./a.out 2>&1 | grep -q -E "(Test unit written|PreferSmall)"; then echo "fuzzer. Output:" -<<<<<<< Updated upstream ./a.out || true if [ $DEB_HOST_ARCH == "amd64" -o $DEB_HOST_ARCH == "i386" ]; then # Don't fail on arm64 and ppc64el -======= - ./a.out - if [ $DEB_HOST_ARCH != "arm64" ]; then - # Don't fail on arm64 ->>>>>>> Stashed changes exit 42 fi fi From 6498d613d15bcb203b38ea65ea9f58027f332af7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 16 Aug 2021 21:56:55 +0200 Subject: [PATCH 05/11] add a new test to import the libclang --- debian/qualify-clang.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index c9e5642b..7d6e07b8 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1333,6 +1333,15 @@ if grep "LLVM IR bitcode" foo.log; then echo "Should be elf" exit -2 fi +echo " +from ctypes import * +libclang="/usr/lib/llvm-$VERSION/lib/libclang-$VERSION.so.1" +lib = CDLL(libclang) +fun = lib.clang_getAddressSpace +print(fun) +" > foo.py +python3 foo.py|grep _FuncPtr +rm foo.py echo "Testing cmake build ..." From 8a3b67e7473e911d10cc21127d8d8933f819821c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 16 Aug 2021 21:59:15 +0200 Subject: [PATCH 06/11] run_test: add debug info --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 5d083797..49dd5fa3 100755 --- a/debian/rules +++ b/debian/rules @@ -875,7 +875,7 @@ ifeq (${RUN_TEST},yes) ARCH_LLVM_TEST_OK := i386 amd64 override_dh_auto_test: - + echo "Running tests: $(RUN_TEST)" # LLVM tests ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK))) # logs the output to check-llvm_build_log.txt for validation through autopkgtest From 738f2e6613777bc3834b8cdb39a16340a6d55beb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 16 Aug 2021 21:59:28 +0200 Subject: [PATCH 07/11] remove old svn reference in the usage dh_strip & dh_makeshlibs --- debian/rules | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index 49dd5fa3..32e523df 100755 --- a/debian/rules +++ b/debian/rules @@ -786,10 +786,10 @@ endif override_dh_makeshlibs: - dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) -V"libclang$(SONAME_EXT)-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" -- -c4 - dh_makeshlibs -pliblldb-$(LLVM_VERSION) -V"liblldb-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" - dh_makeshlibs -plibllvm$(LLVM_VERSION) -V"libllvm$(LLVM_VERSION) (>= 1:9~svn298832-1~)" - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) -V"libomp$(SONAME_OPENMP)-$(LLVM_VERSION) (>= 1:9~svn298832-1~)" + dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) + dh_makeshlibs -pliblldb-$(LLVM_VERSION) + dh_makeshlibs -plibllvm$(LLVM_VERSION) + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) dh_makeshlibs --remaining-packages -V override_dh_shlibdeps: @@ -810,10 +810,10 @@ override_dh_strip: find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f ifeq (0, $(strip $(shell dpkg --compare-versions $(DH_VERSION) ge 9.20160114; echo $$?))) : # If we don't have the right version of debhelper, don't run the option - dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg (<< 1:9~svn327768-1~)' - dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg (<< 1:9~svn327768-1~)' - dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg (<< 1:9~svn327768-1~)' - dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg (<< 1:9~svn327768-1~)' + dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg' + dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg' + dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg' + dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg' endif # ifeq (${LLD_ENABLE},yes) # PATH=$(CURDIR)/:$$PATH dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg From 393d97f7f9b1fe9660c5815d8e661dd8a0de1b47 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 17 Aug 2021 10:18:48 +0200 Subject: [PATCH 08/11] Remove old svn reference in the usage dh_strip & dh_makeshlibs --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8aa9764f..25d809c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,14 @@ -llvm-toolchain-12 (1:12.0.1-4) UNRELEASED; urgency=medium +llvm-toolchain-12 (1:12.0.1-4) unstable; urgency=medium [ Sylvestre Ledru ] * Make libunwind-dev depends on libunwind * Don't build libunwind on hurd, armel, powerpc & mipsel + * Remove old svn reference in the usage dh_strip & dh_makeshlibs [ Jordan Justen ] * libclc: Include libclc spir-v outputs (used by Mesa opencl) - -- Sylvestre Ledru Sun, 08 Aug 2021 10:58:54 +0200 + -- Sylvestre Ledru Mon, 16 Aug 2021 22:04:17 +0200 llvm-toolchain-12 (1:12.0.1-3) unstable; urgency=medium From f4597c6a4d752048de7f51fdf15afd82733de11e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 17 Aug 2021 12:14:06 +0200 Subject: [PATCH 09/11] improve the testsuite --- debian/qualify-clang.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index edd73be4..f8de5e60 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -11,7 +11,7 @@ DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb" echo "To install everything:" -echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*'" +echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*' 'libunwind-*dev' 'libclc-*dev'" echo "sudo dpkg -i $LIST" L="" for f in $LIST; do @@ -947,13 +947,13 @@ int main() { } EOF clang++-$VERSION -stdlib=libc++ -unwindlib=libunwind -rtlib=compiler-rt -static-libstdc++ -static-libgcc test.cpp -lpthread -ldl -o test -./test +./test > /dev/null clang++-$VERSION -stdlib=libc++ -static-libstdc++ -fuse-ld=lld -l:libc++abi.a test.cpp -o test -./test +./test > /dev/null clang++-$VERSION -stdlib=libc++ -nostdlib++ test.cpp -l:libc++.a -l:libc++abi.a -pthread -o test -./test +./test > /dev/null # Bug 889832 echo '#include @@ -1334,6 +1334,16 @@ if grep "LLVM IR bitcode" foo.log; then exit -2 fi +echo " +from ctypes import * +libclang='/usr/lib/llvm-$VERSION/lib/libclang-$VERSION.so.1' +lib = CDLL(libclang) +fun = lib.clang_getAddressSpace +print(fun) +" > foo.py +python3 foo.py|grep _FuncPtr +rm foo.py + echo "Testing cmake build ..." if grep -q lit-cpuid /usr/lib/llvm-$VERSION/lib/cmake/llvm/LLVMExports*.cmake; then From 2a5020dbfb6cd288ecc6781e4205b4359e17b3fb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 17 Aug 2021 12:14:59 +0200 Subject: [PATCH 10/11] change the version for the libclc upload --- debian/changelog | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25d809c9..aea5be7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-12 (1:12.0.1-5) unstable; urgency=medium + + [ Jordan Justen ] + * libclc: Include libclc spir-v outputs (used by Mesa opencl) + + -- Sylvestre Ledru Tue, 17 Aug 2021 10:19:22 +0200 + llvm-toolchain-12 (1:12.0.1-4) unstable; urgency=medium [ Sylvestre Ledru ] @@ -5,9 +12,6 @@ llvm-toolchain-12 (1:12.0.1-4) unstable; urgency=medium * Don't build libunwind on hurd, armel, powerpc & mipsel * Remove old svn reference in the usage dh_strip & dh_makeshlibs - [ Jordan Justen ] - * libclc: Include libclc spir-v outputs (used by Mesa opencl) - -- Sylvestre Ledru Mon, 16 Aug 2021 22:04:17 +0200 llvm-toolchain-12 (1:12.0.1-3) unstable; urgency=medium From 8729fbb99938e37592bb82276f0b3be59dfeec94 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 17 Aug 2021 12:28:16 +0200 Subject: [PATCH 11/11] also remove test.cpp --- debian/qualify-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index f8de5e60..bc571f00 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1494,6 +1494,6 @@ fi #clean up rm -f a.out bar crash-* foo foo.* lldb-cmd.txt main.* test_fuzzer.cc foo.* o -rm -rf output matmul.* *profraw opt.ll a.json default.profdata test +rm -rf output matmul.* *profraw opt.ll a.json default.profdata test test.cpp echo "Completed"