Update few tests check lines to use debug records (#2602)

MrSidims · sys-ce-bb · commit d0f0838e7859 · 2024-06-27T06:19:57.000-07:00
Required after llvm/llvm-project@dc726c340392d: Reapply#4 "[RemoveDIs] Load into new debug info format by default in LLVM Signed-off-by: Sidorov, Dmitry <dmitry.sidorov@intel.com> Original commit: KhronosGroup/SPIRV-LLVM-Translator@338a37ef59ded4f
diff --git a/llvm-spirv/test/DebugInfo/DebugDeclareUnused.cl b/llvm-spirv/test/DebugInfo/DebugDeclareUnused.cl
@@ -16,4 +16,4 @@ void foo() {
 
 // CHECK-SPIRV: Undef [[#]] [[#Undef:]]
 // CHECK-SPIRV: ExtInst [[#]] [[#]] [[#]] DebugDeclare [[#]] [[#Undef]] [[#]]
-// CHECK-LLVM: call void @llvm.dbg.declare(metadata ptr undef, metadata ![[#]], metadata !DIExpression({{.*}}))
+// CHECK-LLVM:  #dbg_declare(ptr undef, ![[#]], !DIExpression(DW_OP_constu, 0, DW_OP_swap, DW_OP_xderef), ![[#]])
diff --git a/llvm-spirv/test/DebugInfo/DebugInfoLLVMArg.ll b/llvm-spirv/test/DebugInfo/DebugInfoLLVMArg.ll
@@ -62,11 +62,11 @@ declare void @llvm.dbg.value(metadata, metadata, metadata) nounwind readnone spe
 define void @DbgIntrinsics() sanitize_memtag {
 entry:
   %x = alloca i32, align 4
-; CHECK-LLVM-OCL: call void @llvm.dbg.value(metadata !DIArgList(ptr %x), metadata ![[#]], metadata !DIExpression(DW_OP_LLVM_arg, 0))
-; CHECK-LLVM-200: call void @llvm.dbg.value(metadata !DIArgList(ptr %x), metadata ![[#]], metadata !DIExpression(DW_OP_LLVM_arg, 0))
+; CHECK-LLVM-OCL: #dbg_value(!DIArgList(ptr %x), ![[#]], !DIExpression(DW_OP_LLVM_arg, 0), ![[#]])
+; CHECK-LLVM-200: #dbg_value(!DIArgList(ptr %x), ![[#]], !DIExpression(DW_OP_LLVM_arg, 0), ![[#]])
   call void @llvm.dbg.value(metadata !DIArgList(ptr %x), metadata !6, metadata !DIExpression(DW_OP_LLVM_arg, 0)), !dbg !10
-; CHECK-LLVM-OCL: call void @llvm.dbg.value(metadata ptr undef, metadata ![[#]], metadata !DIExpression())
-; CHECK-LLVM-200: call void @llvm.dbg.value(metadata !DIArgList(ptr %x, ptr %x), metadata ![[#]], metadata !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_plus))
+; CHECK-LLVM-OCL: #dbg_value(ptr undef, ![[#]], !DIExpression(), ![[#]])
+; CHECK-LLVM-200: #dbg_value(!DIArgList(ptr %x, ptr %x), ![[#]], !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_plus)
   call void @llvm.dbg.value(metadata !DIArgList(ptr %x, ptr %x), metadata !6, metadata !DIExpression(DW_OP_LLVM_arg, 0, DW_OP_LLVM_arg, 1, DW_OP_plus)), !dbg !10
   store i32 42, ptr %x, align 4
   ret void
diff --git a/llvm-spirv/test/DebugInfo/DebugInfoWithUnknownIntrinsics.ll b/llvm-spirv/test/DebugInfo/DebugInfoWithUnknownIntrinsics.ll
@@ -24,7 +24,8 @@ entry:
   ret i32 %add, !dbg !17
 }
 
-; LLVM: declare void @llvm.dbg.value(metadata, metadata, metadata)
+; LLVM: #dbg_value(i32 %x, ![[#]], !DIExpression(), ![[#]])
+; LLVM: #dbg_value(i32 %y, ![[#]], !DIExpression(), ![[#]])
 ; Function Attrs: nounwind readnone speculatable willreturn
 declare void @llvm.dbg.value(metadata, metadata, metadata) #1
 
diff --git a/llvm-spirv/test/DebugInfo/Generic/c-and-cpp-mixed.ll b/llvm-spirv/test/DebugInfo/Generic/c-and-cpp-mixed.ll
@@ -24,8 +24,8 @@
 
 ; CHECK-LLVM: define spir_func i32 @main(i32 %argc, ptr nocapture %argv) #0 !dbg ![[#Func2:]] {
 ; CHECK-LLVM: entry:
-; CHECK-LLVM:   call void @llvm.dbg.value(metadata i32 %argc, metadata ![[#Fun2Param1:]], metadata !DIExpression()), !dbg ![[#Fun2Param1Loc:]]
-; CHECK-LLVM:   call void @llvm.dbg.value(metadata ptr %argv, metadata ![[#Fun2Param2:]], metadata !DIExpression(DW_OP_deref, DW_OP_deref)), !dbg ![[#Fun2Param2Loc:]]
+; CHECK-LLVM:   #dbg_value(i32 %argc, ![[#Fun2Param1:]], !DIExpression(), ![[#Fun2Param1Loc:]])
+; CHECK-LLVM:   #dbg_value(ptr %argv, ![[#Fun2Param2:]], !DIExpression(DW_OP_deref, DW_OP_deref), ![[#Fun2Param2Loc:]])
 ; CHECK-LLVM:   %0 = bitcast ptr addrspace(1) @str1 to ptr addrspace(1), !dbg ![[#Puts2Loc:]]
 ; CHECK-LLVM:   %puts = call spir_func i32 @puts(ptr addrspace(1) nocapture %0) #0, !dbg ![[#Puts2Loc]]
 ; CHECK-LLVM:   call spir_func void @foo() #0, !dbg ![[#CallFoo:]]
diff --git a/llvm-spirv/test/DebugInfo/NonSemantic/Shader200/FortranDynamicArrayExpr.ll b/llvm-spirv/test/DebugInfo/NonSemantic/Shader200/FortranDynamicArrayExpr.ll
@@ -30,7 +30,7 @@
 ; CHECK-SPIRV: ExtInst [[#VoidT]] [[#DbgArrayId:]] [[#Import]] DebugTypeArrayDynamic [[#ArrayBasicT]] [[#DbgExprLocation]] [[#DbgExprAssociated]] [[#DbgInfoNone]] [[#DbgInfoNone]] [[#DbgSubRangeId]]
 
 ; CHECK-LLVM: %[[#Array:]] = alloca
-; CHECK-LLVM: call void @llvm.dbg.value(metadata ptr %[[#Array]], metadata ![[#DbgLVar:]]
+; CHECK-LLVM: #dbg_value(ptr %[[#Array]], ![[#DbgLVar:]]
 ; CHECK-LLVM: ![[#DbgLVar]] = !DILocalVariable(name: "pint", scope: ![[#]], file: ![[#]], line: [[#]], type: ![[#DbgLVarT:]])
 ; CHECK-LLVM: ![[#DbgLVarT]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[#DbgArrayT:]], size: 64)
 ; CHECK-LLVM: ![[#DbgArrayT]] = !DICompositeType(tag: DW_TAG_array_type, baseType: ![[#DbgArrayBaseT:]], size: 32, elements: ![[#Elements:]], dataLocation: !DIExpression(DW_OP_push_object_address, DW_OP_deref), associated: !DIExpression(DW_OP_push_object_address, DW_OP_deref, DW_OP_constu, 0, DW_OP_or))
diff --git a/llvm-spirv/test/DebugInfo/NonSemantic/Shader200/FortranDynamicArrayVar.ll b/llvm-spirv/test/DebugInfo/NonSemantic/Shader200/FortranDynamicArrayVar.ll
@@ -20,8 +20,8 @@
 
 ; CHECK-LLVM: %[[#Ptr:]] = alloca ptr
 ; CHECK-LLVM: %[[#Array:]] = alloca [16 x i64]
-; CHECK-LLVM: call void @llvm.dbg.declare(metadata ptr %[[#Array]], metadata ![[#DbgLVarArray:]]
-; CHECK-LLVM: call void @llvm.dbg.declare(metadata ptr %[[#Ptr]], metadata ![[#DbgLVarPtr:]]
+; CHECK-LLVM: #dbg_declare(ptr %[[#Array]], ![[#DbgLVarArray:]]
+; CHECK-LLVM: #dbg_declare(ptr %[[#Ptr]], ![[#DbgLVarPtr:]]
 
 ; CHECK-LLVM: ![[#DbgLVarPtr:]] = !DILocalVariable(scope: ![[#]], file: ![[#]], type: ![[#DbgPtrT:]], flags: DIFlagArtificial)
 ; CHECK-LLVM: ![[#DbgPtrT:]] = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: ![[#DbgBasicT:]], size: 64)
diff --git a/llvm-spirv/test/complex-constexpr-vector.ll b/llvm-spirv/test/complex-constexpr-vector.ll
@@ -41,8 +41,8 @@ entry:
 ; CHECK-SPIRV: DebugValue [[#]] [[#FINAL_COMPOS]]
 
 
-; CHECK-LLVM: call void @llvm.dbg.value(
-; CHECK-LLVM-SAME:   metadata <4 x i8> <
+; CHECK-LLVM: #dbg_value(
+; CHECK-LLVM-SAME:   <4 x i8> <
 ; CHECK-LLVM-SAME:   i8 add (
 ; CHECK-LLVM-SAME:     i8 extractelement (<8 x i8> bitcast (<2 x i32> <i32 65793, i32 65793> to <8 x i8>), i32 0),
 ; CHECK-LLVM-SAME:     i8 extractelement (<8 x i8> bitcast (<2 x i32> <i32 131586, i32 131586> to <8 x i8>), i32 0)),
@@ -53,7 +53,7 @@ entry:
 ; CHECK-LLVM-SAME:     i8 extractelement (<8 x i8> bitcast (<2 x i32> <i32 65793, i32 65793> to <8 x i8>), i32 2),
 ; CHECK-LLVM-SAME:     i8 extractelement (<8 x i8> bitcast (<2 x i32> <i32 131586, i32 131586> to <8 x i8>), i32 2)),
 ; CHECK-LLVM-SAME:   i8 undef>,
-; CHECK-LLVM-SAME:   metadata ![[#]], metadata !DIExpression()), !dbg ![[#]]
+; CHECK-LLVM-SAME:   ![[#]], !DIExpression(), ![[#]])
   call void @llvm.dbg.value(
     metadata <4 x i8> <
     i8 add (

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ entry:`
`24`	`24`	`ret i32 %add, !dbg !17`
`25`	`25`	`}`
`26`	`26`
`27`		`-; LLVM: declare void @llvm.dbg.value(metadata, metadata, metadata)`
	`27`	`+; LLVM: #dbg_value(i32 %x, ![[#]], !DIExpression(), ![[#]])`
	`28`	`+; LLVM: #dbg_value(i32 %y, ![[#]], !DIExpression(), ![[#]])`
`28`	`29`	`; Function Attrs: nounwind readnone speculatable willreturn`
`29`	`30`	`declare void @llvm.dbg.value(metadata, metadata, metadata) #1`
`30`	`31`