Update DebugInfo LIT checks for opaque pointers

karolzwolak · igcbot · commit 98c7a0b09ded · 2026-06-05T12:17:11.000+02:00
Update &amp; re-enable DebugInfo LIT test checks for opaque pointers.
diff --git a/IGC/Compiler/tests/DebugInfo/AggregateArgumentsAnalysis.ll b/IGC/Compiler/tests/DebugInfo/AggregateArgumentsAnalysis.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers -igc-agg-arg-analysis -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; AggregateArgumentsAnalysis
@@ -43,29 +43,29 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3
 
 ; IR check:
 ;
-; CHECK: define spir_kernel void @bar(%struct._st_foo* byval(%struct._st_foo) %src) #0 !dbg [[KERNEL_SCOPE:![0-9]*]]
+; CHECK: define spir_kernel void @bar(ptr byval(%struct._st_foo) %src) #0 !dbg [[KERNEL_SCOPE:![0-9]*]]
 ; CHECK-NEXT: entry:
-; CHECK: @llvm.dbg.declare(metadata %struct._st_foo* %src, metadata [[SRC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SRC_LOC:![0-9]*]]
-; CHECK: @llvm.dbg.declare(metadata %struct._st_foo* %temp, metadata [[TEMP_MD:![0-9]*]], metadata !DIExpression()), !dbg [[TEMP_LOC:![0-9]*]]
+; CHECK: @llvm.dbg.declare(metadata ptr %src, metadata [[SRC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SRC_LOC:![0-9]*]]
+; CHECK: @llvm.dbg.declare(metadata ptr %temp, metadata [[TEMP_MD:![0-9]*]], metadata !DIExpression()), !dbg [[TEMP_LOC:![0-9]*]]
 ; CHECK-NEXT: bitcast {{.*}}, !dbg [[COPY_LOC:![0-9]*]]
 ; CHECK-NEXT: bitcast {{.*}}, !dbg [[COPY_LOC]]
 ; CHECK-NEXT: @llvm.memcpy{{.*}}, !dbg [[COPY_LOC]]
-; CHECK-NEXT: @llvm.dbg.declare(metadata i32* %aa, metadata [[AA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[AA_LOC:![0-9]*]]
+; CHECK-NEXT: @llvm.dbg.declare(metadata ptr %aa, metadata [[AA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[AA_LOC:![0-9]*]]
 ; CHECK-NEXT: %a = getelementptr {{.*}}, !dbg [[AG_LOC:![0-9]*]]
 ; CHECK-NEXT: load {{.*}}, !dbg [[AG_LOC]]
 ; CHECK-NEXT: store {{.*}}, !dbg [[AA_LOC]]
-; CHECK-NEXT: @llvm.dbg.declare(metadata i32* %bb, metadata [[BB_MD:![0-9]*]], metadata !DIExpression()), !dbg [[BB_LOC:![0-9]*]]
+; CHECK-NEXT: @llvm.dbg.declare(metadata ptr %bb, metadata [[BB_MD:![0-9]*]], metadata !DIExpression()), !dbg [[BB_LOC:![0-9]*]]
 ; CHECK-NEXT: %b = getelementptr {{.*}}, !dbg [[BG1_LOC:![0-9]*]]
 ; CHECK-NEXT: load {{.*}}, !dbg [[BG2_LOC:![0-9]*]]
 ; CHECK-NEXT: extractelement {{.*}}, !dbg [[BG2_LOC]]
 ; CHECK-NEXT: fptosi {{.*}}, !dbg [[CONV_LOC:![0-9]*]]
 ; CHECK-NEXT: store {{.*}}, !dbg [[BB_LOC]]
-; CHECK-NEXT: @llvm.dbg.declare(metadata i32* %cc, metadata [[CC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[CC_LOC:![0-9]*]]
+; CHECK-NEXT: @llvm.dbg.declare(metadata ptr %cc, metadata [[CC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[CC_LOC:![0-9]*]]
 ; CHECK-NEXT: %c = getelementptr {{.*}}, !dbg [[CG1_LOC:![0-9]*]]
 ; CHECK-NEXT: %arrayidx = getelementptr {{.*}}, !dbg [[CG2_LOC:![0-9]*]]
 ; CHECK-NEXT: load {{.*}}, !dbg [[CG2_LOC]]
 ; CHECK-NEXT: trunc {{.*}}, !dbg [[CG2_LOC]]
-; CHECK-NEXT: store i32 %conv.i1, i32* %cc, align 4, !dbg [[CC_LOC]]
+; CHECK-NEXT: store i32 %conv.i1, ptr %cc, align 4, !dbg [[CC_LOC]]
 ; CHECK-NEXT: ret void, !dbg [[RET_LOC:![0-9]*]]
 
 ; Debug MD check:
diff --git a/IGC/Compiler/tests/DebugInfo/AlignmentAnalysis.ll b/IGC/Compiler/tests/DebugInfo/AlignmentAnalysis.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers --igc-fix-alignment -S < %s | FileCheck %s
 ; AlignmentAnalysis
 ; ------------------------------------------------
@@ -20,16 +20,16 @@
 ; CHECK: @test_align{{.*}} !dbg [[SCOPE:![0-9]*]]
 ;
 ; CHECK: [[ALLOCA_V:%[A-z0-9]*]] = alloca {{.*}} !dbg [[ALLOCA_LOC:![0-9]*]]
-; CHECK: @llvm.dbg.value(metadata %opencl.image2d_t.read_only addrspace(1)** [[ALLOCA_V]], metadata [[ALLOCA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[ALLOCA_LOC]]
+; CHECK: @llvm.dbg.value(metadata ptr [[ALLOCA_V]], metadata [[ALLOCA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[ALLOCA_LOC]]
 ; CHECK: store {{.*}} !dbg [[STORE1_LOC:![0-9]*]]
 ; CHECK: [[LOAD1_V:%[A-z0-9]*]] = load i32{{.*}} !dbg [[LOAD1_LOC:![0-9]*]]
 ; CHECK: @llvm.dbg.value(metadata i32 [[LOAD1_V]], metadata [[LOAD1_MD:![0-9]*]], metadata !DIExpression()), !dbg [[LOAD1_LOC]]
 ; CHECK: [[ITOPTR_V:%[A-z0-9]*]] = inttoptr i64{{.*}} !dbg [[ITOPTR_LOC:![0-9]*]]
-; CHECK: @llvm.dbg.value(metadata i32* [[ITOPTR_V]], metadata [[ITOPTR_MD:![0-9]*]], metadata !DIExpression()), !dbg [[ITOPTR_LOC]]
+; CHECK: @llvm.dbg.value(metadata ptr [[ITOPTR_V]], metadata [[ITOPTR_MD:![0-9]*]], metadata !DIExpression()), !dbg [[ITOPTR_LOC]]
 ; CHECK: [[LOAD2_V:%[A-z0-9]*]] = load i32{{.*}} !dbg [[LOAD2_LOC:![0-9]*]]
 ; CHECK: @llvm.dbg.value(metadata i32 [[LOAD2_V]], metadata [[LOAD2_MD:![0-9]*]], metadata !DIExpression()), !dbg [[LOAD2_LOC]]
 ; CHECK: [[GEP_V:%[A-z0-9]*]] = getelementptr{{.*}} !dbg [[GEP_LOC:![0-9]*]]
-; CHECK: @llvm.dbg.value(metadata i32 addrspace(2)* [[GEP_V]], metadata [[GEP_MD:![0-9]*]], metadata !DIExpression()), !dbg [[GEP_LOC]]
+; CHECK: @llvm.dbg.value(metadata ptr addrspace(2) [[GEP_V]], metadata [[GEP_MD:![0-9]*]], metadata !DIExpression()), !dbg [[GEP_LOC]]
 ; CHECK: store i32{{.*}} !dbg [[STORE2_LOC:![0-9]*]]
 ; CHECK: store i32{{.*}} !dbg [[STORE3_LOC:![0-9]*]]
 ; CHECK: call void @llvm.memcpy{{.*}} !dbg [[CMEMC_LOC:![0-9]*]]
diff --git a/IGC/Compiler/tests/DebugInfo/GASResolving/basic.ll b/IGC/Compiler/tests/DebugInfo/GASResolving/basic.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers --igc-gas-resolve -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; GASResolve
@@ -20,8 +20,8 @@
 ; CHECK: define spir_kernel void @test_kernel
 ; CHECK-SAME: !dbg [[SCOPE:![0-9]*]]
 ;
-; CHECK-DAG: [[ACAST_V:%[0-9]*]] = {{.*}} !dbg [[ACAST_LOC:![0-9]*]]
-; CHECK-DAG: call void @llvm.dbg.value(metadata float{{.*}} [[ACAST_V]]
+; CHECK: [[ACAST_V:%[0-9]*]] = addrspacecast {{.*}} !dbg [[ACAST_LOC:![0-9]*]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) %src
 ; CHECK-SAME: metadata [[ACAST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[ACAST_LOC]]
 ;
 ; CHECK: store float {{.*}} !dbg [[STORE_LOC:![0-9]*]]
@@ -30,9 +30,8 @@
 ; CHECK: call void @llvm.dbg.value(metadata float [[LOAD_V]]
 ; CHECK-SAME: metadata [[LOAD_MD:![0-9]*]], metadata !DIExpression()), !dbg [[LOAD_LOC]]
 ;
-; CHECK: [[BCAST_V:%[A-z0-9]*]] = bitcast {{.*}} to <2 x i16> {{.*}}, !dbg [[BCAST_LOC:![0-9]*]]
-; CHECK: call void @llvm.dbg.value(metadata <2 x i16> {{.*}} [[BCAST_V]]
-; CHECK-SAME: metadata [[BCAST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[BCAST_LOC]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) %src
+; CHECK-SAME: metadata [[BCAST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[BCAST_LOC:![0-9]*]]
 ;
 ; CHECK: [[LOAD_V:%[A-z0-9]*]] = load <2 x i16>, {{.*}} !dbg [[LOADV_LOC:![0-9]*]]
 ; CHECK: call void @llvm.dbg.value(metadata <2 x i16> [[LOAD_V]]
@@ -47,7 +46,7 @@
 ; CHECK-SAME: metadata [[EXTR_MD:![0-9]*]], metadata !DIExpression()), !dbg [[EXTR_LOC]]
 ;
 ; CHECK: [[GEP_V:%[A-z0-9]*]] = getelementptr {{.*}}, !dbg [[GEP_LOC:![0-9]*]]
-; CHECK: call void @llvm.dbg.value(metadata float {{.*}} [[GEP_V]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[GEP_V]]
 ; CHECK-SAME: metadata [[GEP_MD:![0-9]*]], metadata !DIExpression()), !dbg [[GEP_LOC]]
 
 define spir_kernel void @test_kernel(i32 addrspace(1)* %src) !dbg !10 {
diff --git a/IGC/Compiler/tests/DebugInfo/GASResolving/ib_calls.ll b/IGC/Compiler/tests/DebugInfo/GASResolving/ib_calls.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers --igc-gas-resolve -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; GASResolve
@@ -20,7 +20,7 @@
 ; CHECK: define spir_kernel void @test_kernel
 ; CHECK-SAME: !dbg [[SCOPE:![0-9]*]]
 ;
-; CHECK: call void @llvm.dbg.value(metadata i8 {{.*}} [[DST_V:%[A-z0-9]*]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[DST_V:%[A-z0-9]*]]
 ; CHECK-SAME: metadata [[DST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[DST_LOC:![0-9]*]]
 ;
 ; CHECK: call void {{.*}}_to_private{{.*}} !dbg [[PRIV_LOC:![0-9]*]]
diff --git a/IGC/Compiler/tests/DebugInfo/GASResolving/memfunc.ll b/IGC/Compiler/tests/DebugInfo/GASResolving/memfunc.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers --igc-gas-resolve -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; GASResolve
@@ -20,10 +20,10 @@
 ; CHECK: define spir_kernel void @test_kernel
 ; CHECK-SAME: !dbg [[SCOPE:![0-9]*]]
 ;
-; CHECK: call void @llvm.dbg.value(metadata i8 {{.*}} [[SRC_V:%[A-z0-9]*]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[SRC_V:%[A-z0-9]*]]
 ; CHECK-SAME: metadata [[SRC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SRC_LOC:![0-9]*]]
 ;
-; CHECK: call void @llvm.dbg.value(metadata i8 {{.*}} [[DST_V:%[A-z0-9]*]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[DST_V:%[A-z0-9]*]]
 ; CHECK-SAME: metadata [[DST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[DST_LOC:![0-9]*]]
 ;
 ; CHECK: call void @llvm.memcpy{{.*}} !dbg [[MEMCPY_LOC:![0-9]*]]
diff --git a/IGC/Compiler/tests/DebugInfo/GASResolving/selectphi.ll b/IGC/Compiler/tests/DebugInfo/GASResolving/selectphi.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers --igc-gas-resolve -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; GASResolve
@@ -20,23 +20,23 @@
 ; CHECK: define spir_kernel void @test_kernel
 ; CHECK-SAME: !dbg [[SCOPE:![0-9]*]]
 ;
-; CHECK: call void @llvm.dbg.value(metadata i32{{.*}} [[SRC_V:%[A-z0-9]*]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[SRC_V:%[A-z0-9]*]]
 ; CHECK-SAME: metadata [[SRC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SRC_LOC:![0-9]*]]
 ;
-; CHECK: call void @llvm.dbg.value(metadata i32{{.*}} [[DST_V:%[A-z0-9]*]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[DST_V:%[A-z0-9]*]]
 ; CHECK-SAME: metadata [[DST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[DST_LOC:![0-9]*]]
 ;
 ; CHECK: [[CMP_V:%[A-z0-9]*]] = icmp {{.*}} !dbg [[CMP_LOC:![0-9]*]]
 ; CHECK: call void @llvm.dbg.value(metadata i1 [[CMP_V]]
 ; CHECK-SAME: metadata [[CMP_MD:![0-9]*]], metadata !DIExpression()), !dbg [[CMP_LOC]]
 ;
 ; CHECK: [[SELECT_V:%[A-z0-9]*]] = select {{.*}} !dbg [[SELECT_LOC:![0-9]*]]
-; CHECK: call void @llvm.dbg.value(metadata i32{{.*}} [[SELECT_V]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[SELECT_V]]
 ; CHECK-SAME: metadata [[SELECT_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SELECT_LOC]]
 ;
 ; CHECK: lbl:
 ; CHECK: [[PHI_V:%[A-z0-9]*]] = phi {{.*}} !dbg [[PHI_LOC:![0-9]*]]
-; CHECK: call void @llvm.dbg.value(metadata i32{{.*}} [[PHI_V]]
+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[PHI_V]]
 ; CHECK-SAME: metadata [[PHI_MD:![0-9]*]], metadata !DIExpression()), !dbg [[PHI_LOC]]
 
 define spir_kernel void @test_kernel(i32 addrspace(1)* %src, i32 addrspace(1)* %dst) !dbg !10 {
diff --git a/IGC/Compiler/tests/DebugInfo/ImageFuncsAnalysis.ll b/IGC/Compiler/tests/DebugInfo/ImageFuncsAnalysis.ll
@@ -6,7 +6,8 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus, opaque-ptr-fix
+; FIXME: ImageFuncsAnalysis crashes with opaque pointers (std::bad_array_new_length)
 ; RUN: igc_opt --opaque-pointers --igc-image-func-analysis -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; ImageFuncsAnalysis
diff --git a/IGC/Compiler/tests/DebugInfo/PrivateMemoryResolution/basic.ll b/IGC/Compiler/tests/DebugInfo/PrivateMemoryResolution/basic.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers --igc-private-mem-resolution -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; PrivateMemoryResolution
@@ -36,15 +36,15 @@
 ; ------------------------------------------------
 
 ; CHECK: define{{.*}} @test_pmem{{.*}} !dbg [[KSCOPE:![0-9]*]]
-; CHECK: @llvm.dbg.declare(metadata i32 addrspace(1)** [[DST_V:%[A-z0-9.]*]], metadata [[DST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[DST_LOC:![0-9]*]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[DST_V:%[A-z0-9.]*]], metadata [[DST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[DST_LOC:![0-9]*]]
 ; CHECK-SAME: !StorageOffset [[DST_OFFSET:![0-9]*]]
-; CHECK: store i32 addrspace(1)* %dst, i32 addrspace(1)** [[DST_V]], align 8, !dbg [[DST_LOC]]
-; CHECK: @llvm.dbg.declare(metadata i32 addrspace(1)** [[SRC_V:%[A-z0-9.]*]], metadata [[SRC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SRC_LOC:![0-9]*]]
+; CHECK: store ptr addrspace(1) %dst, ptr [[DST_V]], align 8, !dbg [[DST_LOC]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[SRC_V:%[A-z0-9.]*]], metadata [[SRC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SRC_LOC:![0-9]*]]
 ; CHECK-SAME: !StorageOffset [[SRC_OFFSET:![0-9]*]]
-; CHECK: store i32 addrspace(1)* %src, i32 addrspace(1)** [[SRC_V]], align 8, !dbg [[SRC_LOC]]
-; CHECK: @llvm.dbg.declare(metadata i32* [[AA_V:%[A-z0-9.]*]], metadata [[AA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[AA_LOC:![0-9]*]]
+; CHECK: store ptr addrspace(1) %src, ptr [[SRC_V]], align 8, !dbg [[SRC_LOC]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[AA_V:%[A-z0-9.]*]], metadata [[AA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[AA_LOC:![0-9]*]]
 ; CHECK-SAME: !StorageOffset [[AA_OFFSET:![0-9]*]]
-; CHECK: store i32 {{.*}}, i32* [[AA_V]], align 4, !dbg [[AA_LOC]]
+; CHECK: store i32 {{.*}}, ptr [[AA_V]], align 4, !dbg [[AA_LOC]]
 
 define spir_kernel void @test_pmem(i32 addrspace(1)* %dst, i32 addrspace(1)* %src, <8 x i32> %r0, <8 x i32> %payloadHeader, i8* %privateBase, i32 %bufferOffset, i32 %bufferOffset1) #0 !dbg !33 {
 entry:
@@ -97,12 +97,12 @@ entry:
 }
 
 ; CHECK: define{{.*}} @test_add{{.*}} !dbg [[FSCOPE:![0-9]*]]
-; CHECK: @llvm.dbg.declare(metadata i32* [[A_V:%[A-z0-9.]*]], metadata [[A_MD:![0-9]*]], metadata !DIExpression()), !dbg [[A_LOC:![0-9]*]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[A_V:%[A-z0-9.]*]], metadata [[A_MD:![0-9]*]], metadata !DIExpression()), !dbg [[A_LOC:![0-9]*]]
 ; CHECK-SAME: !StorageOffset [[AA_OFFSET]],  !StorageSize [[B_OFFSET:![0-9]*]]
-; CHECK: store i32 {{.*}}, i32* [[A_V]], align 4, !dbg [[A_LOC]]
-; CHECK: @llvm.dbg.declare(metadata i32* [[B_V:%[A-z0-9.]*]], metadata [[B_MD:![0-9]*]], metadata !DIExpression()), !dbg [[B_LOC:![0-9]*]]
+; CHECK: store i32 {{.*}}, ptr [[A_V]], align 4, !dbg [[A_LOC]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[B_V:%[A-z0-9.]*]], metadata [[B_MD:![0-9]*]], metadata !DIExpression()), !dbg [[B_LOC:![0-9]*]]
 ; CHECK-SAME: !StorageOffset [[B_OFFSET:![0-9]*]],  !StorageSize [[B_OFFSET]]
-; CHECK: store i32 {{.*}}, i32* [[B_V]], align 4, !dbg [[B_LOC]]
+; CHECK: store i32 {{.*}}, ptr [[B_V]], align 4, !dbg [[B_LOC]]
 
 ; Function Attrs: convergent noinline nounwind optnone
 define internal spir_func i32 @test_add(i32 %a, i32 %b) #1 !dbg !70 {
diff --git a/IGC/Compiler/tests/DebugInfo/PrivateMemoryResolution/opt_enabled.ll b/IGC/Compiler/tests/DebugInfo/PrivateMemoryResolution/opt_enabled.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers --igc-private-mem-resolution -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; PrivateMemoryResolution
@@ -38,12 +38,12 @@
 
 
 ; CHECK: define{{.*}} @test_pmem{{.*}} !dbg [[KSCOPE:![0-9]*]]
-; CHECK: @llvm.dbg.declare(metadata i32 addrspace(1)** [[DST_V:%[A-z0-9.]*]], metadata [[DST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[DST_LOC:![0-9]*]]
-; CHECK: store i32 addrspace(1)* %dst, i32 addrspace(1)** [[DST_V]], align 8, !dbg [[DST_LOC]]
-; CHECK: @llvm.dbg.declare(metadata i32 addrspace(1)** [[SRC_V:%[A-z0-9.]*]], metadata [[SRC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SRC_LOC:![0-9]*]]
-; CHECK: store i32 addrspace(1)* %src, i32 addrspace(1)** [[SRC_V]], align 8, !dbg [[SRC_LOC]]
-; CHECK: @llvm.dbg.declare(metadata i32* [[AA_V:%[A-z0-9.]*]], metadata [[AA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[AA_LOC:![0-9]*]]
-; CHECK: store i32 {{.*}}, i32* [[AA_V]], align 4, !dbg [[AA_LOC]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[DST_V:%[A-z0-9.]*]], metadata [[DST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[DST_LOC:![0-9]*]]
+; CHECK: store ptr addrspace(1) %dst, ptr [[DST_V]], align 8, !dbg [[DST_LOC]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[SRC_V:%[A-z0-9.]*]], metadata [[SRC_MD:![0-9]*]], metadata !DIExpression()), !dbg [[SRC_LOC:![0-9]*]]
+; CHECK: store ptr addrspace(1) %src, ptr [[SRC_V]], align 8, !dbg [[SRC_LOC]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[AA_V:%[A-z0-9.]*]], metadata [[AA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[AA_LOC:![0-9]*]]
+; CHECK: store i32 {{.*}}, ptr [[AA_V]], align 4, !dbg [[AA_LOC]]
 
 define spir_kernel void @test_pmem(i32 addrspace(1)* %dst, i32 addrspace(1)* %src, <8 x i32> %r0, <8 x i32> %payloadHeader, i8* %privateBase, i32 %bufferOffset, i32 %bufferOffset1) #0 !dbg !33 {
 entry:
@@ -96,12 +96,12 @@ entry:
 }
 
 ; CHECK: define{{.*}} @test_add{{.*}} !dbg [[FSCOPE:![0-9]*]]
-; CHECK: @llvm.dbg.declare(metadata i32* [[A_V:%[A-z0-9.]*]], metadata [[A_MD:![0-9]*]], metadata !DIExpression()), !dbg [[A_LOC:![0-9]*]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[A_V:%[A-z0-9.]*]], metadata [[A_MD:![0-9]*]], metadata !DIExpression()), !dbg [[A_LOC:![0-9]*]]
 ; CHECK-SAME: !StorageOffset [[A_OFFSET:![0-9]*]],  !StorageSize [[B_OFFSET:![0-9]*]]
-; CHECK: store i32 {{.*}}, i32* [[A_V]], align 4, !dbg [[A_LOC]]
-; CHECK: @llvm.dbg.declare(metadata i32* [[B_V:%[A-z0-9.]*]], metadata [[B_MD:![0-9]*]], metadata !DIExpression()), !dbg [[B_LOC:![0-9]*]]
+; CHECK: store i32 {{.*}}, ptr [[A_V]], align 4, !dbg [[A_LOC]]
+; CHECK: @llvm.dbg.declare(metadata ptr [[B_V:%[A-z0-9.]*]], metadata [[B_MD:![0-9]*]], metadata !DIExpression()), !dbg [[B_LOC:![0-9]*]]
 ; CHECK-SAME: !StorageOffset [[B_OFFSET]],  !StorageSize [[B_OFFSET]]
-; CHECK: store i32 {{.*}}, i32* [[B_V]], align 4, !dbg [[B_LOC]]
+; CHECK: store i32 {{.*}}, ptr [[B_V]], align 4, !dbg [[B_LOC]]
 
 ; Function Attrs: convergent noinline nounwind optnone
 define internal spir_func i32 @test_add(i32 %a, i32 %b) #1 !dbg !70 {
diff --git a/IGC/Compiler/tests/DebugInfo/PrivateMemoryUsageAnalysis.ll b/IGC/Compiler/tests/DebugInfo/PrivateMemoryUsageAnalysis.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers --igc-private-mem-usage-analysis -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; PrivateMemoryUsageAnalysis
@@ -22,7 +22,7 @@
 ; CHECK: @test_pma1{{.*}} !dbg [[SCOPE1:![0-9]*]]
 ;
 ; CHECK: [[ALLOCA_V:%[A-z0-9]*]] = alloca i32{{.*}} !dbg [[ALLOCA_LOC:![0-9]*]]
-; CHECK: @llvm.dbg.value(metadata i32* [[ALLOCA_V]], metadata [[ALLOCA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[ALLOCA_LOC]]
+; CHECK: @llvm.dbg.value(metadata ptr [[ALLOCA_V]], metadata [[ALLOCA_MD:![0-9]*]], metadata !DIExpression()), !dbg [[ALLOCA_LOC]]
 ; CHECK: [[UDIV_V:%[A-z0-9]*]] = udiv i32 {{.*}} !dbg [[UDIV_LOC:![0-9]*]]
 ; CHECK: @llvm.dbg.value(metadata i32 [[UDIV_V]], metadata [[UDIV_MD:![0-9]*]], metadata !DIExpression()), !dbg [[UDIV_LOC]]
 ; CHECK: store {{.*}} !dbg [[STORE1_LOC:![0-9]*]]
diff --git a/IGC/Compiler/tests/DebugInfo/PromoteResourceToDirectAS/iloadstore.ll b/IGC/Compiler/tests/DebugInfo/PromoteResourceToDirectAS/iloadstore.ll
@@ -6,7 +6,8 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus, opaque-ptr-fix
+; FIXME: PromoteResourceToDirectAS crashes with opaque pointers ("Typed pointers are discontinued above LLVM16")
 ; RUN: igc_opt --opaque-pointers --igc-promote-resources-to-direct-addrspace -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; PromoteResourceToDirectAS : load/store intrinsic promotion part
diff --git a/IGC/Compiler/tests/DebugInfo/PromoteResourceToDirectAS/loadstore.ll b/IGC/Compiler/tests/DebugInfo/PromoteResourceToDirectAS/loadstore.ll
@@ -6,7 +6,8 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus, opaque-ptr-fix
+; FIXME: PromoteResourceToDirectAS crashes with opaque pointers ("Typed pointers are discontinued above LLVM16")
 ; RUN: igc_opt --opaque-pointers --igc-promote-resources-to-direct-addrspace -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; PromoteResourceToDirectAS : load/store promotion part
diff --git a/IGC/Compiler/tests/DebugInfo/StatelessToStatefull.ll b/IGC/Compiler/tests/DebugInfo/StatelessToStatefull.ll
@@ -6,7 +6,7 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; REQUIRES: opaque-ptr-fix, llvm-14-plus
+; REQUIRES: llvm-14-plus
 ; RUN: igc_opt --opaque-pointers -igc-stateless-to-stateful-resolution -S < %s | FileCheck %s
 ; ------------------------------------------------
 ; StatelessToStateful

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`;`
`7`	`7`	`;============================ end_copyright_notice =============================`
`8`	`8`	`;`
`9`		`-; REQUIRES: opaque-ptr-fix, llvm-14-plus`
	`9`	`+; REQUIRES: llvm-14-plus`
`10`	`10`	`; RUN: igc_opt --opaque-pointers --igc-gas-resolve -S < %s \| FileCheck %s`
`11`	`11`	`; ------------------------------------------------`
`12`	`12`	`; GASResolve`
`@@ -20,8 +20,8 @@`
`20`	`20`	`; CHECK: define spir_kernel void @test_kernel`
`21`	`21`	`; CHECK-SAME: !dbg [[SCOPE:![0-9]*]]`
`22`	`22`	`;`
`23`		`-; CHECK-DAG: [[ACAST_V:%[0-9]]] = {{.}} !dbg [[ACAST_LOC:![0-9]*]]`
`24`		`-; CHECK-DAG: call void @llvm.dbg.value(metadata float{{.*}} [[ACAST_V]]`
	`23`	`+; CHECK: [[ACAST_V:%[0-9]]] = addrspacecast {{.}} !dbg [[ACAST_LOC:![0-9]*]]`
	`24`	`+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) %src`
`25`	`25`	`; CHECK-SAME: metadata [[ACAST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[ACAST_LOC]]`
`26`	`26`	`;`
`27`	`27`	`; CHECK: store float {{.}} !dbg [[STORE_LOC:![0-9]]]`
`@@ -30,9 +30,8 @@`
`30`	`30`	`; CHECK: call void @llvm.dbg.value(metadata float [[LOAD_V]]`
`31`	`31`	`; CHECK-SAME: metadata [[LOAD_MD:![0-9]*]], metadata !DIExpression()), !dbg [[LOAD_LOC]]`
`32`	`32`	`;`
`33`		`-; CHECK: [[BCAST_V:%[A-z0-9]]] = bitcast {{.}} to <2 x i16> {{.}}, !dbg [[BCAST_LOC:![0-9]]]`
`34`		`-; CHECK: call void @llvm.dbg.value(metadata <2 x i16> {{.*}} [[BCAST_V]]`
`35`		`-; CHECK-SAME: metadata [[BCAST_MD:![0-9]*]], metadata !DIExpression()), !dbg [[BCAST_LOC]]`
	`33`	`+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) %src`
	`34`	`+; CHECK-SAME: metadata [[BCAST_MD:![0-9]]], metadata !DIExpression()), !dbg [[BCAST_LOC:![0-9]]]`
`36`	`35`	`;`
`37`	`36`	`; CHECK: [[LOAD_V:%[A-z0-9]]] = load <2 x i16>, {{.}} !dbg [[LOADV_LOC:![0-9]*]]`
`38`	`37`	`; CHECK: call void @llvm.dbg.value(metadata <2 x i16> [[LOAD_V]]`
`@@ -47,7 +46,7 @@`
`47`	`46`	`; CHECK-SAME: metadata [[EXTR_MD:![0-9]*]], metadata !DIExpression()), !dbg [[EXTR_LOC]]`
`48`	`47`	`;`
`49`	`48`	`; CHECK: [[GEP_V:%[A-z0-9]]] = getelementptr {{.}}, !dbg [[GEP_LOC:![0-9]*]]`
`50`		`-; CHECK: call void @llvm.dbg.value(metadata float {{.*}} [[GEP_V]]`
	`49`	`+; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(1) [[GEP_V]]`
`51`	`50`	`; CHECK-SAME: metadata [[GEP_MD:![0-9]*]], metadata !DIExpression()), !dbg [[GEP_LOC]]`
`52`	`51`
`53`	`52`	`define spir_kernel void @test_kernel(i32 addrspace(1)* %src) !dbg !10 {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`;`
`7`	`7`	`;============================ end_copyright_notice =============================`
`8`	`8`	`;`
`9`		`-; REQUIRES: opaque-ptr-fix, llvm-14-plus`
	`9`	`+; REQUIRES: llvm-14-plus, opaque-ptr-fix`
	`10`	`+; FIXME: ImageFuncsAnalysis crashes with opaque pointers (std::bad_array_new_length)`
`10`	`11`	`; RUN: igc_opt --opaque-pointers --igc-image-func-analysis -S < %s \| FileCheck %s`
`11`	`12`	`; ------------------------------------------------`
`12`	`13`	`; ImageFuncsAnalysis`