Skip to content

Commit 6b0c110

Browse files
t-rasmudt-rasmud
committed
Auto upgrade bitcode to new vararg representation for coro.id.retcon.once intrinsic
The signature of coro.id.retcon.once intrinsic was modified in #10015 with an extra vararg. This commit adds an auto upgrader to LLVM in order to be compatible with compilers generating old bitcode (intrinsic without the vararg). rdar://147426562 (cherry picked from commit 969660b) (cherry picked from commit 2eaa148) (cherry picked from commit 889ce26) (cherry picked from commit 031baa1) (cherry picked from commit 98dd062)
1 parent b1500eb commit 6b0c110

File tree

4 files changed

+128
-0
lines changed

4 files changed

+128
-0
lines changed

‎llvm/lib/IR/AutoUpgrade.cpp

+13
Original file line numberDiff line numberDiff line change
@@ -1102,6 +1102,13 @@ static bool upgradeIntrinsicFunction1(Function *F, Function *&NewFn,
11021102
return true;
11031103
}
11041104

1105+
if (!F->isVarArg() && Name == "coro.id.retcon.once") {
1106+
rename(F);
1107+
NewFn = Intrinsic::getDeclaration(F->getParent(),
1108+
Intrinsic::coro_id_retcon_once);
1109+
return true;
1110+
}
1111+
11051112
break;
11061113
}
11071114
case 'd':
@@ -4515,6 +4522,12 @@ void llvm::UpgradeIntrinsicCall(CallBase *CI, Function *NewFn) {
45154522
break;
45164523
}
45174524

4525+
case Intrinsic::coro_id_retcon_once: {
4526+
SmallVector<Value *, 8> Args(CI->args());
4527+
NewCall = Builder.CreateCall(NewFn, Args);
4528+
break;
4529+
}
4530+
45184531
case Intrinsic::vector_extract: {
45194532
StringRef Name = F->getName();
45204533
Name = Name.substr(5); // Strip llvm

‎llvm/test/Transforms/Coroutines/Inputs/coro-retcon-frame-auto-upgrade-test.ll.bc

2.51 KB
Binary file not shown.

‎llvm/test/Transforms/Coroutines/coro-retcon-frame-auto-upgrade-test.ll

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
; RUN: llvm-dis < %S/Inputs/coro-retcon-frame-auto-upgrade-test.ll.bc 2>&1 | FileCheck %s
2+
3+
; ModuleID = '../llvm-project/llvm/test/Transforms/Coroutines/coro-retcon-frame-auto-upgrade.bc'
4+
; CHECK: source_filename = "../llvm-project/llvm/test/Transforms/Coroutines/coro-retcon-frame-auto-upgrade.ll"
5+
; CHECK: target datalayout = "p:64:64:64"
6+
7+
; CHECK: declare void @prototype_f(ptr, i1)
8+
9+
; CHECK: declare noalias ptr @allocate(i32)
10+
11+
; CHECK: declare void @deallocate(ptr)
12+
13+
; CHECK: declare void @init(ptr)
14+
15+
; CHECK: declare void @use(ptr)
16+
17+
; CHECK: declare void @use_addr_val(i64, ptr)
18+
19+
; Function Attrs: presplitcoroutine
20+
; CHECK: define { ptr, ptr } @f(ptr %buffer) #0 {
21+
; CHECK: entry:
22+
; CHECK: %tmp = alloca { i64, i64 }, align 8
23+
; CHECK: %proj.1 = getelementptr inbounds { i64, i64 }, ptr %tmp, i64 0, i32 0
24+
; CHECK: %proj.2 = getelementptr inbounds { i64, i64 }, ptr %tmp, i64 0, i32 1
25+
; CHECK: store i64 0, ptr %proj.1, align 8
26+
; CHECK: store i64 0, ptr %proj.2, align 8
27+
; CHECK: %escape_addr = ptrtoint ptr %tmp to i64
28+
; CHECK: %id = call token (i32, i32, ptr, ptr, ptr, ptr, ...) @llvm.coro.id.retcon.once(i32 32, i32 8, ptr %buffer, ptr @prototype_f, ptr @allocate, ptr @deallocate)
29+
; CHECK: %hdl = call ptr @llvm.coro.begin(token %id, ptr null)
30+
; CHECK: %proj.2.2 = getelementptr inbounds { i64, i64 }, ptr %tmp, i64 0, i32 1
31+
; CHECK: call void @init(ptr %proj.1)
32+
; CHECK: call void @init(ptr %proj.2.2)
33+
; CHECK: call void @use_addr_val(i64 %escape_addr, ptr %tmp)
34+
; CHECK: %abort = call i1 (...) @llvm.coro.suspend.retcon.i1(ptr %tmp)
35+
; CHECK: br i1 %abort, label %end, label %resume
36+
37+
; CHECK: resume: ; preds = %entry
38+
; CHECK: call void @use(ptr %tmp)
39+
; CHECK: br label %end
40+
41+
; CHECK: end: ; preds = %resume, %entry
42+
; CHECK: %0 = call i1 @llvm.coro.end(ptr %hdl, i1 false, token none)
43+
; CHECK: unreachable
44+
; CHECK: }
45+
46+
; Function Attrs: nounwind
47+
; CHECK: declare ptr @llvm.coro.begin(token, ptr writeonly) #1
48+
49+
; Function Attrs: nounwind
50+
; CHECK: declare i1 @llvm.coro.suspend.retcon.i1(...) #1
51+
52+
; Function Attrs: nounwind
53+
; CHECK: declare i1 @llvm.coro.end(ptr, i1, token) #1
54+
55+
; Function Attrs: nounwind
56+
; CHECK: declare token @llvm.coro.id.retcon.once(i32, i32, ptr, ptr, ptr, ptr, ...) #1
57+
58+
; CHECK: attributes #0 = { presplitcoroutine }
59+
; CHECK: attributes #1 = { nounwind }

‎llvm/test/Transforms/Coroutines/coro-retcon-frame-old.ll

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s
2+
3+
target datalayout = "p:64:64:64"
4+
5+
declare void @prototype_f(ptr, i1)
6+
7+
declare noalias ptr @allocate(i32 %size)
8+
declare void @deallocate(ptr %ptr)
9+
declare void @init(ptr %ptr)
10+
declare void @use(ptr %ptr)
11+
declare void @use_addr_val(i64 %val, ptr %addr)
12+
13+
define { ptr, ptr } @f(ptr %buffer) presplitcoroutine {
14+
entry:
15+
%tmp = alloca { i64, i64 }, align 8
16+
%proj.1 = getelementptr inbounds { i64, i64 }, ptr %tmp, i64 0, i32 0
17+
%proj.2 = getelementptr inbounds { i64, i64 }, ptr %tmp, i64 0, i32 1
18+
store i64 0, ptr %proj.1, align 8
19+
store i64 0, ptr %proj.2, align 8
20+
%escape_addr = ptrtoint ptr %tmp to i64
21+
%id = call token (i32, i32, ptr, ptr, ptr, ptr) @llvm.coro.id.retcon.once(i32 32, i32 8, ptr %buffer, ptr @prototype_f, ptr @allocate, ptr @deallocate)
22+
%hdl = call ptr @llvm.coro.begin(token %id, ptr null)
23+
%proj.2.2 = getelementptr inbounds { i64, i64 }, ptr %tmp, i64 0, i32 1
24+
call void @init(ptr %proj.1)
25+
call void @init(ptr %proj.2.2)
26+
call void @use_addr_val(i64 %escape_addr, ptr %tmp)
27+
%abort = call i1 (...) @llvm.coro.suspend.retcon.i1(ptr %tmp)
28+
br i1 %abort, label %end, label %resume
29+
30+
resume:
31+
call void @use(ptr %tmp)
32+
br label %end
33+
34+
end:
35+
call i1 @llvm.coro.end(ptr %hdl, i1 0, token none)
36+
unreachable
37+
}
38+
; Make sure we don't lose writes to the frame.
39+
; CHECK-LABEL: define { ptr, ptr } @f(ptr %buffer) {
40+
; CHECK: [[PROJ2:%.*]] = getelementptr inbounds { i64, i64 }, ptr %buffer, i64 0, i32 1
41+
; CHECK: store i64 0, ptr %buffer
42+
; CHECK: store i64 0, ptr [[PROJ2]]
43+
; CHECK: [[ESCAPED_ADDR:%.*]] = ptrtoint ptr %buffer to i64
44+
; CHECK: call void @init(ptr %buffer)
45+
; CHECK: call void @init(ptr [[PROJ2]])
46+
; CHECK: call void @use_addr_val(i64 [[ESCAPED_ADDR]], ptr %buffer)
47+
48+
; CHECK-LABEL: define internal void @f.resume.0(ptr {{.*}} %0, i1 %1) {
49+
; CHECK: resume:
50+
; CHECK: call void @use(ptr %0)
51+
52+
declare token @llvm.coro.id.retcon.once(i32, i32, ptr, ptr, ptr, ptr)
53+
declare ptr @llvm.coro.begin(token, ptr)
54+
declare i1 @llvm.coro.suspend.retcon.i1(...)
55+
declare i1 @llvm.coro.end(ptr, i1, token)
56+

0 commit comments

Comments
 (0)