Merge pull request #5524 from cms-sw/backport-IB_CMSSW_11_1_X_master-…

…5505 LLVM to 9.0.1
cms-sw · Feb 6, 2020 · fd1789e · fd1789e
2 parents 455281c + 6caae1f
commit fd1789e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 225 deletions.
diff --git a/codechecker-llvm8.patch b/codechecker-llvm8.patch
diff --git a/codechecker.spec b/codechecker.spec
@@ -1,18 +1,16 @@
 ### RPM external codechecker 0.1
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
 
-%define tag 5248cbf0bc6e0f5a81e5f2fe75d81f55601b23b9
-%define branch master
-%define github_user gartung
+%define tag f10d1156e2295d688d6b0a80fae50df029caa1fd
+%define branch llvm9
+%define github_user cms-externals
 Source: git+https://github.com/%github_user/CMSCodeChecker.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 
 BuildRequires: cmake 
 Requires: llvm
-Patch0: codechecker-llvm8
 
 %prep
 %setup -n %n-%{realversion}
-%patch0 -p1
 
 %build
 mkdir build

diff --git a/llvm-gcc-toolfile.spec b/llvm-gcc-toolfile.spec
@@ -1,4 +1,4 @@
-### RPM cms llvm-gcc-toolfile 13.0
+### RPM cms llvm-gcc-toolfile 14.0
 
 Requires: llvm
 BuildRequires: python
@@ -55,6 +55,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-cxxcompiler.xml
     <flags REM_CXXFLAGS="-fno-crossjumping"/>
     <flags REM_CXXFLAGS="-fno-aggressive-loop-optimizations"/>
     <flags REM_CXXFLAGS="-mlong-double-64"/>
+    <flags REM_CXXFLAGS="-funroll-all-loops"/>
     <flags CXXFLAGS="-Wno-c99-extensions"/>
     <flags CXXFLAGS="-Wno-c++11-narrowing"/>
     <flags CXXFLAGS="-D__STRICT_ANSI__"/>
@@ -64,6 +65,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/llvm-cxxcompiler.xml
     <flags CXXFLAGS="-Wno-unknown-warning-option"/>
     <flags CXXFLAGS="-ftemplate-depth=512"/>
     <flags CXXFLAGS="-Wno-error=potentially-evaluated-expression"/>
+    <flags CXXFLAGS="-Wno-tautological-type-limit-compare"/>
     <flags CXXFLAGS="-fsized-deallocation"/>
     <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$LLVM_CXXCOMPILER_BASE/lib64" type="path"/>
     <runtime name="PATH" value="$LLVM_CXXCOMPILER_BASE/bin" type="path"/>

diff --git a/llvm.spec b/llvm.spec
@@ -1,4 +1,4 @@
-### RPM external llvm 8.0.1
+### RPM external llvm 9.0.1
 ## INITENV +PATH LD_LIBRARY_PATH %{i}/lib64
 ## INITENV +PATH PYTHON27PATH %{i}/lib64/python`echo $PYTHON_VERSION | cut -d. -f 1,2`/site-packages
 ## INITENV +PATH PYTHON3PATH %{i}/lib64/python`echo $PYTHON3_VERSION | cut -d. -f 1,2`/site-packages
@@ -11,10 +11,10 @@ Requires: cuda
 %endif
 AutoReq: no
 
-%define llvmCommit dd3df36604b9a3418a28efce78ac470b22992f70
-%define llvmBranch cms/release/8.x/635f8ff
-%define iwyuCommit 4d2bbcc0d98faccfc51d15c6f6a573ec78d7751d
-%define iwyuBranch master
+%define llvmCommit 379a43bc841451feccf78db64f2ed5c9e62c7de8
+%define llvmBranch cms/release/9.x/c1a0a21
+%define iwyuCommit 06e88efada2ff6dbccee3bbb1279c10439daa4d2
+%define iwyuBranch clang_9.0
 
 Source0: git+https://github.com/cms-externals/llvm-project.git?obj=%{llvmBranch}/%{llvmCommit}&export=llvm-%{realversion}-%{llvmCommit}&module=llvm-%{realversion}-%{llvmCommit}&output=/llvm-%{realversion}-%{llvmCommit}.tgz
 Source1: git+https://github.com/include-what-you-use/include-what-you-use.git?obj=%{iwyuBranch}/%{iwyuCommit}&export=iwyu-%{realversion}-%{iwyuCommit}&module=iwyu-%{realversion}-%{iwyuCommit}&output=/iwyu-%{realversion}-%{iwyuCommit}.tgz

diff --git a/pip/llvmlite.file b/pip/llvmlite.file
@@ -1,4 +1,6 @@
 Requires: llvm py2-wheel py2-enum34
 Patch0: py2-llvmlite-fpic-flag
+Patch1: py2-llvmlite-llvm9
 
+%define source0 git+https://github.com/numba/llvmlite?obj=master/6435ea21f73dbf909a0418ed16375361e40d9892&export=llvmlite-%{realversion}&output=/source.tar.gz
 %define PipPreBuild export LLVM_CONFIG=${LLVM_ROOT}/bin/llvm-config
diff --git a/pip/requirements.txt b/pip/requirements.txt
@@ -112,7 +112,8 @@ keras-preprocessing==1.1.0
 kiwisolver==1.1.0
 lazy-object-proxy==1.4.3
 lizard==1.16.6
-llvmlite==0.30.0
+#NO_AUTO_UPDATE: Source is defined in llvmlite.file, changing version here is not going to get new sources
+llvmlite==0.32.0x
 lxml==4.4.1
 lz4==2.2.1
 Mako==1.1.0

diff --git a/py2-llvmlite-llvm9.patch b/py2-llvmlite-llvm9.patch
@@ -0,0 +1,12 @@
+diff -Naur a/ffi/build.py b/ffi/build.py
+--- a/ffi/build.py	2020-01-10 14:51:38.000000000 +0100
++++ b/ffi/build.py	2020-01-10 14:45:27.059843040 +0100
+@@ -110,7 +110,7 @@
+     out = out.decode('latin1')
+     print(out)
+     if not (out.startswith('8.0.') or out.startswith('7.0.')
+-            or out.startswith('7.1.')):
++            or out.startswith('7.1.') or out.startswith('9.0.')):
+         msg = (
+             "Building llvmlite requires LLVM 7.0.x, 7.1.x or 8.0.x Be sure to "
+             "set LLVM_CONFIG to the right executable path.\n"