Skip to content

Commit 679a4d8

Browse files
aschwaighoferaschwaighofer
committed
Add fixes test/SILOptimizer test
1 parent 92499e1 commit 679a4d8

File tree

4 files changed

+20
-26
lines changed

4 files changed

+20
-26
lines changed

‎test/SILOptimizer/concat_string_literals.64.swift

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// RUN: %target-swift-frontend %use_no_opaque_pointers -O -emit-ir %s | %FileCheck %s
2-
// RUN: %target-swift-frontend %use_no_opaque_pointers -Osize -emit-ir %s | %FileCheck %s
3-
// RUN: %target-swift-frontend -O -emit-ir %s
4-
// RUN: %target-swift-frontend -Osize -emit-ir %s
1+
// RUN: %target-swift-frontend -O -emit-ir %s | %FileCheck %s
2+
// RUN: %target-swift-frontend -Osize -emit-ir %s | %FileCheck %s
53
// REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
64

75
// REQUIRES: swift_in_compiler
@@ -15,50 +13,50 @@
1513

1614
// NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
1715
// CHECK-LABEL: test_ascii_scalar_scalar2
18-
// CHECK: ret { i64, %swift.bridge* } { i64 25185, %swift.bridge* inttoptr (i64 -{{[0-9]+}} to %swift.bridge*) }
16+
// CHECK: ret { i64, ptr } { i64 25185, ptr inttoptr (i64 -{{[0-9]+}} to ptr) }
1917
public func test_ascii_scalar_scalar2() -> String {
2018
return "a" + "b"
2119
}
2220

2321

2422
// NOTE: 11125601.byteSwapped = 0x61 'a', 0xC3 0xA9 'é'
2523
// CHECK-LABEL: test_scalar_otherscalar
26-
// CHECK: ret { i64, %swift.bridge* } { i64 11125601, %swift.bridge* inttoptr (i64 -{{[0-9]+}} to %swift.bridge*) }
24+
// CHECK: ret { i64, ptr } { i64 11125601, ptr inttoptr (i64 -{{[0-9]+}} to ptr) }
2725
public func test_scalar_otherscalar() -> String {
2826
return "a" + "é"
2927
}
3028

3129
// NOTE: -8097488946593795999.byteSwapped = 0x61 'a', 0xF0 0x9F 0x95 0xb4 '🕴', ...
3230
// CHECK-LABEL: test_scalar_char
33-
// CHECK: ret { i64, %swift.bridge* } { i64 -8097488946593795999, %swift.bridge* inttoptr (i64 -{{[0-9]+}} to %swift.bridge*) }
31+
// CHECK: ret { i64, ptr } { i64 -8097488946593795999, ptr inttoptr (i64 -{{[0-9]+}} to ptr) }
3432
public func test_scalar_char() -> String {
3533
return "a" + "🕴🏿"
3634
}
3735

3836
// NOTE: 112585666577249.byteSwapped = 0x61 'a', 0xc3 0xa9 'é', 0x64 'd', 0x65 'e', 0x66 'f'
3937
// CHECK-LABEL: test_strng_strng2
40-
// CHECK: ret { i64, %swift.bridge* } { i64 112585666577249, %swift.bridge* inttoptr (i64 -{{[0-9]+}} to %swift.bridge*) }
38+
// CHECK: ret { i64, ptr } { i64 112585666577249, ptr inttoptr (i64 -{{[0-9]+}} to ptr) }
4139
public func test_strng_strng2() -> String {
4240
return "aé" + "def"
4341
}
4442

4543
// NOTE: 1152921504606847019 = 43 (code-unit length) | `isTailAllocated` perf flag
4644
// CHECK-LABEL: test_scalar_strng
47-
// CHECK: ret { i64, %swift.bridge* } { i64 1152921504606847019, %swift.bridge* inttoptr {{.*}}i64 -{{[0-9]+}}{{.*}} to %swift.bridge*) }
45+
// CHECK: ret { i64, ptr } { i64 1152921504606847019, ptr inttoptr {{.*}}i64 -{{[0-9]+}}{{.*}} to ptr) }
4846
public func test_scalar_strng() -> String {
4947
return "a" + "👨🏿‍💼+🧙🏿‍♂️=🕴🏿"
5048
}
5149

5250
// NOTE: 7450828190687388257.byteSwapped = 0x61 'a', 0x62 'b', 0x63 'c', 0x64 'd', 0xC3 0xA8 'è', 0x66 'f', 0x67 'g', ...
5351
// CHECK-LABEL: test_strng_concat_smol
54-
// CHECK: ret { i64, %swift.bridge* } { i64 7450828190687388257, %swift.bridge* inttoptr (i64 -{{[0-9]+}} to %swift.bridge*) }
52+
// CHECK: ret { i64, ptr } { i64 7450828190687388257, ptr inttoptr (i64 -{{[0-9]+}} to ptr) }
5553
public func test_strng_concat_smol() -> String {
5654
return "a" + "bc" + "dèf" + "ghī"
5755
}
5856

5957
// NOTE: 1152921504606846999 = 23 (code-unit length) | `isTailAllocated` perf flag
6058
// CHECK-LABEL: test_strng_concat_large
61-
// CHECK: ret { i64, %swift.bridge* } { i64 1152921504606846999, %swift.bridge* inttoptr {{.*}}i64 -{{[0-9]+}}{{.*}} to %swift.bridge*) }
59+
// CHECK: ret { i64, ptr } { i64 1152921504606846999, ptr inttoptr {{.*}}i64 -{{[0-9]+}}{{.*}} to ptr) }
6260
public func test_strng_concat_large() -> String {
6361
return "a" + "bc" + "dèf" + "ghī" + "jklmn" + "o" + "𝛒qr"
6462
}

‎test/SILOptimizer/devirt_witness_method_empty_conformance.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %target-swift-frontend %use_no_opaque_pointers -O -emit-ir -primary-file %s | %FileCheck %s
2-
// RUN: %target-swift-frontend -O -emit-ir -primary-file %s
1+
// RUN: %target-swift-frontend -O -emit-ir -primary-file %s | %FileCheck %s
32

43
public struct PublicStruct {
54
}
@@ -77,7 +76,7 @@ extension ApplyRegStruct {
7776
from space: PublicEnum, transform: RegStruct
7877
) {
7978
transform.funcInStructAndProtAndExt(.case2, space: space) {
80-
// CHECK-LABEL: define hidden swiftcc void @"$sSa39devirt_witness_method_empty_conformanceAA12PublicStructVRszlE14applyTransformyyF"(%TSa* nocapture {{.*}}swiftself dereferenceable
79+
// CHECK-LABEL: define hidden swiftcc void @"$sSa39devirt_witness_method_empty_conformanceAA12PublicStructVRszlE14applyTransformyyF"(ptr nocapture {{.*}}swiftself dereferenceable
8180
// CHECK-NEXT: entry
8281
// CHECK-NEXT: ret void
8382
applyTransform()

‎test/SILOptimizer/llvm_arc.sil

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %target-swift-frontend %use_no_opaque_pointers -O -emit-ir %s | %FileCheck %s
2-
// RUN: %target-swift-frontend -O -emit-ir %s
1+
// RUN: %target-swift-frontend -O -emit-ir %s | %FileCheck %s
32
//
43
// Test LLVM ARC Optimization
54

@@ -16,12 +15,12 @@ sil @getObject : $@convention(thin) <T where T : AnyObject> () -> T
1615
// Test swift_getObjCClassFromObject side-effects. It reads the object
1716
// argument. A release cannot be hoisted above it.
1817
//
19-
// CHECK-LABEL: define {{.*}}swiftcc %objc_class* @testGetObjCClassFromObjectSideEffect(%swift.type* %T)
18+
// CHECK-LABEL: define {{.*}}swiftcc ptr @testGetObjCClassFromObjectSideEffect(ptr %T)
2019
// CHECK: entry:
21-
// CHECK-NEXT: %0 = tail call swiftcc %objc_object* @getObject(%swift.type* %T)
22-
// CHECK-NEXT: %.Type = tail call %objc_class* @swift_getObjCClassFromObject(%objc_object* %0)
23-
// CHECK-NEXT: tail call void @swift_unknownObjectRelease(%objc_object* %0)
24-
// CHECK: ret %objc_class* %.Type
20+
// CHECK-NEXT: %0 = tail call swiftcc ptr @getObject(ptr %T)
21+
// CHECK-NEXT: %.Type = tail call ptr @swift_getObjCClassFromObject(ptr %0)
22+
// CHECK-NEXT: tail call void @swift_unknownObjectRelease(ptr %0)
23+
// CHECK: ret ptr %.Type
2524
// CHECK: }
2625
sil @testGetObjCClassFromObjectSideEffect : $@convention(thin) <T where T : AnyObject> () -> @objc_metatype T.Type {
2726
bb0:

‎test/SILOptimizer/unsafebufferpointer.swift

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// RUN: %target-swift-frontend %use_no_opaque_pointers -parse-as-library -Osize -emit-ir %s | %FileCheck %s
2-
// RUN: %target-swift-frontend -parse-as-library -Osize -emit-ir %s
1+
// RUN: %target-swift-frontend -parse-as-library -Osize -emit-ir %s | %FileCheck %s
32
// REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
43
// REQUIRES: swift_in_compiler
54

@@ -17,7 +16,6 @@ public func testIteration(_ p: UnsafeBufferPointer<Int>) -> Int {
1716
// CHECK: phi
1817
// CHECK-NEXT: phi
1918
// CHECK-NEXT: getelementptr
20-
// CHECK-NEXT: bitcast
2119
// CHECK-NEXT: load
2220
// CHECK-NEXT: add
2321
// CHECK-NEXT: icmp
@@ -54,7 +52,7 @@ public func testCount(_ x: UnsafeBufferPointer<UInt>) -> Int {
5452
//
5553
// CHECK: [[LOOP]]:
5654
// CHECK: phi float [ 0.000000e+00
57-
// CHECK: load float, float*
55+
// CHECK: load float, ptr
5856
// CHECK: fadd float
5957
// CHECK: [[CMP:%[0-9]+]] = icmp eq
6058
// CHECK: br i1 [[CMP]], label %.loopexit, label %[[LOOP]]
@@ -76,7 +74,7 @@ public func testSubscript(_ ubp: UnsafeBufferPointer<Float>) -> Float {
7674
//
7775
// CHECK: [[LOOP]]:
7876
// CHECK: phi i64 [ 0
79-
// CHECK: load i8, i8*
77+
// CHECK: load i8, ptr
8078
// CHECK: zext i8 %{{.*}} to i64
8179
// CHECK: add i64
8280
// CHECK: [[CMP:%[0-9]+]] = icmp eq

0 commit comments

Comments
 (0)