Skip to content

Commit 37010d4

Browse files
aeubanksaeubanks
committed
[Coroutines][NewPM] Fix coroutine tests under new pass manager
Some new function parameter attributes are derived under NPM. Reviewed By: rjmccall Differential Revision: https://reviews.llvm.org/D88760
1 parent 80ac6da commit 37010d4

File tree

6 files changed

+17
-11
lines changed

6 files changed

+17
-11
lines changed

‎llvm/test/Transforms/Coroutines/coro-retcon-alloca.ll

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
; RUN: opt < %s -enable-coroutines -O2 -S | FileCheck %s
2+
; RUN: opt < %s -enable-coroutines -passes='default<O2>' -S | FileCheck %s
23

34
target datalayout = "p:64:64:64"
45

@@ -39,7 +40,7 @@ cleanup:
3940
; CHECK-NEXT: ret { i8*, i8*, i32 } [[RET]]
4041
; CHECK-NEXT: }
4142

42-
; CHECK-LABEL: define internal { i8*, i8*, i32 } @f.resume.0(i8* noalias nonnull align 8 dereferenceable(1024) %0, i1 %1)
43+
; CHECK-LABEL: define internal { i8*, i8*, i32 } @f.resume.0(i8* {{.*}} %0, i1 %1)
4344
; CHECK-NEXT: :
4445
; CHECK-NEXT: [[T1:%.*]] = bitcast i8* %0 to i8**
4546
; CHECK-NEXT: [[ALLOC:%.*]] = load i8*, i8** [[T1]], align 8
@@ -82,7 +83,7 @@ cleanup:
8283
; CHECK-NEXT: ret { i8*, i32 } [[RET]]
8384
; CHECK-NEXT: }
8485

85-
; CHECK-LABEL: define internal { i8*, i32 } @g.resume.0(i8* noalias nonnull align 8 dereferenceable(1024) %0, i1 %1)
86+
; CHECK-LABEL: define internal { i8*, i32 } @g.resume.0(i8* {{.*}} %0, i1 %1)
8687
; CHECK-NEXT: :
8788
; CHECK-NEXT: br i1 %1,
8889
; CHECK: :
@@ -131,7 +132,7 @@ cleanup:
131132
; CHECK-NEXT: ret { i8*, i32 } [[RET]]
132133
; CHECK-NEXT: }
133134

134-
; CHECK-LABEL: define internal { i8*, i32 } @h.resume.0(i8* noalias nonnull align 8 dereferenceable(1024) %0, i1 %1)
135+
; CHECK-LABEL: define internal { i8*, i32 } @h.resume.0(i8* {{.*}} %0, i1 %1)
135136
; CHECK-NEXT: :
136137
; CHECK-NEXT: br i1 %1,
137138
; CHECK: :
@@ -179,7 +180,7 @@ loop2:
179180
; CHECK-NEXT: ret { i8*, i32 } [[RET]]
180181
; CHECK-NEXT: }
181182

182-
; CHECK-LABEL: define internal { i8*, i32 } @i.resume.0(i8* noalias nonnull align 8 dereferenceable(1024) %0)
183+
; CHECK-LABEL: define internal { i8*, i32 } @i.resume.0(i8* {{.*}} %0)
183184
; CHECK-NEXT: :
184185
; CHECK-NEXT: [[NSLOT:%.*]] = bitcast i8* %0 to i32*
185186
; CHECK-NEXT: [[T1:%.*]] = load i32, i32* [[NSLOT]], align 8

‎llvm/test/Transforms/Coroutines/coro-retcon-once-value.ll

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
; RUN: opt < %s -enable-coroutines -O2 -S | FileCheck %s
2+
; RUN: opt < %s -enable-coroutines -passes='default<O2>' -S | FileCheck %s
3+
24
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
35
target triple = "x86_64-apple-macosx10.12.0"
46

@@ -45,7 +47,7 @@ cleanup:
4547
; CHECK-NEXT: ret { i8*, i32 } [[T1]]
4648
; CHECK-NEXT: }
4749

48-
; CHECK-LABEL: define internal void @f.resume.0(i8* noalias nonnull align 8 dereferenceable(8) %0, i1 zeroext %1)
50+
; CHECK-LABEL: define internal void @f.resume.0(i8* {{.*}} %0, i1 zeroext %1)
4951
; CHECK-NEXT: :
5052
; CHECK-NEXT: br i1 %1,
5153
; CHECK: :
@@ -57,7 +59,7 @@ cleanup:
5759
; CHECK-NEXT: ret void
5860
; CHECK-NEXT: }
5961

60-
; CHECK-LABEL: define internal void @f.resume.1(i8* noalias nonnull align 8 dereferenceable(8) %0, i1 zeroext %1)
62+
; CHECK-LABEL: define internal void @f.resume.1(i8* {{.*}} %0, i1 zeroext %1)
6163
; CHECK-NEXT: :
6264
; CHECK-NEXT: br i1 %1,
6365
; CHECK: :

‎llvm/test/Transforms/Coroutines/coro-retcon-resume-values.ll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
; RUN: opt < %s -enable-coroutines -O2 -S | FileCheck %s
2+
; RUN: opt < %s -enable-coroutines -passes='default<O2>' -S | FileCheck %s
23

34
define i8* @f(i8* %buffer, i32 %n) {
45
entry:
@@ -30,7 +31,7 @@ cleanup:
3031
; CHECK-NEXT: ret i8* bitcast (i8* (i8*, i32, i1)* @f.resume.0 to i8*)
3132
; CHECK-NEXT: }
3233

33-
; CHECK-LABEL: define internal i8* @f.resume.0(i8* noalias nonnull align 4 dereferenceable(8) %0, i32 %1, i1 zeroext %2)
34+
; CHECK-LABEL: define internal i8* @f.resume.0(i8* {{.*}} %0, i32 %1, i1 zeroext %2)
3435
; CHECK-NEXT: :
3536
; CHECK-NEXT: [[T0:%.*]] = bitcast i8* %0 to i32*
3637
; CHECK-NEXT: [[T1:%.*]] = load i32, i32* [[T0]], align 4

‎llvm/test/Transforms/Coroutines/coro-retcon-value.ll

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
; First example from Doc/Coroutines.rst (two block loop) converted to retcon
22
; RUN: opt < %s -enable-coroutines -O2 -S | FileCheck %s
3+
; RUN: opt < %s -enable-coroutines -passes='default<O2>' -S | FileCheck %s
34

45
define {i8*, i32} @f(i8* %buffer, i32 %n) {
56
entry:
@@ -30,7 +31,7 @@ cleanup:
3031
; CHECK-NEXT: ret { i8*, i32 } [[RET]]
3132
; CHECK-NEXT: }
3233

33-
; CHECK-LABEL: define internal { i8*, i32 } @f.resume.0(i8* noalias nonnull align 4 dereferenceable(8) %0, i8 zeroext %1)
34+
; CHECK-LABEL: define internal { i8*, i32 } @f.resume.0(i8* {{.*}} %0, i8 zeroext %1)
3435
; CHECK-NEXT: :
3536
; CHECK-NEXT: [[T0:%.*]] = icmp eq i8 %1, 0
3637
; CHECK-NEXT: br i1 [[T0]],

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
; First example from Doc/Coroutines.rst (two block loop) converted to retcon
22
; RUN: opt < %s -enable-coroutines -O2 -S | FileCheck %s
3+
; RUN: opt < %s -enable-coroutines -aa-pipeline=basic-aa -passes='default<O2>' -S | FileCheck %s
34

45
define i8* @f(i8* %buffer, i32 %n) {
56
entry:
@@ -30,7 +31,7 @@ cleanup:
3031
; CHECK-NEXT: ret i8* bitcast (i8* (i8*, i1)* @f.resume.0 to i8*)
3132
; CHECK-NEXT: }
3233

33-
; CHECK-LABEL: define internal i8* @f.resume.0(i8* noalias nonnull align 4 dereferenceable(8) %0, i1 zeroext %1)
34+
; CHECK-LABEL: define internal i8* @f.resume.0(i8* {{.*}} %0, i1 zeroext %1)
3435
; CHECK-NEXT: :
3536
; CHECK-NEXT: br i1 %1,
3637
; CHECK: :

‎llvm/test/Transforms/Coroutines/coro-swifterror.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ cleanup:
4040
; CHECK-NEXT: ret i8* bitcast (i8* (i8*, i1, i8**)* @f.resume.0 to i8*)
4141
; CHECK-NEXT: }
4242

43-
; CHECK-LABEL: define internal i8* @f.resume.0(i8* noalias nonnull align 4 dereferenceable(8) %0, i1 zeroext %1, i8** swifterror %2)
43+
; CHECK-LABEL: define internal i8* @f.resume.0(i8* {{.*}} %0, i1 zeroext %1, i8** swifterror %2)
4444
; CHECK-NEXT: :
4545
; CHECK-NEXT: br i1 %1,
4646
; CHECK: :
@@ -102,7 +102,7 @@ cleanup:
102102
; CHECK-NEXT: ret i8* bitcast (i8* (i8*, i1)* @g.resume.0 to i8*)
103103
; CHECK-NEXT: }
104104

105-
; CHECK-LABEL: define internal i8* @g.resume.0(i8* noalias nonnull align 4 dereferenceable(8) %0, i1 zeroext %1)
105+
; CHECK-LABEL: define internal i8* @g.resume.0(i8* {{.*}} %0, i1 zeroext %1)
106106
; CHECK-NEXT: :
107107
; CHECK-NEXT: [[ERRORSLOT:%.*]] = alloca swifterror i8*, align 4
108108
; CHECK-NEXT: br i1 %1,

0 commit comments

Comments
 (0)