Align llvm-spirv tests

Author: vmaksimo

llvm-spirv/test/SpecConstants/OpSpecConstantComposite.spvasm

@@ -23,7 +23,7 @@
 
 ; CHECK-DEFAULT: store %struct._ZTS3POD.POD { [2 x %struct._ZTS1A.A] [%struct._ZTS1A.A { i32 1, float 0.000000e+00 }, %struct._ZTS1A.A { i32 35, float 0.000000e+00 }], %"class._ZTSN2cl4sycl3vecIiLi2EEE.cl::sycl::vec" { <2 x i32> <i32 45, i32 55> }     }, ptr addrspace(4) %[[#]]
 
-; CHECK-SPEC: store %struct._ZTS3POD.POD { [2 x %struct._ZTS1A.A] [%struct._ZTS1A.A { i32 42, float 0x4005AE1480000000 }, %struct._ZTS1A.A { i32 43, float 0x40091EB860000000 }], %"class._ZTSN2cl4sycl3vecIiLi2EEE.cl::sycl::vec" { <2 x i32> <i32 44, i32 55> } }, ptr addrspace(4) %3
+; CHECK-SPEC: store %struct._ZTS3POD.POD { [2 x %struct._ZTS1A.A] [%struct._ZTS1A.A { i32 42, float 0x4005AE1480000000 }, %struct._ZTS1A.A { i32 43, float 0x40091EB860000000 }], %"class._ZTSN2cl4sycl3vecIiLi2EEE.cl::sycl::vec" { <2 x i32> <i32 44, i32 55> } }, ptr addrspace(4) %2
 
 ; SPIR-V
 ; Version: 1.1
@@ -113,13 +113,12 @@
          %32 = OpInBoundsPtrAccessChain %_ptr_Function_ulong %_arg_3 %ulong_0 %uint_0 %uint_0 %ulong_0
          %33 = OpLoad %ulong %32 Aligned 8
   %add_ptr_i = OpInBoundsPtrAccessChain %_ptr_CrossWorkgroup_struct__ZTS3POD_POD %_arg_ %33
-         %37 = OpBitcast %_ptr_Function_uchar %ref_tmp_i
-               OpLifetimeStart %37 24
+               OpLifetimeStart %ref_tmp_i 24
          %39 = OpPtrCastToGeneric %_ptr_Generic_struct__ZTS3POD_POD %ref_tmp_i
                OpStore %39 %51 Aligned 8
          %53 = OpBitcast %_ptr_CrossWorkgroup_uchar %add_ptr_i
          %55 = OpPtrCastToGeneric %_ptr_Generic_uchar %53
-               OpCopyMemorySized %55 %37 %ulong_24 Aligned 8
-               OpLifetimeStop %37 24
+               OpCopyMemorySized %55 %ref_tmp_i %ulong_24 Aligned 8
+               OpLifetimeStop %ref_tmp_i 24
                OpReturn
                OpFunctionEnd

llvm-spirv/test/addrspacecast_null.ll

@@ -8,7 +8,10 @@
 
 ; CHECK: %_ptr_CrossWorkgroup_uchar = OpTypePointer CrossWorkgroup %uchar
 ; CHECK: %[[NULL:[0-9]+]] = OpConstantNull %_ptr_CrossWorkgroup_uchar
-; CHECK: OpPtrEqual %bool %[[NULL]]
+; We don't support OpPtrEqual instruction after KhronosGroup/SPIRV-LLVM-Translator@5e0f14b5a09d961 was reverted.
+; TODO: use community check-lines after the change relands.
+; CHECK: %[[U:[0-9]+]] = OpConvertPtrToU %ulong %[[NULL]]
+; CHECK: OpIEqual %bool %[[U]]
 
 target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-G1"
 target triple = "spir64-unknown-unknown"