Skip to content

Commit e9f545b

Browse files
cuvipercuviper
committed
Update the minimum external LLVM to 12
1 parent 8b0e709 commit e9f545b

29 files changed

+13
-139
lines changed

‎.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: mingw-check
4444
os: ubuntu-latest-xl
4545
env: {}
46-
- name: x86_64-gnu-llvm-11
46+
- name: x86_64-gnu-llvm-12
4747
os: ubuntu-latest-xl
4848
env: {}
4949
- name: x86_64-gnu-tools
@@ -274,7 +274,7 @@ jobs:
274274
- name: x86_64-gnu-distcheck
275275
os: ubuntu-latest-xl
276276
env: {}
277-
- name: x86_64-gnu-llvm-11
277+
- name: x86_64-gnu-llvm-12
278278
env:
279279
RUST_BACKTRACE: 1
280280
os: ubuntu-latest-xl

‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

+2-74
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,6 @@ void LLVMSelfProfileInitializeCallbacks(
681681
PassInstrumentationCallbacks& PIC, void* LlvmSelfProfiler,
682682
LLVMRustSelfProfileBeforePassCallback BeforePassCallback,
683683
LLVMRustSelfProfileAfterPassCallback AfterPassCallback) {
684-
#if LLVM_VERSION_GE(12, 0)
685684
PIC.registerBeforeNonSkippedPassCallback([LlvmSelfProfiler, BeforePassCallback](
686685
StringRef Pass, llvm::Any Ir) {
687686
std::string PassName = Pass.str();
@@ -699,25 +698,6 @@ void LLVMSelfProfileInitializeCallbacks(
699698
[LlvmSelfProfiler, AfterPassCallback](StringRef Pass, const PreservedAnalyses &Preserved) {
700699
AfterPassCallback(LlvmSelfProfiler);
701700
});
702-
#else
703-
PIC.registerBeforePassCallback([LlvmSelfProfiler, BeforePassCallback](
704-
StringRef Pass, llvm::Any Ir) {
705-
std::string PassName = Pass.str();
706-
std::string IrName = LLVMRustwrappedIrGetName(Ir);
707-
BeforePassCallback(LlvmSelfProfiler, PassName.c_str(), IrName.c_str());
708-
return true;
709-
});
710-
711-
PIC.registerAfterPassCallback(
712-
[LlvmSelfProfiler, AfterPassCallback](StringRef Pass, llvm::Any Ir) {
713-
AfterPassCallback(LlvmSelfProfiler);
714-
});
715-
716-
PIC.registerAfterPassInvalidatedCallback(
717-
[LlvmSelfProfiler, AfterPassCallback](StringRef Pass) {
718-
AfterPassCallback(LlvmSelfProfiler);
719-
});
720-
#endif
721701

722702
PIC.registerBeforeAnalysisCallback([LlvmSelfProfiler, BeforePassCallback](
723703
StringRef Pass, llvm::Any Ir) {
@@ -778,22 +758,13 @@ LLVMRustOptimizeWithNewPassManager(
778758
PTO.LoopInterleaving = UnrollLoops;
779759
PTO.LoopVectorization = LoopVectorize;
780760
PTO.SLPVectorization = SLPVectorize;
781-
#if LLVM_VERSION_GE(12, 0)
782761
PTO.MergeFunctions = MergeFunctions;
783-
#else
784-
// MergeFunctions is not supported by NewPM in older LLVM versions.
785-
(void) MergeFunctions;
786-
#endif
787762

788763
// FIXME: We may want to expose this as an option.
789764
bool DebugPassManager = false;
790765

791766
PassInstrumentationCallbacks PIC;
792-
#if LLVM_VERSION_GE(12, 0)
793767
StandardInstrumentations SI(DebugPassManager);
794-
#else
795-
StandardInstrumentations SI;
796-
#endif
797768
SI.registerCallbacks(PIC);
798769

799770
if (LlvmSelfProfiler){
@@ -817,18 +788,14 @@ LLVMRustOptimizeWithNewPassManager(
817788
PGOOptions::NoCSAction, DebugInfoForProfiling);
818789
}
819790

820-
#if LLVM_VERSION_GE(12, 0) && !LLVM_VERSION_GE(13,0)
821-
PassBuilder PB(DebugPassManager, TM, PTO, PGOOpt, &PIC);
822-
#else
823-
PassBuilder PB(TM, PTO, PGOOpt, &PIC);
824-
#endif
825-
826791
#if LLVM_VERSION_GE(13, 0)
792+
PassBuilder PB(TM, PTO, PGOOpt, &PIC);
827793
LoopAnalysisManager LAM;
828794
FunctionAnalysisManager FAM;
829795
CGSCCAnalysisManager CGAM;
830796
ModuleAnalysisManager MAM;
831797
#else
798+
PassBuilder PB(DebugPassManager, TM, PTO, PGOOpt, &PIC);
832799
LoopAnalysisManager LAM(DebugPassManager);
833800
FunctionAnalysisManager FAM(DebugPassManager);
834801
CGSCCAnalysisManager CGAM(DebugPassManager);
@@ -960,39 +927,16 @@ LLVMRustOptimizeWithNewPassManager(
960927
// At the same time, the LTO pipelines do support O0 and using them is required.
961928
bool IsLTO = OptStage == LLVMRustOptStage::ThinLTO || OptStage == LLVMRustOptStage::FatLTO;
962929
if (OptLevel == OptimizationLevel::O0 && !IsLTO) {
963-
#if LLVM_VERSION_GE(12, 0)
964930
for (const auto &C : PipelineStartEPCallbacks)
965931
PB.registerPipelineStartEPCallback(C);
966932
for (const auto &C : OptimizerLastEPCallbacks)
967933
PB.registerOptimizerLastEPCallback(C);
968934

969935
// Pass false as we manually schedule ThinLTOBufferPasses below.
970936
MPM = PB.buildO0DefaultPipeline(OptLevel, /* PreLinkLTO */ false);
971-
#else
972-
for (const auto &C : PipelineStartEPCallbacks)
973-
C(MPM, OptLevel);
974-
975-
for (const auto &C : OptimizerLastEPCallbacks)
976-
C(MPM, OptLevel);
977-
978-
MPM.addPass(AlwaysInlinerPass(EmitLifetimeMarkers));
979-
980-
if (PGOOpt) {
981-
PB.addPGOInstrPassesForO0(
982-
MPM, DebugPassManager, PGOOpt->Action == PGOOptions::IRInstr,
983-
/*IsCS=*/false, PGOOpt->ProfileFile, PGOOpt->ProfileRemappingFile);
984-
}
985-
#endif
986937
} else {
987-
#if LLVM_VERSION_GE(12, 0)
988938
for (const auto &C : PipelineStartEPCallbacks)
989939
PB.registerPipelineStartEPCallback(C);
990-
#else
991-
for (const auto &C : PipelineStartEPCallbacks)
992-
PB.registerPipelineStartEPCallback([C, OptLevel](ModulePassManager &MPM) {
993-
C(MPM, OptLevel);
994-
});
995-
#endif
996940
if (OptStage != LLVMRustOptStage::PreLinkThinLTO) {
997941
for (const auto &C : OptimizerLastEPCallbacks)
998942
PB.registerOptimizerLastEPCallback(C);
@@ -1003,43 +947,27 @@ LLVMRustOptimizeWithNewPassManager(
1003947
MPM = PB.buildPerModuleDefaultPipeline(OptLevel, DebugPassManager);
1004948
break;
1005949
case LLVMRustOptStage::PreLinkThinLTO:
1006-
#if LLVM_VERSION_GE(12, 0)
1007950
MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel);
1008951
// The ThinLTOPreLink pipeline already includes ThinLTOBuffer passes. However, callback
1009952
// passes may still run afterwards. This means we need to run the buffer passes again.
1010953
// FIXME: In LLVM 13, the ThinLTOPreLink pipeline also runs OptimizerLastEPCallbacks
1011954
// before the RequiredLTOPreLinkPasses, in which case we can remove these hacks.
1012955
if (OptimizerLastEPCallbacks.empty())
1013956
NeedThinLTOBufferPasses = false;
1014-
#else
1015-
MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel, DebugPassManager);
1016-
#endif
1017957
for (const auto &C : OptimizerLastEPCallbacks)
1018958
C(MPM, OptLevel);
1019959
break;
1020960
case LLVMRustOptStage::PreLinkFatLTO:
1021-
#if LLVM_VERSION_GE(12, 0)
1022961
MPM = PB.buildLTOPreLinkDefaultPipeline(OptLevel);
1023962
NeedThinLTOBufferPasses = false;
1024-
#else
1025-
MPM = PB.buildLTOPreLinkDefaultPipeline(OptLevel, DebugPassManager);
1026-
#endif
1027963
break;
1028964
case LLVMRustOptStage::ThinLTO:
1029965
// FIXME: Does it make sense to pass the ModuleSummaryIndex?
1030966
// It only seems to be needed for C++ specific optimizations.
1031-
#if LLVM_VERSION_GE(12, 0)
1032967
MPM = PB.buildThinLTODefaultPipeline(OptLevel, nullptr);
1033-
#else
1034-
MPM = PB.buildThinLTODefaultPipeline(OptLevel, DebugPassManager, nullptr);
1035-
#endif
1036968
break;
1037969
case LLVMRustOptStage::FatLTO:
1038-
#if LLVM_VERSION_GE(12, 0)
1039970
MPM = PB.buildLTODefaultPipeline(OptLevel, nullptr);
1040-
#else
1041-
MPM = PB.buildLTODefaultPipeline(OptLevel, DebugPassManager, nullptr);
1042-
#endif
1043971
break;
1044972
}
1045973
}

‎compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp

-24
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,7 @@ extern "C" void LLVMRustAddByValCallSiteAttr(LLVMValueRef Instr, unsigned Index,
263263
extern "C" void LLVMRustAddStructRetCallSiteAttr(LLVMValueRef Instr, unsigned Index,
264264
LLVMTypeRef Ty) {
265265
CallBase *Call = unwrap<CallBase>(Instr);
266-
#if LLVM_VERSION_GE(12, 0)
267266
Attribute Attr = Attribute::getWithStructRetType(Call->getContext(), unwrap(Ty));
268-
#else
269-
Attribute Attr = Attribute::get(Call->getContext(), Attribute::StructRet);
270-
#endif
271267
AddAttribute(Call, Index, Attr);
272268
}
273269

@@ -311,11 +307,7 @@ extern "C" void LLVMRustAddByValAttr(LLVMValueRef Fn, unsigned Index,
311307
extern "C" void LLVMRustAddStructRetAttr(LLVMValueRef Fn, unsigned Index,
312308
LLVMTypeRef Ty) {
313309
Function *F = unwrap<Function>(Fn);
314-
#if LLVM_VERSION_GE(12, 0)
315310
Attribute Attr = Attribute::getWithStructRetType(F->getContext(), unwrap(Ty));
316-
#else
317-
Attribute Attr = Attribute::get(F->getContext(), Attribute::StructRet);
318-
#endif
319311
AddAttribute(F, Index, Attr);
320312
}
321313

@@ -1024,17 +1016,11 @@ extern "C" LLVMMetadataRef
10241016
LLVMRustDIBuilderCreateDebugLocation(unsigned Line, unsigned Column,
10251017
LLVMMetadataRef ScopeRef,
10261018
LLVMMetadataRef InlinedAt) {
1027-
#if LLVM_VERSION_GE(12, 0)
10281019
MDNode *Scope = unwrapDIPtr<MDNode>(ScopeRef);
10291020
DILocation *Loc = DILocation::get(
10301021
Scope->getContext(), Line, Column, Scope,
10311022
unwrapDIPtr<MDNode>(InlinedAt));
10321023
return wrap(Loc);
1033-
#else
1034-
DebugLoc debug_loc = DebugLoc::get(Line, Column, unwrapDIPtr<MDNode>(ScopeRef),
1035-
unwrapDIPtr<MDNode>(InlinedAt));
1036-
return wrap(debug_loc.getAsMDNode());
1037-
#endif
10381024
}
10391025

10401026
extern "C" int64_t LLVMRustDIBuilderCreateOpDeref() {
@@ -1249,10 +1235,8 @@ extern "C" LLVMTypeKind LLVMRustGetTypeKind(LLVMTypeRef Ty) {
12491235
return LLVMScalableVectorTypeKind;
12501236
case Type::BFloatTyID:
12511237
return LLVMBFloatTypeKind;
1252-
#if LLVM_VERSION_GE(12, 0)
12531238
case Type::X86_AMXTyID:
12541239
return LLVMX86_AMXTypeKind;
1255-
#endif
12561240
}
12571241
report_fatal_error("Unhandled TypeID.");
12581242
}
@@ -1710,23 +1694,15 @@ LLVMRustBuildVectorReduceMax(LLVMBuilderRef B, LLVMValueRef Src, bool IsSigned)
17101694
}
17111695
extern "C" LLVMValueRef
17121696
LLVMRustBuildVectorReduceFMin(LLVMBuilderRef B, LLVMValueRef Src, bool NoNaN) {
1713-
#if LLVM_VERSION_GE(12, 0)
17141697
Instruction *I = unwrap(B)->CreateFPMinReduce(unwrap(Src));
17151698
I->setHasNoNaNs(NoNaN);
17161699
return wrap(I);
1717-
#else
1718-
return wrap(unwrap(B)->CreateFPMinReduce(unwrap(Src), NoNaN));
1719-
#endif
17201700
}
17211701
extern "C" LLVMValueRef
17221702
LLVMRustBuildVectorReduceFMax(LLVMBuilderRef B, LLVMValueRef Src, bool NoNaN) {
1723-
#if LLVM_VERSION_GE(12, 0)
17241703
Instruction *I = unwrap(B)->CreateFPMaxReduce(unwrap(Src));
17251704
I->setHasNoNaNs(NoNaN);
17261705
return wrap(I);
1727-
#else
1728-
return wrap(unwrap(B)->CreateFPMaxReduce(unwrap(Src), NoNaN));
1729-
#endif
17301706
}
17311707

17321708
extern "C" LLVMValueRef

‎src/bootstrap/native.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -378,11 +378,11 @@ fn check_llvm_version(builder: &Builder<'_>, llvm_config: &Path) {
378378
let version = output(cmd.arg("--version"));
379379
let mut parts = version.split('.').take(2).filter_map(|s| s.parse::<u32>().ok());
380380
if let (Some(major), Some(_minor)) = (parts.next(), parts.next()) {
381-
if major >= 11 {
381+
if major >= 12 {
382382
return;
383383
}
384384
}
385-
panic!("\n\nbad LLVM version: {}, need >=11.0\n\n", version)
385+
panic!("\n\nbad LLVM version: {}, need >=12.0\n\n", version)
386386
}
387387

388388
fn configure_cmake(

‎src/ci/docker/host-x86_64/x86_64-gnu-llvm-11/Dockerfile ‎src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
cmake \
1515
sudo \
1616
gdb \
17-
llvm-11-tools \
18-
llvm-11-dev \
17+
llvm-12-tools \
18+
llvm-12-dev \
1919
libedit-dev \
2020
libssl-dev \
2121
pkg-config \
@@ -29,7 +29,7 @@ RUN sh /scripts/sccache.sh
2929
# using llvm-link-shared due to libffi issues -- see #34486
3030
ENV RUST_CONFIGURE_ARGS \
3131
--build=x86_64-unknown-linux-gnu \
32-
--llvm-root=/usr/lib/llvm-11 \
32+
--llvm-root=/usr/lib/llvm-12 \
3333
--enable-llvm-link-shared \
3434
--set rust.thin-lto-import-instr-limit=10
3535

‎src/ci/github-actions/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ jobs:
284284
- name: mingw-check
285285
<<: *job-linux-xl
286286

287-
- name: x86_64-gnu-llvm-11
287+
- name: x86_64-gnu-llvm-12
288288
<<: *job-linux-xl
289289

290290
- name: x86_64-gnu-tools
@@ -431,7 +431,7 @@ jobs:
431431
- name: x86_64-gnu-distcheck
432432
<<: *job-linux-xl
433433

434-
- name: x86_64-gnu-llvm-11
434+
- name: x86_64-gnu-llvm-12
435435
env:
436436
RUST_BACKTRACE: 1
437437
<<: *job-linux-xl

‎src/test/assembly/asm/aarch64-outline-atomics.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0
21
// assembly-output: emit-asm
32
// compile-flags: -O
43
// compile-flags: --target aarch64-unknown-linux-gnu

‎src/test/assembly/asm/powerpc-types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// min-llvm-version: 12.0.0
1+
// min-llvm-version: 12.0.1
22
// revisions: powerpc powerpc64
33
// assembly-output: emit-asm
44
//[powerpc] compile-flags: --target powerpc-unknown-linux-gnu

‎src/test/assembly/asm/riscv-types.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
//[riscv32] compile-flags: --target riscv32imac-unknown-none-elf
66
//[riscv32] needs-llvm-components: riscv
77
// compile-flags: -C target-feature=+d
8-
// min-system-llvm-version: 12.0
98

109
#![feature(no_core, lang_items, rustc_attrs)]
1110
#![crate_type = "rlib"]

‎src/test/assembly/asm/wasm-types.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0.0
21
// assembly-output: emit-asm
32
// compile-flags: --target wasm32-unknown-unknown
43
// compile-flags: --crate-type cdylib

‎src/test/assembly/static-relocation-model.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0.0
21
// revisions: x64 A64 ppc64le
32
// assembly-output: emit-asm
43
// [x64] compile-flags: --target x86_64-unknown-linux-gnu -Crelocation-model=static

‎src/test/codegen/function-arguments.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
// compile-flags: -O -C no-prepopulate-passes
2-
//
3-
// min-system-llvm-version: 12.0
42

53
#![crate_type = "lib"]
64
#![feature(rustc_attrs)]

‎src/test/codegen/issue-73031.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0.0
21
// compile-flags: -O
32
#![crate_type = "lib"]
43

‎src/test/codegen/issue-75525-bounds-checks.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Regression test for #75525, verifies that no bounds checks are generated.
22

3-
// min-llvm-version: 12.0.0
43
// compile-flags: -O
54

65
#![crate_type = "lib"]

‎src/test/codegen/issue-75546.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0.0
21
// compile-flags: -O
32
#![crate_type = "lib"]
43

‎src/test/codegen/issue-77812.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0.0
21
// compile-flags: -O
32
#![crate_type = "lib"]
43

‎src/test/codegen/non-terminate/infinite-loop-1.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0
21
// compile-flags: -C opt-level=3
32

43
#![crate_type = "lib"]

‎src/test/codegen/non-terminate/infinite-loop-2.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0
21
// compile-flags: -C opt-level=3
32

43
#![crate_type = "lib"]

‎src/test/codegen/non-terminate/infinite-recursion.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0
21
// compile-flags: -C opt-level=3
32

43
#![crate_type = "lib"]

‎src/test/codegen/non-terminate/nonempty-infinite-loop.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// min-llvm-version: 12.0
21
// compile-flags: -C opt-level=3
32

43
#![crate_type = "lib"]

‎src/test/codegen/repr-transparent-aggregates-1.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// compile-flags: -C no-prepopulate-passes
22
//
33

4-
// min-system-llvm-version: 12.0
54
// ignore-arm
65
// ignore-aarch64
76
// ignore-mips

0 commit comments

Comments
 (0)