Skip to content

Commit e467514

Browse files
nate-chandlernate-chandler
authored
Merge pull request #29791 from nate-chandler/irgen/add-argument-labels-to-remaining-tests
[IRGen] Adapt remaining tests to arguments in IR.
2 parents 07c8b1b + de577b7 commit e467514

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎test/IRGen/abi_v7k.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// REQUIRES: CPU=armv7k
55
// REQUIRES: OS=watchos
66

7-
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k9addFloats{{.*}}"(float, float)
7+
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k9addFloats{{.*}}"(float %0, float %1)
88
// CHECK: fadd float %0, %1
99
// CHECK: ret float
1010
// V7K-LABEL: _$s8test_v7k9addFloats{{.*}}
@@ -13,7 +13,7 @@ func addFloats(x: Float, y : Float) -> Float {
1313
return x+y
1414
}
1515

16-
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k10addDoubles{{.*}}"(double, double, double)
16+
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k10addDoubles{{.*}}"(double %0, double %1, double %2)
1717
// CHECK: fadd double %0, %1
1818
// CHECK: fadd double
1919
// CHECK: ret double
@@ -24,7 +24,7 @@ func addDoubles(x: Double, y: Double, z: Double) -> Double {
2424
return x+y+z
2525
}
2626

27-
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k6addFDF{{.*}}"(float, double, float)
27+
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k6addFDF{{.*}}"(float %0, double %1, float %2)
2828
// CHECK: fmul float
2929
// CHECK: ret float
3030
// V7K-LABEL: _$s8test_v7k6addFDF
@@ -34,7 +34,7 @@ func addFDF(x: Float, y: Double, z: Float) -> Float {
3434
return x*z
3535
}
3636

37-
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k8addStack{{.*}}"(double, double, double, double, double, double, double, float, double)
37+
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k8addStack{{.*}}"(double %0, double %1, double %2, double %3, double %4, double %5, double %6, float %7, double %8)
3838
// CHECK: fadd double
3939
// CHECK: ret double
4040
// V7K-LABEL: _$s8test_v7k8addStack
@@ -47,7 +47,7 @@ func addStack(d0: Double, d1: Double, d2: Double, d3: Double, d4: Double,
4747
return a+c
4848
}
4949

50-
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k9addStack{{.*}}"(double, double, double, double, double, double, double, float, double, float)
50+
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k9addStack{{.*}}"(double %0, double %1, double %2, double %3, double %4, double %5, double %6, float %7, double %8, float %9)
5151
// CHECK: fadd float
5252
// V7K-LABEL: _$s8test_v7k9addStack
5353
// V7K: sub sp, #80
@@ -78,7 +78,7 @@ func testSingle(x: SingleCase) -> Int32{
7878
}
7979
}
8080

81-
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k0A4Data{{.*}}"(i32, double)
81+
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k0A4Data{{.*}}"(i32 %0, double %1)
8282
// CHECK: ret double
8383
// V7K-LABEL: _$s8test_v7k0A4Data
8484
// V7K: vstr d0
@@ -91,7 +91,7 @@ func testData(x: DataCase) -> Double {
9191
}
9292
}
9393

94-
// CHECK-LABEL: define hidden swiftcc i32 @"$s8test_v7k0A6Clike2{{.*}}"(i8)
94+
// CHECK-LABEL: define hidden swiftcc i32 @"$s8test_v7k0A6Clike2{{.*}}"(i8 %0)
9595
// CHECK: [[ID:%[0-9]+]] = phi i32 [ 2, {{.*}} ], [ 1, {{.*}} ]
9696
// CHECK: ret i32 [[ID]]
9797
// V7K-LABEL: _$s8test_v7k0A6Clike2
@@ -111,7 +111,7 @@ func testClike2(x: CLike2) -> Int {
111111
}
112112
}
113113

114-
// CHECK-LABEL: define hidden swiftcc i32 @"$s8test_v7k0A6Clike8{{.*}}"(i32, i8)
114+
// CHECK-LABEL: define hidden swiftcc i32 @"$s8test_v7k0A6Clike8{{.*}}"(i32 %0, i8 %1)
115115
// CHECK: [[ID:%[0-9]+]] = phi i32 [ -1, {{.*}} ], [ 1, {{.*}} ]
116116
// CHECK: ret i32 [[ID]]
117117
// V7K-LABEL: _$s8test_v7k0A6Clike8
@@ -140,7 +140,7 @@ func testClike8(t: Int, x: CLike8) -> Int {
140140

141141
// layout of the enum: the tag bit is set for the no-data cases, which are then
142142
// assigned values in the data area of the enum in declaration order
143-
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k0A7SingleP{{.*}}"(i32, i32, i8)
143+
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k0A7SingleP{{.*}}"(i32 %0, i32 %1, i8 %2)
144144
// CHECK: br i1
145145
// CHECK: switch i64 [[ID:%[0-9]+]]
146146
// CHECK: [[FIRST:%[0-9]+]] = zext i32 %0 to i64
@@ -168,7 +168,7 @@ func testSingleP(x: SinglePayload) -> Double {
168168
}
169169
}
170170

171-
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k0A6MultiP{{.*}}"(i32, i32, i8)
171+
// CHECK-LABEL: define hidden swiftcc double @"$s8test_v7k0A6MultiP{{.*}}"(i32 %0, i32 %1, i8 %2)
172172
// CHECK: [[FIRST:%[0-9]+]] = zext i32 %0 to i64
173173
// CHECK: [[F1:%[0-9]+]] = and i64 [[FIRST]], 4294967295
174174
// CHECK: [[SECOND:%[0-9]+]] = zext i32 %1 to i64
@@ -201,7 +201,7 @@ func testMultiP(x: MultiPayload) -> Double {
201201
}
202202
}
203203

204-
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k0A3Opt{{.*}}"(i32, i8)
204+
// CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k0A3Opt{{.*}}"(i32 %0, i8 %1)
205205
// CHECK: entry:
206206
// CHECK: [[TR:%.*]] = trunc i8 %1
207207
// CHECK: br i1 [[TR]], {{.*}}, label %[[PAYLOADLABEL:.*]]
@@ -221,7 +221,7 @@ func testOpt(x: Float?) -> Float {
221221
}
222222

223223
// Returning tuple: (Int, Int)
224-
// CHECK-LABEL: define hidden swiftcc { i32, i32 } @"$s8test_v7k6minMax{{.*}}"(i32, i32)
224+
// CHECK-LABEL: define hidden swiftcc { i32, i32 } @"$s8test_v7k6minMax{{.*}}"(i32 %0, i32 %1)
225225
// V7K-LABEL: _$s8test_v7k6minMax
226226
// V7K: ldr r0
227227
// V7K: ldr r1
@@ -269,7 +269,7 @@ struct MyRect4 {
269269
s = MySize(w: 1.0, h: 2.0)
270270
}
271271
}
272-
// CHECK-LABEL: define hidden swiftcc { double, double, double, double } @"$s8test_v7k0A4Ret2{{.*}}"(double, i32)
272+
// CHECK-LABEL: define hidden swiftcc { double, double, double, double } @"$s8test_v7k0A4Ret2{{.*}}"(double %0, i32 %1)
273273
// V7K-LABEL: _$s8test_v7k0A4Ret2
274274
// double in d0, i32 in r0, return in d0,...,d3
275275
// V7K: vmov [[ID:s[0-9]+]], r0
@@ -292,7 +292,7 @@ func testRet3() -> MyRect2 {
292292
}
293293

294294
// Returning tuple?: (Int x 6)?
295-
// CHECK-LABEL: define hidden swiftcc void @"$s8test_v7k7minMax2{{.*}}"({{%TSi.*}} noalias nocapture sret, i32, i32)
295+
// CHECK-LABEL: define hidden swiftcc void @"$s8test_v7k7minMax2{{.*}}"({{%TSi.*}} noalias nocapture sret %0, i32 %1, i32 %2)
296296
// V7K-LABEL: _$s8test_v7k7minMax2
297297
// We will indirectly return an optional with the address in r0, input parameters will be in r1 and r2
298298
// V7K: cmp r1, r2
@@ -320,7 +320,7 @@ func minMax2(x : Int, y : Int) -> (min: Int, max: Int, min2: Int, max2: Int, min
320320
}
321321

322322
// Returning struct?: {Int x 6}?
323-
// CHECK-LABEL: define hidden swiftcc void @"$s8test_v7k7minMax3{{.*}}"({{%T.*}} noalias nocapture sret, i32, i32)
323+
// CHECK-LABEL: define hidden swiftcc void @"$s8test_v7k7minMax3{{.*}}"({{%T.*}} noalias nocapture sret %0, i32 %1, i32 %2)
324324
// V7K-LABEL: _$s8test_v7k7minMax3
325325
struct Ret {
326326
var min:Int

‎test/IRGen/abitypes.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class Foo {
4747
// x86_64-macosx: define hidden double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, %TSo6CGRectV* byval align 8 %2) {{[#0-9]*}} {
4848
// armv7-ios: define hidden swiftcc double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}F"(float %0, float %1, float %2, float %3, %T8abitypes3FooC* swiftself %4) {{.*}} {
4949
// armv7-ios: define hidden double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, [4 x i32] %2) {{[#0-9]*}} {
50-
// armv7s-ios: define hidden swiftcc double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}F"(float %0, float %1, float %2, float %3, %T8abitypes3FooC* swiftself %3) {{.*}} {
51-
// armv7s-ios: define hidden double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, [4 x i32] %3) {{[#0-9]*}} {
50+
// armv7s-ios: define hidden swiftcc double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}F"(float %0, float %1, float %2, float %3, %T8abitypes3FooC* swiftself %4) {{.*}} {
51+
// armv7s-ios: define hidden double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, [4 x i32] %2) {{[#0-9]*}} {
5252
// armv7k-watchos: define hidden swiftcc double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}F"(float %0, float %1, float %2, float %3, %T8abitypes3FooC* swiftself %4) {{.*}} {
5353
// armv7k-watchos: define hidden double @"$s8abitypes3FooC14getXFromNSRect{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, [4 x float] %2) {{[#0-9]*}} {
5454
@objc dynamic func getXFromNSRect(_ r: NSRect) -> Double {
@@ -62,7 +62,7 @@ class Foo {
6262
// armv7s-ios: define hidden swiftcc float @"$s8abitypes3FooC12getXFromRect{{[_0-9a-zA-Z]*}}F"(float %0, float %1, float %2, float %3, %T8abitypes3FooC* swiftself %4) {{.*}} {
6363
// armv7s-ios: define hidden float @"$s8abitypes3FooC12getXFromRect{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, [4 x i32] %2) {{[#0-9]*}} {
6464
// armv7k-watchos: define hidden swiftcc float @"$s8abitypes3FooC12getXFromRect{{[_0-9a-zA-Z]*}}F"(float %0, float %1, float %2, float %3, %T8abitypes3FooC* swiftself %4) {{.*}} {
65-
// armv7k-watchos: define hidden float @"$s8abitypes3FooC12getXFromRect{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, [4 x float] %3) {{[#0-9]*}} {
65+
// armv7k-watchos: define hidden float @"$s8abitypes3FooC12getXFromRect{{[_0-9a-zA-Z]*}}FTo"(i8* %0, i8* %1, [4 x float] %2) {{[#0-9]*}} {
6666
@objc dynamic func getXFromRect(_ r: MyRect) -> Float {
6767
return r.x
6868
}
@@ -151,7 +151,7 @@ class Foo {
151151
// armv7-ios: ret float [[RETVAL]]
152152
//
153153
// armv7s returns an HA of four floats indirectly
154-
// armv7s-ios: define hidden swiftcc float @"$s8abitypes3FooC4barc{{[_0-9a-zA-Z]*}}F"(%TSo13StructReturnsC* %0, %T8abitypes3FooC* swiftself % %1) {{.*}} {
154+
// armv7s-ios: define hidden swiftcc float @"$s8abitypes3FooC4barc{{[_0-9a-zA-Z]*}}F"(%TSo13StructReturnsC* %0, %T8abitypes3FooC* swiftself %1) {{.*}} {
155155
// armv7s-ios: [[RESULT:%.*]] = alloca [[RECTTYPE:%.*MyRect.*]], align 4
156156
// armv7s-ios: load i8*, i8** @"\01L_selector(newRect)", align 4
157157
// armv7s-ios: call void bitcast (void ()* @objc_msgSend_stret to void ([[RECTTYPE]]*, [[RECEIVER:.*]]*, i8*)*)([[RECTTYPE]]* noalias nocapture sret %call.aggresult
@@ -514,10 +514,10 @@ class Foo {
514514
}
515515

516516
// arm64-ios: define hidden swiftcc { i64, i64, i64, i64 } @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}F"(%TSo13StructReturnsC* %0, i64 %1, i64 %2, i64 %3, i64 %4, %T8abitypes3FooC* swiftself %5) {{.*}} {
517-
// arm64-ios: define hidden void @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}FTo"(%TSo9BigStructV* noalias nocapture sret, i8*, i8*, [[OPAQUE:.*]]*, %TSo9BigStructV*) {{[#0-9]*}} {
517+
// arm64-ios: define hidden void @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}FTo"(%TSo9BigStructV* noalias nocapture sret %0, i8* %1, i8* %2, [[OPAQUE:.*]]* %3, %TSo9BigStructV* %4) {{[#0-9]*}} {
518518
//
519519
// arm64-tvos: define hidden swiftcc { i64, i64, i64, i64 } @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}F"(%TSo13StructReturnsC* %0, i64 %1, i64 %2, i64 %3, i64 %4, %T8abitypes3FooC* swiftself %5) {{.*}} {
520-
// arm64-tvos: define hidden void @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}FTo"(%TSo9BigStructV* noalias nocapture sret, i8*, i8*, [[OPAQUE:.*]]*, %TSo9BigStructV*) {{[#0-9]*}} {
520+
// arm64-tvos: define hidden void @"$s8abitypes3FooC14callJustReturn{{[_0-9a-zA-Z]*}}FTo"(%TSo9BigStructV* noalias nocapture sret %0, i8* %1, i8* %2, [[OPAQUE:.*]]* %3, %TSo9BigStructV* %4) {{[#0-9]*}} {
521521
@objc dynamic func callJustReturn(_ r: StructReturns, with v: BigStruct) -> BigStruct {
522522
return r.justReturn(v)
523523
}

‎test/IRGen/class_isa_pointers_armv7k_watchos.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Purebred {
1717
}
1818
sil_vtable Purebred {}
1919

20-
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @purebred_method(%T33class_isa_pointers_armv7k_watchos8PurebredC*) {{.*}} {
20+
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @purebred_method(%T33class_isa_pointers_armv7k_watchos8PurebredC* %0) {{.*}} {
2121
// CHECK: [[ISA_PTR:%.*]] = bitcast %T33class_isa_pointers_armv7k_watchos8PurebredC* %0 to %swift.type**
2222
// CHECK: [[ISA:%.*]] = load %swift.type*, %swift.type** [[ISA_PTR]]
2323
// CHECK: [[VTABLE:%.*]] = bitcast %swift.type* [[ISA]]
@@ -38,7 +38,7 @@ class Mongrel: Gizmo {
3838
}
3939
sil_vtable Mongrel {}
4040

41-
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @mongrel_method(%T33class_isa_pointers_armv7k_watchos7MongrelC*) {{.*}} {
41+
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @mongrel_method(%T33class_isa_pointers_armv7k_watchos7MongrelC* %0) {{.*}} {
4242
// CHECK: [[T0:%.*]] = bitcast {{.*}} %0 to %objc_object*
4343
// CHECK: [[T1:%.*]] = call %objc_class* @object_getClass(%objc_object* [[T0]])
4444
// CHECK: [[ISA:%.*]] = bitcast %objc_class* [[T1]] to %swift.type*

‎test/IRGen/class_resilience_objc_armv7k.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class FixedLayoutObjCSubclass : NSObject {
1212
public final var field: Int32 = 0
1313
};
1414

15-
// CHECK-LABEL: define hidden swiftcc void @"$s28class_resilience_objc_armv7k29testConstantDirectFieldAccessyyAA23FixedLayoutObjCSubclassCF"(%T28class_resilience_objc_armv7k23FixedLayoutObjCSubclassC*)
15+
// CHECK-LABEL: define hidden swiftcc void @"$s28class_resilience_objc_armv7k29testConstantDirectFieldAccessyyAA23FixedLayoutObjCSubclassCF"(%T28class_resilience_objc_armv7k23FixedLayoutObjCSubclassC* %0)
1616
// CHECK: [[OFFSET:%.*]] = load [[INT]], [[INT]]* @"$s28class_resilience_objc_armv7k23FixedLayoutObjCSubclassC5fields5Int32VvpWvd"
1717
// CHECK-NEXT: [[OBJECT:%.*]] = bitcast %T28class_resilience_objc_armv7k23FixedLayoutObjCSubclassC* %0 to i8*
1818
// CHECK-NEXT: [[ADDR:%.*]] = getelementptr inbounds i8, i8* [[OBJECT]], [[INT]] [[OFFSET]]
@@ -31,7 +31,7 @@ public class NonFixedLayoutObjCSubclass : NSCoder {
3131
public final var field: Int32 = 0
3232
}
3333

34-
// CHECK-LABEL: define hidden swiftcc void @"$s28class_resilience_objc_armv7k32testNonConstantDirectFieldAccessyyAA0F23FixedLayoutObjCSubclassCF"(%T28class_resilience_objc_armv7k26NonFixedLayoutObjCSubclassC*)
34+
// CHECK-LABEL: define hidden swiftcc void @"$s28class_resilience_objc_armv7k32testNonConstantDirectFieldAccessyyAA0F23FixedLayoutObjCSubclassCF"(%T28class_resilience_objc_armv7k26NonFixedLayoutObjCSubclassC* %0)
3535
// CHECK: [[OFFSET:%.*]] = load [[INT]], [[INT]]* @"$s28class_resilience_objc_armv7k26NonFixedLayoutObjCSubclassC5fields5Int32VvpWvd"
3636
// CHECK-NEXT: [[OBJECT:%.*]] = bitcast %T28class_resilience_objc_armv7k26NonFixedLayoutObjCSubclassC* %0 to i8*
3737
// CHECK-NEXT: [[ADDR:%.*]] = getelementptr inbounds i8, i8* [[OBJECT]], [[INT]] [[OFFSET]]
@@ -53,7 +53,7 @@ public class GenericObjCSubclass<T> : NSCoder {
5353
}
5454
}
5555

56-
// CHECK-LABEL: define hidden swiftcc void @"$s28class_resilience_objc_armv7k31testConstantIndirectFieldAccessyyAA19GenericObjCSubclassCyxGlF"(%T28class_resilience_objc_armv7k19GenericObjCSubclassC*)
56+
// CHECK-LABEL: define hidden swiftcc void @"$s28class_resilience_objc_armv7k31testConstantIndirectFieldAccessyyAA19GenericObjCSubclassCyxGlF"(%T28class_resilience_objc_armv7k19GenericObjCSubclassC* %0)
5757

5858
// FIXME: we could eliminate the unnecessary isa load by lazily emitting
5959
// metadata sources in EmitPolymorphicParameters

‎test/IRGen/pic.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public func use_global() -> Int {
5858
// armv7k: ldr [[R_ADR]], {{\[}}[[R_ADR]]{{\]}}
5959

6060
// arm64-LABEL: {{_?}}$s4main10use_globalSiyF:
61-
// arm64: bl _swift_beginAccess
6261
// arm64: adrp [[REG1:x[0-9]+]], _$s4main6globalSivp@PAGE
6362
// arm64: add [[REG1]], [[REG1]], _$s4main6globalSivp@PAGEOFF
63+
// arm64: bl _swift_beginAccess
6464
// arm64: ldr [[REG2:x[0-9]+]], {{\[}}[[REG1]]{{\]}}
6565
// arm64: str [[REG2]], [sp]
6666
// arm64: bl _swift_endAccess

0 commit comments

Comments
 (0)