Merge remote-tracking branch 'origin/13' into snapshot

2025-06-30 14:14:54 +00:00 · 2021-08-17 13:46:54 +02:00 · 2021-08-17 13:46:54 +02:00 · 510a0270a7
commit 510a0270a7
parent 5c12680b55 1b732c2af9
9 changed files with 101 additions and 28 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -8,6 +8,16 @@ llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; ur

 -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 06 Aug 2021 08:40:58 +0200

+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 <sylvestre@debian.org>  Mon, 16 Aug 2021 15:48:27 +0200
+
 llvm-toolchain-13 (1:13~++20210731010128+6eaf46beb462-1~exp1) experimental; urgency=medium

  * Branching of snapshot into 13
@ -89,12 +99,21 @@ llvm-toolchain-snapshot (1:13~++20210129063721+010b176cdefb-1~exp1) experimental

 -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 30 Jan 2021 17:31:15 +0100

-llvm-toolchain-12 (1:12.0.1-4) UNRELEASED; urgency=medium
+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 <sylvestre@debian.org>  Tue, 17 Aug 2021 10:19:22 +0200
+
+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

- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Aug 2021 10:58:54 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 16 Aug 2021 22:04:17 +0200

 llvm-toolchain-12 (1:12.0.1-3) unstable; urgency=medium

--- 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/
--- a/debian/libclang1-X.Y.symbols.in
+++ b/debian/libclang1-X.Y.symbols.in
@ -41,7 +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:14~++20210802064328+d6d0b6559e97-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~
--- 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
--- a/debian/patches/libclc-llvm-spirv.diff
+++ 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}" )
--- a/debian/patches/series
+++ b/debian/patches/series
@ -143,3 +143,4 @@ lower-python-dep.diff
 scan-build-py-fix-analyze-path.diff
 scan-build-py-fix-default-bin.diff
 scan-build-py-force-utf-8-opening.diff
+libclc-llvm-spirv.diff
--- 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"
--- 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-*' 'libclc-*' 'libclc-*dev'"
+echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*' 'libunwind-*dev' 'libclc-*' 'libclc-*dev'"
 echo "sudo dpkg -i $LIST"
 L=""
 for f in $LIST; do
@ -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
@ -953,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 <iostream>
@ -1339,6 +1333,25 @@ 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 "
+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 ..."

@ -1490,6 +1503,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"
--- 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")
@ -31,6 +35,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}')

@ -136,6 +141,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
@ -536,7 +560,7 @@ debian-libclc-build:
 	-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"; \
-	$(PRE_PROCESS) make $(NJOBS) $(VERBOSE)
+	make $(NJOBS) $(VERBOSE)
 	touch $@

 override_dh_auto_build: debian-full-build debian-libfuzzer-build debian-libcxx-build debian-libcxxabi-build debian-libclc-build
@ -621,8 +645,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; \
@ -761,10 +785,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:
@ -785,10 +809,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
@ -850,7 +874,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