Merge pull request #83401 from swiftlang/revert-83234-wip-155863017-6.2

Revert "[6.2][Test] Fix IRGen/abi_v7k.swift"

Author: xymus

test/IRGen/abi_v7k.swift

@@ -98,7 +98,7 @@ func testData(x: DataCase) -> Double {
 // CHECK: [[ID:%[0-9]+]] = phi i32 [ 2, {{.*}} ], [ 1, {{.*}} ]
 // CHECK: ret i32 [[ID]]
 // V7K-LABEL: _$s8test_v7k0A6Clike2
-// V7K: cmp r0, #1
+// V7K: tst.w r0, #1
 // V7K: movs r0, #1
 // V7K: movs r0, #2
 enum CLike2 {
@@ -155,8 +155,7 @@ func testClike8(t: Int, x: CLike8) -> Int {
 // CHECK: bitcast i64 [[RESULT]] to double
 // CHECK: phi double [ 0.000000e+00, {{.*}} ]
 // V7K-LABEL: _$s8test_v7k0A7SingleP
-// V7K: sxtb [[R0:r[0-9]+]], r2
-// V7K: cmp [[R0]], #1
+// V7K: tst.w     r2, #1
 // V7K: vldr    d0, [{{.*}}]
 enum SinglePayload {
   case Paragraph
@@ -213,14 +212,13 @@ func testMultiP(x: MultiPayload) -> Double {
 
 // CHECK-LABEL: define hidden swiftcc float @"$s8test_v7k0A3Opt{{.*}}"(i32 %0, i8 %1)
 // CHECK: entry:
-// CHECK: [[TR:%.*]] = icmp eq i8 %1, 1
+// CHECK: [[TR:%.*]] = trunc i8 %1
 // CHECK: br i1 [[TR]], {{.*}}, label %[[PAYLOADLABEL:.*]]
 // CHECK: [[PAYLOADLABEL]]:
 // CHECK: [[ID:%[0-9]+]] = bitcast i32 %0 to float
 // CHECK: ret float
 // V7K-LABEL: _$s8test_v7k0A3Opt
-// V7K:         sxtb    [[R0:r[0-9]+]], r1
-// V7K:         cmp     [[R0]], #1
+// V7K:         tst.w     r1, #1
 // V7K:         vmov    s0, r0
 // V7K:         vstr    s0, [sp, [[SLOT:#[0-9]+]]
 // V7K:         vldr    s0, [sp, [[SLOT]]
@@ -310,6 +308,7 @@ func testRet3() -> MyRect2 {
 // V7K: str.w {{.*}}, [{{.*}}[[R0_RELOAD]], #12]
 // V7K: str {{.*}}, [{{.*}}[[R0_RELOAD]], #16]
 // V7K: str {{.*}}, [{{.*}}[[R0_RELOAD]], #20]
+// V7K: and {{.*}}, {{.*}}, #1
 // V7K: strb {{.*}}, [{{.*}}[[R0_RELOAD]], #24]
 func minMax2(x : Int, y : Int) -> (min: Int, max: Int, min2: Int, max2: Int, min3: Int, max3: Int)? {
     if x == y {