Skip to content

Commit

Permalink
Auto merge of #95171 - Kobzol:llvm-ci-update, r=nikic
Browse files Browse the repository at this point in the history 
Update LLVM used for building rustc in CI for x64

LLVM 14 was tagged. It is needed for building [BOLT](#94381), and it also improves max RSS quite [a lot](https://perf.rust-lang.org/compare.html?start=6970f88db3ac2a9cefa9c585228291ae1f18fb04&end=67acb7e3ffcc11d67abfd29c390aac629f3c0e97&stat=max-rss).

GCC was bumped to allow building the new LLVM version. The changes in building LLVM were done to speed up the build a bit by ignoring unused parts and to turn off parts that were problematic to compile even with the bumped GCC.
  • Loading branch information
@bors
bors committed Apr 28, 2022
2 parents b2c2a32 + 4472d4c commit 1388b38
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
7 changes: 6 additions & 1 deletion src/ci/docker/host-x86_64/dist-x86_64-linux/build-clang.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -ex

source shared.sh

LLVM=llvmorg-13.0.0
LLVM=llvmorg-14.0.2

mkdir llvm-project
cd llvm-project
Expand All @@ -30,7 +30,12 @@ hide_output \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/rustroot \
-DCOMPILER_RT_BUILD_SANITIZERS=OFF \
-DCOMPILER_RT_BUILD_XRAY=OFF \
-DCOMPILER_RT_BUILD_MEMPROF=OFF \
-DLLVM_TARGETS_TO_BUILD=X86 \
-DLLVM_INCLUDE_BENCHMARKS=OFF \
-DLLVM_INCLUDE_TESTS=OFF \
-DLLVM_INCLUDE_EXAMPLES=OFF \
-DLLVM_ENABLE_PROJECTS="clang;lld;compiler-rt" \
-DC_INCLUDE_DIRS="$INC"

Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/dist-x86_64-linux/build-gcc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -ex

source shared.sh

GCC=5.5.0
GCC=7.5.0

curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.xz | xzcat | tar xf -
cd gcc-$GCC
Expand Down
2 changes: 1 addition & 1 deletion src/llvm-project
Submodule llvm-project updated 60 files
+1 −1 clang/docs/ClangCommandLineReference.rst
+5 −1 clang/docs/ReleaseNotes.rst
+1 −1 clang/include/clang/Driver/Options.td
+12 −2 clang/lib/CodeGen/CGExpr.cpp
+3 −0 clang/lib/Driver/ToolChains/Arch/AArch64.cpp
+26 −0 clang/test/CodeGen/fread-inline-builtin-late-redecl.c
+12 −18 compiler-rt/lib/asan/asan_linux.cpp
+4 −1 compiler-rt/lib/builtins/clear_cache.c
+20 −0 libcxx/include/__support/openbsd/xlocale.h
+5 −1 lld/COFF/DebugTypes.cpp
+24 −17 lld/ELF/Writer.cpp
+54 −0 lld/test/ELF/emit-relocs-synthetic.s
+7 −0 llvm/include/llvm/CodeGen/FastISel.h
+13 −0 llvm/include/llvm/CodeGen/SelectionDAG.h
+1 −0 llvm/include/llvm/CodeGen/SelectionDAGISel.h
+0 −3 llvm/lib/CodeGen/MachineFunction.cpp
+2 −2 llvm/lib/CodeGen/SelectionDAG/FastISel.cpp
+3 −2 llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp
+2 −1 llvm/lib/CodeGen/SelectionDAG/InstrEmitter.h
+2 −1 llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
+2 −1 llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
+9 −1 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+5 −0 llvm/lib/Target/AArch64/AArch64.td
+34 −0 llvm/lib/Target/AArch64/AArch64ExpandPseudoInsts.cpp
+8 −0 llvm/lib/Target/AArch64/AArch64FastISel.cpp
+9 −1 llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+2 −0 llvm/lib/Target/AArch64/AArch64ISelLowering.h
+11 −0 llvm/lib/Target/AArch64/AArch64InstrInfo.td
+6 −0 llvm/lib/Target/AArch64/AArch64Subtarget.h
+10 −2 llvm/lib/Target/AArch64/GISel/AArch64CallLowering.cpp
+24 −39 llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
+2 −0 llvm/lib/Target/PowerPC/MCTargetDesc/PPCAsmBackend.cpp
+2 −0 llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
+4 −0 llvm/lib/Target/PowerPC/MCTargetDesc/PPCFixupKinds.h
+2 −2 llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCCodeEmitter.cpp
+11 −2 llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
+2 −2 llvm/lib/Target/PowerPC/PPCInstrInfo.td
+5 −3 llvm/lib/Target/RISCV/MCTargetDesc/RISCVAsmBackend.cpp
+28 −26 llvm/lib/Target/RISCV/MCTargetDesc/RISCVMatInt.cpp
+40 −31 llvm/lib/Target/RISCV/RISCVISelLowering.cpp
+8 −13 llvm/lib/Target/X86/X86ISelLowering.cpp
+17 −0 llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
+7 −8 llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
+51 −0 llvm/test/CodeGen/AArch64/setjmp-bti-no-enforcement.ll
+83 −0 llvm/test/CodeGen/AArch64/setjmp-bti-outliner.ll
+55 −0 llvm/test/CodeGen/AArch64/setjmp-bti.ll
+36 −0 llvm/test/CodeGen/RISCV/imm.ll
+37 −0 llvm/test/CodeGen/RISCV/rvv/fixed-vectors-int-buildvec.ll
+34 −0 llvm/test/CodeGen/X86/lzcnt-zext-cmp.ll
+117 −0 llvm/test/DebugInfo/X86/instr-ref-opt-bisect.ll
+22 −0 llvm/test/MC/PowerPC/ppc64-abs-reloc.s
+8 −0 llvm/test/MC/RISCV/align-option-relax.s
+8 −0 llvm/test/MC/RISCV/align.s
+40 −40 llvm/test/Transforms/InstCombine/ashr-lshr.ll
+2 −2 llvm/test/Transforms/InstCombine/logical-select.ll
+2 −2 llvm/test/Transforms/InstCombine/truncating-saturate.ll
+46 −0 llvm/test/Transforms/LoopVectorize/induction-unroll-novec.ll
+16 −0 llvm/test/tools/llvm-mt/notify_update.test
+1 −1 llvm/tools/llvm-mt/Opts.td
+24 −1 llvm/tools/llvm-mt/llvm-mt.cpp

0 comments on commit 1388b38

Please sign in to comment.