Skip to content

Commit 3a9ef4e

Browse files
authored
[Pipelines] Do not run CoroSplit and CoroCleanup in LTO pre-link pipeline (llvm#100205)
This is re-land of llvm#90310 after making asan skip pre-split coroutines in llvm#99415. Skip CoroSplit and CoroCleanup in LTO pre-link pipeline so that CoroElide can happen after callee coroutine is imported into caller's module in ThinLTO.
1 parent ee6d932 commit 3a9ef4e

File tree

5 files changed

+85
-10
lines changed

5 files changed

+85
-10
lines changed
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// REQUIRES: x86_64-linux
2+
// This tests that the coroutine elide optimization could happen succesfully with ThinLTO.
3+
// This test is adapted from coro-elide.cpp and splits functions into two files.
4+
//
5+
// RUN: split-file %s %t
6+
// RUN: %clang --target=x86_64-linux -std=c++20 -O2 -flto=thin -I %S -c %t/coro-elide-callee.cpp -o coro-elide-callee.bc
7+
// RUN: %clang --target=x86_64-linux -std=c++20 -O2 -flto=thin -I %S -c %t/coro-elide-caller.cpp -o coro-elide-caller.bc
8+
// RUN: llvm-lto --thinlto coro-elide-callee.bc coro-elide-caller.bc -o summary
9+
// RUN: %clang_cc1 -O2 -x ir coro-elide-caller.bc -fthinlto-index=summary.thinlto.bc -emit-llvm -o - | FileCheck %s
10+
11+
//--- coro-elide-task.h
12+
#pragma once
13+
#include "Inputs/coroutine.h"
14+
15+
struct Task {
16+
struct promise_type {
17+
struct FinalAwaiter {
18+
bool await_ready() const noexcept { return false; }
19+
template <typename PromiseType>
20+
std::coroutine_handle<> await_suspend(std::coroutine_handle<PromiseType> h) noexcept {
21+
if (!h)
22+
return std::noop_coroutine();
23+
return h.promise().continuation;
24+
}
25+
void await_resume() noexcept {}
26+
};
27+
Task get_return_object() noexcept {
28+
return std::coroutine_handle<promise_type>::from_promise(*this);
29+
}
30+
std::suspend_always initial_suspend() noexcept { return {}; }
31+
FinalAwaiter final_suspend() noexcept { return {}; }
32+
void unhandled_exception() noexcept {}
33+
void return_value(int x) noexcept {
34+
_value = x;
35+
}
36+
std::coroutine_handle<> continuation;
37+
int _value;
38+
};
39+
40+
Task(std::coroutine_handle<promise_type> handle) : handle(handle) {}
41+
~Task() {
42+
if (handle)
43+
handle.destroy();
44+
}
45+
46+
struct Awaiter {
47+
bool await_ready() const noexcept { return false; }
48+
void await_suspend(std::coroutine_handle<void> continuation) noexcept {}
49+
int await_resume() noexcept {
50+
return 43;
51+
}
52+
};
53+
54+
auto operator co_await() {
55+
return Awaiter{};
56+
}
57+
58+
private:
59+
std::coroutine_handle<promise_type> handle;
60+
};
61+
62+
//--- coro-elide-callee.cpp
63+
#include "coro-elide-task.h"
64+
Task task0() {
65+
co_return 43;
66+
}
67+
68+
//--- coro-elide-caller.cpp
69+
#include "coro-elide-task.h"
70+
71+
Task task0();
72+
73+
Task task1() {
74+
co_return co_await task0();
75+
}
76+
77+
// CHECK-LABEL: define{{.*}} void @_Z5task1v.resume
78+
// CHECK-NOT: {{.*}}_Znwm

llvm/lib/Passes/PassBuilderPipelines.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,8 @@ PassBuilder::buildInlinerPipeline(OptimizationLevel Level,
979979
MainCGPipeline.addPass(createCGSCCToFunctionPassAdaptor(
980980
RequireAnalysisPass<ShouldNotRunFunctionPassesAnalysis, Function>()));
981981

982-
MainCGPipeline.addPass(CoroSplitPass(Level != OptimizationLevel::O0));
982+
if (Phase != ThinOrFullLTOPhase::ThinLTOPreLink)
983+
MainCGPipeline.addPass(CoroSplitPass(Level != OptimizationLevel::O0));
983984

984985
// Make sure we don't affect potential future NoRerun CGSCC adaptors.
985986
MIWP.addLateModulePass(createModuleToFunctionPassAdaptor(
@@ -1021,8 +1022,9 @@ PassBuilder::buildModuleInlinerPipeline(OptimizationLevel Level,
10211022
buildFunctionSimplificationPipeline(Level, Phase),
10221023
PTO.EagerlyInvalidateAnalyses));
10231024

1024-
MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(
1025-
CoroSplitPass(Level != OptimizationLevel::O0)));
1025+
if (Phase != ThinOrFullLTOPhase::ThinLTOPreLink)
1026+
MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(
1027+
CoroSplitPass(Level != OptimizationLevel::O0)));
10261028

10271029
return MPM;
10281030
}
@@ -1219,7 +1221,8 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level,
12191221
// and argument promotion.
12201222
MPM.addPass(DeadArgumentEliminationPass());
12211223

1222-
MPM.addPass(CoroCleanupPass());
1224+
if (Phase != ThinOrFullLTOPhase::ThinLTOPreLink)
1225+
MPM.addPass(CoroCleanupPass());
12231226

12241227
// Optimize globals now that functions are fully simplified.
12251228
MPM.addPass(GlobalOptPass());

llvm/test/Other/new-pm-thinlto-prelink-defaults.ll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,10 @@
184184
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
185185
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}ShouldNotRunFunctionPassesAnalysis
186186
; CHECK-O-NEXT: Running analysis: ShouldNotRunFunctionPassesAnalysis
187-
; CHECK-O-NEXT: Running pass: CoroSplitPass
188187
; CHECK-O-NEXT: Running pass: InvalidateAnalysisPass<{{.*}}ShouldNotRunFunctionPassesAnalysis
189188
; CHECK-O-NEXT: Invalidating analysis: ShouldNotRunFunctionPassesAnalysis
190189
; CHECK-O-NEXT: Invalidating analysis: InlineAdvisorAnalysis
191190
; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass
192-
; CHECK-O-NEXT: Running pass: CoroCleanupPass
193191
; CHECK-O-NEXT: Running pass: GlobalOptPass
194192
; CHECK-O-NEXT: Running pass: GlobalDCEPass
195193
; CHECK-EXT: Running pass: {{.*}}::Bye

llvm/test/Other/new-pm-thinlto-prelink-pgo-defaults.ll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,10 @@
183183
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
184184
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}ShouldNotRunFunctionPassesAnalysis
185185
; CHECK-O-NEXT: Running analysis: ShouldNotRunFunctionPassesAnalysis
186-
; CHECK-O-NEXT: Running pass: CoroSplitPass
187186
; CHECK-O-NEXT: Running pass: InvalidateAnalysisPass<{{.*}}ShouldNotRunFunctionPassesAnalysis
188187
; CHECK-O-NEXT: Invalidating analysis: ShouldNotRunFunctionPassesAnalysis
189188
; CHECK-O-NEXT: Invalidating analysis: InlineAdvisorAnalysis
190189
; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass
191-
; CHECK-O-NEXT: Running pass: CoroCleanupPass
192190
; CHECK-O-NEXT: Running pass: GlobalOptPass
193191
; CHECK-O-NEXT: Running analysis: TargetLibraryAnalysis on bar
194192
; CHECK-O-NEXT: Running pass: GlobalDCEPass

llvm/test/Other/new-pm-thinlto-prelink-samplepgo-defaults.ll

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,10 @@
148148
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
149149
; CHECK-O-NEXT: Running pass: RequireAnalysisPass<{{.*}}ShouldNotRunFunctionPassesAnalysis
150150
; CHECK-O-NEXT: Running analysis: ShouldNotRunFunctionPassesAnalysis
151-
; CHECK-O-NEXT: Running pass: CoroSplitPass
152151
; CHECK-O-NEXT: Running pass: InvalidateAnalysisPass<{{.*}}ShouldNotRunFunctionPassesAnalysis
153152
; CHECK-O-NEXT: Invalidating analysis: ShouldNotRunFunctionPassesAnalysis
154153
; CHECK-O-NEXT: Invalidating analysis: InlineAdvisorAnalysis
155154
; CHECK-O-NEXT: Running pass: DeadArgumentEliminationPass
156-
; CHECK-O-NEXT: Running pass: CoroCleanupPass
157155
; CHECK-O-NEXT: Running pass: GlobalOptPass
158156
; CHECK-O-NEXT: Running pass: GlobalDCEPass
159157
; CHECK-O-NEXT: Running pass: AnnotationRemarksPass on foo

0 commit comments

Comments
 (0)