undo

[vitalybuka]

No description provided.

[llvmbot]

@llvm/pr-subscribers-lto

Author: Vitaly Buka (vitalybuka)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/126192.diff

4 Files Affected:

• (modified) llvm/lib/Passes/PassBuilderPipelines.cpp (+4-4)
• (modified) llvm/test/Other/new-pm-O0-defaults.ll (-2)
• (modified) llvm/test/Other/new-pm-lto-defaults.ll (-4)
• (modified) llvm/test/ThinLTO/X86/coro.ll (+3-3)

diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp
index 93a05c0f5a288d4..0794729cd4c2b7f 100644
--- a/llvm/lib/Passes/PassBuilderPipelines.cpp
+++ b/llvm/lib/Passes/PassBuilderPipelines.cpp
@@ -1817,10 +1817,10 @@ PassBuilder::buildLTODefaultPipeline(OptimizationLevel Level,
   // in the current module.
   MPM.addPass(CrossDSOCFIPass());
 
-  MPM.addPass(CoroEarlyPass());
+//  MPM.addPass(CoroEarlyPass());
 
   auto Exit = llvm::make_scope_exit([&]() {
-    MPM.addPass(CoroCleanupPass());
+//    MPM.addPass(CoroCleanupPass());
 
     invokeFullLinkTimeOptimizationLastEPCallbacks(MPM, Level);
 
@@ -1987,8 +1987,8 @@ PassBuilder::buildLTODefaultPipeline(OptimizationLevel Level,
   // transform it to pass arguments by value instead of by reference.
   CGSCCPassManager CGPM;
   CGPM.addPass(ArgumentPromotionPass());
-  CGPM.addPass(CoroSplitPass(Level != OptimizationLevel::O0));
-  CGPM.addPass(CoroAnnotationElidePass());
+//  CGPM.addPass(CoroSplitPass(Level != OptimizationLevel::O0));
+//  CGPM.addPass(CoroAnnotationElidePass());
   MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
 
   FunctionPassManager FPM;
diff --git a/llvm/test/Other/new-pm-O0-defaults.ll b/llvm/test/Other/new-pm-O0-defaults.ll
index db450269414e3ef..e8131ac7fab45ac 100644
--- a/llvm/test/Other/new-pm-O0-defaults.ll
+++ b/llvm/test/Other/new-pm-O0-defaults.ll
@@ -47,14 +47,12 @@
 ; CHECK-THINLTO-NEXT: Running pass: EliminateAvailableExternallyPass
 ; CHECK-THINLTO-NEXT: Running pass: GlobalDCEPass
 ; CHECK-LTO: Running pass: CrossDSOCFIPass on [module]
-; CHECK-LTO-NEXT: CoroEarlyPass
 ; CHECK-LTO-NEXT: Running pass: WholeProgramDevirtPass
 ; CHECK-LTO-NEXT: Running analysis: InnerAnalysisManagerProxy
 ; CHECK-LTO-NEXT: Running pass: LowerTypeTestsPass
 ; CHECK-LTO-NEXT: Running pass: LowerTypeTestsPass
 ; CHECK-CORO-NEXT: Running pass: AnnotationRemarksPass
 ; CHECK-CORO-NEXT: Running analysis: TargetLibraryAnalysis
-; CHECK-LTO-NEXT: CoroCleanupPass
 ; CHECK-LTO-NEXT: Running pass: AnnotationRemarksPass
 ; CHECK-LTO-NEXT: Running analysis: TargetLibraryAnalysis
 ; CHECK-NEXT: Running pass: PrintModulePass
diff --git a/llvm/test/Other/new-pm-lto-defaults.ll b/llvm/test/Other/new-pm-lto-defaults.ll
index d6e88bd7b5c50a5..86480c5115748d5 100644
--- a/llvm/test/Other/new-pm-lto-defaults.ll
+++ b/llvm/test/Other/new-pm-lto-defaults.ll
@@ -35,7 +35,6 @@
 
 ; CHECK-EP: Running pass: NoOpModulePass
 ; CHECK-O: Running pass: CrossDSOCFIPass
-; CHECK-O-NEXT: CoroEarlyPass
 ; CHECK-O-NEXT: Running pass: OpenMPOptPass
 ; CHECK-O-NEXT: Running pass: GlobalDCEPass
 ; CHECK-O-NEXT: Running pass: InferFunctionAttrsPass
@@ -87,8 +86,6 @@
 ; CHECK-O23SZ-NEXT: Running pass: OpenMPOptPass
 ; CHECK-O23SZ-NEXT: Running pass: GlobalDCEPass
 ; CHECK-O23SZ-NEXT: Running pass: ArgumentPromotionPass
-; CHECK-O23SZ-NEXT: CoroSplitPass on (foo)
-; CHECK-O23SZ-NEXT: CoroAnnotationElidePass on (foo)
 ; CHECK-O23SZ-NEXT: Running pass: InstCombinePass
 ; CHECK-EP-PEEPHOLE-NEXT: Running pass: NoOpFunctionPass
 ; CHECK-O23SZ-NEXT: Running pass: ConstraintEliminationPass
@@ -159,7 +156,6 @@
 ; CHECK-O23SZ-NEXT: Running pass: GlobalDCEPass
 ; CHECK-O23SZ-NEXT: Running pass: RelLookupTableConverterPass
 ; CHECK-O23SZ-NEXT: Running pass: CGProfilePass
-; CHECK-O-NEXT: CoroCleanupPass
 ; CHECK-EP-NEXT: Running pass: NoOpModulePass
 ; CHECK-O-NEXT: Running pass: AnnotationRemarksPass on foo
 ; CHECK-O-NEXT: Running pass: PrintModulePass
diff --git a/llvm/test/ThinLTO/X86/coro.ll b/llvm/test/ThinLTO/X86/coro.ll
index cde398dd76d85a4..372641c9579b311 100644
--- a/llvm/test/ThinLTO/X86/coro.ll
+++ b/llvm/test/ThinLTO/X86/coro.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as %s -o %t1.bc
-; RUN: llvm-lto2 run %t1.bc -o %t2.o -r=%t1.bc,test,plx -r=%t1.bc,extern_func,plx -save-temps
-; RUN: llvm-dis %t2.o.0.5.precodegen.bc -o - | FileCheck %s --implicit-check-not="call void @llvm.coro"
+; RU1N: llvm-as %s -o %t1.bc
+; RU1N: llvm-lto2 run %t1.bc -o %t2.o -r=%t1.bc,test,plx -r=%t1.bc,extern_func,plx -save-temps
+; RU1N: llvm-dis %t2.o.0.5.precodegen.bc -o - | FileCheck %s --implicit-check-not="call void @llvm.coro"
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-fuchsia"

[github-actions]

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff 45fc89f407b6784a6ef2009e388c5a79b4588455 611b0c1713964a7df8a3f168c4dda69e6f6b63d5 --extensions cpp -- llvm/lib/Passes/PassBuilderPipelines.cpp

View the diff from clang-format here.

diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp
index 0794729cd4..ed147504c6 100644
--- a/llvm/lib/Passes/PassBuilderPipelines.cpp
+++ b/llvm/lib/Passes/PassBuilderPipelines.cpp
@@ -1817,10 +1817,10 @@ PassBuilder::buildLTODefaultPipeline(OptimizationLevel Level,
   // in the current module.
   MPM.addPass(CrossDSOCFIPass());
 
-//  MPM.addPass(CoroEarlyPass());
+  //  MPM.addPass(CoroEarlyPass());
 
   auto Exit = llvm::make_scope_exit([&]() {
-//    MPM.addPass(CoroCleanupPass());
+    //    MPM.addPass(CoroCleanupPass());
 
     invokeFullLinkTimeOptimizationLastEPCallbacks(MPM, Level);
 
@@ -1987,8 +1987,8 @@ PassBuilder::buildLTODefaultPipeline(OptimizationLevel Level,
   // transform it to pass arguments by value instead of by reference.
   CGSCCPassManager CGPM;
   CGPM.addPass(ArgumentPromotionPass());
-//  CGPM.addPass(CoroSplitPass(Level != OptimizationLevel::O0));
-//  CGPM.addPass(CoroAnnotationElidePass());
+  //  CGPM.addPass(CoroSplitPass(Level != OptimizationLevel::O0));
+  //  CGPM.addPass(CoroAnnotationElidePass());
   MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
 
   FunctionPassManager FPM;