Merge pull request swiftlang#72261 from nate-chandler/rdar124464363

[Test] Eased check lines for 32-bit.

Author: nate-chandler

test/SILOptimizer/builtins.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -enable-builtin-module -O -emit-sil %s | %FileCheck %s
+// RUN: %target-swift-frontend -enable-builtin-module -O -emit-sil %s | %IRGenFileCheck %s
 
 import Builtin
 
@@ -10,7 +10,7 @@ import Builtin
 // CHECK-SAME:      {{%[^,]+}} : $@thick T.Type):
 // CHECK:         [[SELF_RAW_VALUE:%[^,]+]] = struct_extract [[SELF]] : {{.*}} #UnsafeMutableRawPointer._rawValue
 // CHECK:         [[OFFSET_VALUE:%[^,]+]] = struct_extract [[OFFSET]] : {{.*}} #Int._value
-// CHECK:         [[OFFSET_WORD:%[^,]+]] = builtin "truncOrBitCast_Int64_Word"([[OFFSET_VALUE]] : $Builtin.Int64)
+// CHECK:         [[OFFSET_WORD:%[^,]+]] = builtin "{{trunc|sext}}OrBitCast_Int[[PTR_SIZE]]_Word"([[OFFSET_VALUE]] : $Builtin.Int[[PTR_SIZE]])
 // CHECK:         [[DESTINATION_POINTER:%[^,]+]] = index_raw_pointer [[SELF_RAW_VALUE]] : $Builtin.RawPointer, [[OFFSET_WORD]]
 // CHECK:         [[DESTINATION:%[^,]+]] = pointer_to_address [[DESTINATION_POINTER]] : $Builtin.RawPointer to [align=1]
 // CHECK:         copy_addr [[VALUE]] to [[DESTINATION]]

test/SILOptimizer/stdlib/Atomics.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -O -emit-sil -disable-availability-checking %s | %FileCheck %s
+// RUN: %target-swift-frontend -O -emit-sil -disable-availability-checking %s | %IRGenFileCheck %s
 
 // REQUIRES: synchronization
 
@@ -11,7 +11,7 @@ import Synchronization
 // CHECK-LABEL: sil {{.*}} @localLoad {{.*}} {
 // CHECK:         [[ATOMIC:%.*]] = alloc_stack [lexical] [var_decl] $Atomic<Int>
 // CHECK:         [[ATOMIC_PTR:%.*]] = address_to_pointer [[ATOMIC]]
-// CHECK:         builtin "atomicload_monotonic_Int64"([[ATOMIC_PTR]] : $Builtin.RawPointer)
+// CHECK:         builtin "atomicload_monotonic_Int[[PTR_SIZE]]"([[ATOMIC_PTR]] : $Builtin.RawPointer)
 // CHECK:         destroy_addr [[ATOMIC]] : $*Atomic<Int>
 // CHECK-NEXT:    dealloc_stack [[ATOMIC]] : $*Atomic<Int>
 // CHECK-LABEL: } // end sil function 'localLoad'
@@ -24,7 +24,7 @@ func localLoad() -> Int {
 // CHECK-LABEL: sil {{.*}} @localStore {{.*}} {
 // CHECK:         [[ATOMIC:%.*]] = alloc_stack [lexical] [var_decl] $Atomic<Int>
 // CHECK:         [[ATOMIC_PTR:%.*]] = address_to_pointer [[ATOMIC]]
-// CHECK:         builtin "atomicstore_release_Int64"([[ATOMIC_PTR]] : $Builtin.RawPointer
+// CHECK:         builtin "atomicstore_release_Int[[PTR_SIZE]]"([[ATOMIC_PTR]] : $Builtin.RawPointer
 // CHECK:         destroy_addr [[ATOMIC]] : $*Atomic<Int>
 // CHECK-NEXT:    dealloc_stack [[ATOMIC]] : $*Atomic<Int>
 // CHECK-LABEL: } // end sil function 'localStore'
@@ -37,7 +37,7 @@ func localStore() {
 // CHECK-LABEL: sil {{.*}} @localExchange {{.*}} {
 // CHECK:         [[ATOMIC:%.*]] = alloc_stack [lexical] [var_decl] $Atomic<Int>
 // CHECK:         [[ATOMIC_PTR:%.*]] = address_to_pointer [[ATOMIC]]
-// CHECK:         builtin "atomicrmw_xchg_acquire_Int64"([[ATOMIC_PTR]] : $Builtin.RawPointer
+// CHECK:         builtin "atomicrmw_xchg_acquire_Int[[PTR_SIZE]]"([[ATOMIC_PTR]] : $Builtin.RawPointer
 // CHECK:         destroy_addr [[ATOMIC]] : $*Atomic<Int>
 // CHECK-NEXT:    dealloc_stack [[ATOMIC]] : $*Atomic<Int>
 // CHECK-LABEL: } // end sil function 'localExchange'
@@ -50,7 +50,7 @@ func localExchange() -> Int {
 // CHECK-LABEL: sil {{.*}} @localCompareExchange {{.*}} {
 // CHECK:         [[ATOMIC:%.*]] = alloc_stack [lexical] [var_decl] $Atomic<Int>
 // CHECK:         [[ATOMIC_PTR:%.*]] = address_to_pointer [[ATOMIC]]
-// CHECK:         builtin "cmpxchg_seqcst_seqcst_Int64"([[ATOMIC_PTR]] : $Builtin.RawPointer
+// CHECK:         builtin "cmpxchg_seqcst_seqcst_Int[[PTR_SIZE]]"([[ATOMIC_PTR]] : $Builtin.RawPointer
 // CHECK:         destroy_addr [[ATOMIC]] : $*Atomic<Int>
 // CHECK-NEXT:    dealloc_stack [[ATOMIC]] : $*Atomic<Int>
 // CHECK-LABEL: } // end sil function 'localCompareExchange'

test/lit.cfg

@@ -2862,7 +2862,7 @@ else:
 
 # A FileCheck that automatically supports a large variety of target
 # conditionalization that's useful in IRGen.
-IRGenFileCheck = '%s --check-prefix=CHECK --check-prefix=CHECK-%s --check-prefix=CHECK-%s --check-prefix=CHECK-%s --check-prefix=CHECK-%s --check-prefix=CHECK-%s --check-prefix=CHECK-%s -DINT=i%s -D#CLASS_METADATA_HEADER=%s' % (
+IRGenFileCheck = '%s --check-prefix=CHECK --check-prefix=CHECK-%s --check-prefix=CHECK-%s --check-prefix=CHECK-%s --check-prefix=CHECK-%s --check-prefix=CHECK-%s --check-prefix=CHECK-%s -DINT=i%s -DPTR_SIZE=%s -D#CLASS_METADATA_HEADER=%s' % (
         run_filecheck,
         run_os,
         run_cpu,
@@ -2871,6 +2871,7 @@ IRGenFileCheck = '%s --check-prefix=CHECK --check-prefix=CHECK-%s --check-prefix
         run_ptrauth,
         run_objc_interop,
         run_ptrsize,
+        run_ptrsize,
         run_class_metadata_header_size)
 config.substitutions.append( ('%IRGenFileCheck', IRGenFileCheck) )