authorgravatar for minyihh@uci.eduMin-Yih Hsu <minyihh@uci.edu> 2021-04-09 13:00:46-07:00
committergravatar for minyihh@uci.eduMin-Yih Hsu <minyihh@uci.edu> 2021-04-09 16:51:35-07:00
log52d871844c643f396a2bddee0753d24ff71ca3bb
tree05adee310cd34a85fd6ced7777d669e7442f6817
parent6b3eaa62e86d2652cf0b0802d704ab16d148c2ce

llvm new-pm: Build O0 pipeline in the correct way

Use `PassBuilder::buildO0DefaultPipeline` to build pipeline for -O0 in replacement of `PassBuilder::buildPerModuleDefaultPipeline`. This affects both normal and LTO settings. Two redundant Passes - which were added by accident - were also removed from LTO pipeline.

1 files changed, 5 insertions(+), 12 deletions(-)

src/zig_llvm.cpp+5-12
......@@ -277,15 +277,8 @@ bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMM
277277 });
278278 }
279279
280 // Passes for either debug or release build
281 if (is_debug) {
282 // NOTE: Always inliner will go away (in debug build)
283 // when the self-hosted compiler becomes mature.
284 pass_builder.registerPipelineStartEPCallback(
285 [](ModulePassManager &module_pm, OptimizationLevel OL) {
286 module_pm.addPass(AlwaysInlinerPass());
287 });
288 } else {
280 // Passes specific for release build
281 if (!is_debug) {
289282 pass_builder.registerPipelineStartEPCallback(
290283 [](ModulePassManager &module_pm, OptimizationLevel OL) {
291284 module_pm.addPass(
......@@ -312,10 +305,10 @@ bool ZigLLVMTargetMachineEmitToFile(LLVMTargetMachineRef targ_machine_ref, LLVMM
312305 opt_level = OptimizationLevel::O3;
313306
314307 // Initialize the PassManager
315 if (lto) {
308 if (opt_level == OptimizationLevel::O0) {
309 module_pm = pass_builder.buildO0DefaultPipeline(opt_level, lto);
310 } else if (lto) {
316311 module_pm = pass_builder.buildLTOPreLinkDefaultPipeline(opt_level);
317 module_pm.addPass(CanonicalizeAliasesPass());
318 module_pm.addPass(NameAnonGlobalPass());
319312 } else {
320313 module_pm = pass_builder.buildPerModuleDefaultPipeline(opt_level);
321314 }