[llvm] 4c0a133 - [Coroutines][new pass manager] Move CoroElide pass to right position
Jun Ma via llvm-commits
llvm-commits at lists.llvm.org
Sun Mar 1 04:57:42 PST 2020
Author: Jun Ma
Date: 2020-03-01T20:55:38+08:00
New Revision: 4c0a133a412cd85381469e20f88ee7bf5d2ded8e
URL: https://github.com/llvm/llvm-project/commit/4c0a133a412cd85381469e20f88ee7bf5d2ded8e
DIFF: https://github.com/llvm/llvm-project/commit/4c0a133a412cd85381469e20f88ee7bf5d2ded8e.diff
LOG: [Coroutines][new pass manager] Move CoroElide pass to right position
Differential Revision: https://reviews.llvm.org/D75345
Added:
Modified:
llvm/lib/Passes/PassBuilder.cpp
llvm/test/Transforms/Coroutines/ex2.ll
llvm/test/Transforms/Coroutines/ex3.ll
Removed:
################################################################################
diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp
index f4806b2db3c8..eb5b3a61fa89 100644
--- a/llvm/lib/Passes/PassBuilder.cpp
+++ b/llvm/lib/Passes/PassBuilder.cpp
@@ -561,6 +561,9 @@ PassBuilder::buildFunctionSimplificationPipeline(OptimizationLevel Level,
EnableMSSALoopDependency, DebugLogging));
}
+ if (PTO.Coroutines)
+ FPM.addPass(CoroElidePass());
+
for (auto &C : ScalarOptimizerLateEPCallbacks)
C(FPM, Level);
@@ -847,10 +850,8 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level,
MainCGPipeline.addPass(AttributorCGSCCPass());
- if (PTO.Coroutines) {
+ if (PTO.Coroutines)
MainCGPipeline.addPass(CoroSplitPass());
- MainCGPipeline.addPass(createCGSCCToFunctionPassAdaptor(CoroElidePass()));
- }
// Now deduce any function attributes based in the current code.
MainCGPipeline.addPass(PostOrderFunctionAttrsPass());
diff --git a/llvm/test/Transforms/Coroutines/ex2.ll b/llvm/test/Transforms/Coroutines/ex2.ll
index cd7d8d2a20ed..584bc909a4eb 100644
--- a/llvm/test/Transforms/Coroutines/ex2.ll
+++ b/llvm/test/Transforms/Coroutines/ex2.ll
@@ -40,8 +40,14 @@ entry:
%hdl = call i8* @f(i32 4)
call void @llvm.coro.resume(i8* %hdl)
call void @llvm.coro.resume(i8* %hdl)
+ %to = icmp eq i8* %hdl, null
+ br i1 %to, label %return, label %destroy
+destroy:
call void @llvm.coro.destroy(i8* %hdl)
+ br label %return
+return:
ret i32 0
+; CHECK-NOT: call i8* @CustomAlloc
; CHECK: call void @print(i32 4)
; CHECK-NEXT: call void @print(i32 5)
; CHECK-NEXT: call void @print(i32 6)
diff --git a/llvm/test/Transforms/Coroutines/ex3.ll b/llvm/test/Transforms/Coroutines/ex3.ll
index 50ce19e26372..85cf53fb576d 100644
--- a/llvm/test/Transforms/Coroutines/ex3.ll
+++ b/llvm/test/Transforms/Coroutines/ex3.ll
@@ -6,11 +6,17 @@ define i8* @f(i32 %n) {
entry:
%id = call token @llvm.coro.id(i32 0, i8* null, i8* null, i8* null)
%size = call i32 @llvm.coro.size.i32()
+ %need.dyn.alloc = call i1 @llvm.coro.alloc(token %id)
+ br i1 %need.dyn.alloc, label %dyn.alloc, label %coro.begin
+dyn.alloc:
%alloc = call i8* @malloc(i32 %size)
- %hdl = call noalias i8* @llvm.coro.begin(token %id, i8* %alloc)
+ br label %coro.begin
+coro.begin:
+ %phi = phi i8* [ null, %entry ], [ %alloc, %dyn.alloc ]
+ %hdl = call noalias i8* @llvm.coro.begin(token %id, i8* %phi)
br label %loop
loop:
- %n.val = phi i32 [ %n, %entry ], [ %inc, %loop.resume ]
+ %n.val = phi i32 [ %n, %coro.begin ], [ %inc, %loop.resume ]
call void @print(i32 %n.val) #4
%0 = call i8 @llvm.coro.suspend(token none, i1 false)
switch i8 %0, label %suspend [i8 0, label %loop.resume
@@ -37,8 +43,15 @@ entry:
%hdl = call i8* @f(i32 4)
call void @llvm.coro.resume(i8* %hdl)
call void @llvm.coro.resume(i8* %hdl)
+ %c = ptrtoint i8* %hdl to i64
+ %to = icmp eq i64 %c, 0
+ br i1 %to, label %return, label %destroy
+destroy:
call void @llvm.coro.destroy(i8* %hdl)
+ br label %return
+return:
ret i32 0
+; CHECK-NOT: i8* @malloc
; CHECK: call void @print(i32 4)
; CHECK-NEXT: call void @print(i32 -5)
; CHECK-NEXT: call void @print(i32 5)
More information about the llvm-commits
mailing list