[SPIR-V] Fixup tests (llvm#73371)

These tests are currently failing at tip-of-tree, but pass with minor
FileCheck updates that look reasonable.

Author: sudonatalie

llvm/test/CodeGen/SPIRV/opencl/basic/get_global_offset.ll

@@ -12,6 +12,8 @@
 ; CHECK: %[[#int64_ty:]] = OpTypeInt 64 0
 ; CHECK: %[[#vec_ty:]] = OpTypeVector %[[#int64_ty]] 3
 ; CHECK: %[[#func2_ty:]] = OpTypeFunction %[[#vec_ty]]
+; CHECK: %[[#int32_ty:]] = OpTypeInt 32 0
+; CHECK: %[[#i32ptr_ty:]] = OpTypePointer CrossWorkgroup  %[[#int32_ty]]
 ;; TODO: add 64-bit constant defs
 ; CHECK: %[[#f2_decl]] = OpFunction %[[#vec_ty]] Pure %[[#func2_ty]]
 ; CHECK: OpFunctionEnd
@@ -31,21 +33,21 @@ entry:
   %0 = call spir_func <3 x i64> @BuiltInGlobalOffset() #1
   %call = extractelement <3 x i64> %0, i32 0
   %conv = trunc i64 %call to i32
-; CHECK: %[[#i1:]] = OpInBoundsPtrAccessChain %[[#iptr_ty]] %[[#outOffsets]]
+; CHECK: %[[#i1:]] = OpInBoundsPtrAccessChain %[[#i32ptr_ty]] %[[#outOffsets]]
 ; CHECK: OpStore %[[#i1:]] %[[#]] Aligned 4
   %arrayidx = getelementptr inbounds i32, i32 addrspace(1)* %outOffsets, i64 0
   store i32 %conv, i32 addrspace(1)* %arrayidx, align 4
   %1 = call spir_func <3 x i64> @BuiltInGlobalOffset() #1
   %call1 = extractelement <3 x i64> %1, i32 1
   %conv2 = trunc i64 %call1 to i32
-; CHECK: %[[#i2:]] = OpInBoundsPtrAccessChain %[[#iptr_ty]] %[[#outOffsets]]
+; CHECK: %[[#i2:]] = OpInBoundsPtrAccessChain %[[#i32ptr_ty]] %[[#outOffsets]]
 ; CHECK: OpStore %[[#i2:]] %[[#]] Aligned 4
   %arrayidx3 = getelementptr inbounds i32, i32 addrspace(1)* %outOffsets, i64 1
   store i32 %conv2, i32 addrspace(1)* %arrayidx3, align 4
   %2 = call spir_func <3 x i64> @BuiltInGlobalOffset() #1
   %call4 = extractelement <3 x i64> %2, i32 2
   %conv5 = trunc i64 %call4 to i32
-; CHECK: %[[#i3:]] = OpInBoundsPtrAccessChain %[[#iptr_ty]] %[[#outOffsets]]
+; CHECK: %[[#i3:]] = OpInBoundsPtrAccessChain %[[#i32ptr_ty]] %[[#outOffsets]]
 ; CHECK: OpStore %[[#i3:]] %[[#]] Aligned 4
   %arrayidx6 = getelementptr inbounds i32, i32 addrspace(1)* %outOffsets, i64 2
   store i32 %conv5, i32 addrspace(1)* %arrayidx6, align 4

llvm/test/CodeGen/SPIRV/struct.ll

@@ -3,11 +3,10 @@
 %struct.ST = type { i32, i32, i32 }
 
 ; CHECK-DAG: OpName %[[#struct:]] "struct.ST"
-; CHECK-DAG: %[[#char:]] = OpTypeInt 8 0
 ; CHECK-DAG: %[[#int:]] = OpTypeInt 32 0
 ; CHECK-DAG: %[[#struct]] = OpTypeStruct %[[#int]] %[[#int]] %[[#int]]
 ; CHECK-DAG: %[[#structP:]] = OpTypePointer Function %[[#struct]]
-; CHECK-DAG: %[[#intP:]] = OpTypePointer Function %[[#char]]
+; CHECK-DAG: %[[#intP:]] = OpTypePointer Function %[[#int]]
 ; CHECK-DAG: %[[#zero:]] = OpConstant %[[#int]] 0
 ; CHECK-DAG: %[[#one:]] = OpConstant %[[#int]] 1
 ; CHECK-DAG: %[[#two:]] = OpConstant %[[#int]] 2