Merge pull request #75797 from eeckstein/fix-tests-for-rebranch

tests: adapt some optimizer tests for rebranch

Author: eeckstein

test/SILOptimizer/character_literals.swift

@@ -45,7 +45,9 @@ public func singleNonAsciiChar() -> Character {
 //
 // CHECK-LABEL: define {{.*}}singleNonSmolChar
 // CHECK-NEXT: entry:
-// CHECK:   ret { i64, ptr } { i64 1152921504606847001, ptr {{.*}}@".str.25.\F0\9F\91\A9\E2\80\8D\F0\9F\91\A9\E2\80\8D\F0\9F\91\A6\E2\80\8D\F0\9F\91\A6" {{.*}}i64 {{-9223372036854775808|36028797018963968}}
+// CHECK-DAG:   1152921504606847001
+// CHECK-DAG:   @".str.25.\F0\9F\91\A9\E2\80\8D\F0\9F\91\A9\E2\80\8D\F0\9F\91\A6\E2\80\8D\F0\9F\91\A6"
+// CHECK-DAG:   {{-9223372036854775808|36028797018963968}}
 public func singleNonSmolChar() -> Character {
   return "👩‍👩‍👦‍👦"
 }

test/SILOptimizer/concat_string_literals.64.swift

@@ -11,6 +11,10 @@
 // so these tests will need to be adapted for that.
 // XFAIL: OS=linux-android && CPU=aarch64
 
+
+// CHECK: [[S1:^@".*"]] = {{.*}} c"a{{.*}}+{{.*}}={{.*}}\00"
+// CHECK: [[S2:^@".*"]] = {{.*}} c"abcd{{.*}}fgh{{.*}}klmno{{.*}}qr\00"
+
 // NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
 // CHECK-LABEL: test_ascii_scalar_scalar2
 // CHECK:  ret { i64, ptr } { i64 25185, ptr inttoptr (i64 -{{[0-9]+}} to ptr) }
@@ -42,7 +46,8 @@ public func test_strng_strng2() -> String {
 
 // NOTE: 1152921504606847019 = 43 (code-unit length) | `isTailAllocated` perf flag
 // CHECK-LABEL: test_scalar_strng
-// CHECK:  ret { i64, ptr } { i64 1152921504606847019, ptr inttoptr {{.*}}i64 -{{[0-9]+}}{{.*}} to ptr) }
+// CHECK-DAG: 1152921504606847019
+// CHECK-DAG: [[S1]]
 public func test_scalar_strng() -> String {
   return "a" + "👨🏿‍💼+🧙🏿‍♂️=🕴🏿"
 }
@@ -56,7 +61,8 @@ public func test_strng_concat_smol() -> String {
 
 // NOTE: 1152921504606846999 = 23 (code-unit length) | `isTailAllocated` perf flag
 // CHECK-LABEL: test_strng_concat_large
-// CHECK:  ret { i64, ptr } { i64 1152921504606846999, ptr inttoptr {{.*}}i64 -{{[0-9]+}}{{.*}} to ptr) }
+// CHECK-DAG: 1152921504606846999
+// CHECK-DAG: [[S2]]
 public func test_strng_concat_large() -> String {
   return "a" + "bc" + "dèf" + "ghī" + "jklmn" + "o" + "𝛒qr"
 }

test/SILOptimizer/static_objects.swift

@@ -36,7 +36,7 @@ public let c = C(x: 27)
 // CHECK:       } // end sil function '$s4test6testitAA1CCyF'
 
 // CHECK-LLVM-LABEL: define {{.*}} @"$s4test6testitAA1CCyF"
-// CHECK-LLVM:         [[C:%.*]] = tail call ptr @swift_initStaticObject({{.*}} getelementptr {{.*}}, ptr @"$s4test1c_WZTv_", i64 0, i32 1))
+// CHECK-LLVM:         [[C:%.*]] = tail call ptr @swift_initStaticObject({{.*}} getelementptr {{.*}}, ptr @"$s4test1c_WZTv_"
 // CHECK-LLVM-NEXT:    ret ptr [[C]]
 // CHECK-LLVM:       }
 @inline(never)

test/SILOptimizer/static_strings.swift

@@ -9,6 +9,10 @@
 // REQUIRES: CPU=arm64 || CPU=x86_64
 // REQUIRES: swift_in_compiler
 
+// The required relocation format for a single return LLVM instruction are not necessarily
+// supported on object file formats other than Mach-O.
+// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchOS || OS=xros
+
 // This is an end-to-end test to ensure that the optimizer generates
 // optimal code for static String variables.
 

test/SILOptimizer/string_literals.swift

@@ -3,6 +3,10 @@
 // REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
 // REQUIRES: swift_in_compiler
 
+// The required relocation format for a single return LLVM instruction are not necessarily
+// supported on object file formats other than Mach-O.
+// REQUIRES: OS=macosx || OS=ios || OS=tvos || OS=watchOS || OS=xros
+
 // FIXME(rdar://problem/45856408): The 7-bit discriminator complicates codegen
 // on 32-bit platforms.
 // UNSUPPORTED: PTRSIZE=32