Skip to content

Commit 0378786

Browse files
calebwatcalebwat
committed
Adjust SYCLLowerIR tests to account for the new debug format
Calls to llvm.debug.value were changed to debug_value with different syntax
1 parent 6f707a4 commit 0378786

File tree

4 files changed

+48
-47
lines changed

4 files changed

+48
-47
lines changed

‎llvm/test/SYCLLowerIR/ESIMD/lower_debug_info.ll

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ declare spir_func <16 x float> @_Z26__esimd_oword_ld_unalignedIfLi16EjLi0EEN2cl4
1212
define spir_func void @func1(ptr addrspace(1) %arg1, i32 %arg2){
1313
; CHECK-LABEL: @func1(
1414
; CHECK-NEXT: [[CALL1_I_I_ESIMD:%.*]] = call <16 x float> @llvm.genx.oword.ld.unaligned.v16f32(i32 0, i32 0, i32 [[ARG2:%.*]]), !dbg [[DBG2:![0-9]+]]
15-
; CHECK-NEXT: call void @llvm.dbg.value(metadata <16 x float> [[CALL1_I_I_ESIMD]], metadata !{{[0-9]+}}, metadata !DIExpression()), !dbg [[DBG2]]
15+
; CHECK-NEXT: #dbg_value(<16 x float> [[CALL1_I_I_ESIMD]], !{{[0-9]+}}, !DIExpression(), [[DBG2]])
1616
; CHECK-NEXT: ret void, !dbg !{{[0-9]+}}
1717

1818
%res = call spir_func <16 x float> @_Z26__esimd_oword_ld_unalignedIfLi16EjLi0EEN2cl4sycl3ext5intel12experimental5esimd6detail11vector_typeIT_XT0_EE4typeET1_j(i32 0, i32 %arg2)
@@ -22,13 +22,13 @@ define spir_func void @func1(ptr addrspace(1) %arg1, i32 %arg2){
2222
define spir_func void @func2(ptr addrspace(1) %arg1) {
2323
; CHECK-LABEL: @func2(
2424
; CHECK-NEXT: [[V1:%.*]] = load <3 x i64>, ptr addrspace(4) addrspacecast (ptr addrspace(1) @__spirv_BuiltInGlobalInvocationId to ptr addrspace(4)), align 32, !dbg !21
25-
; CHECK-NEXT: call void @llvm.dbg.value(metadata <3 x i64> [[V1]], metadata !15, metadata !DIExpression()), !dbg [[DBG21:![0-9]+]]
25+
; CHECK-NEXT: #dbg_value(<3 x i64> [[V1]], !15, !DIExpression(), [[DBG21:![0-9]+]])
2626
; CHECK-NEXT: [[V2:%.*]] = extractelement <3 x i64> [[V1]], i64 0, !dbg [[DBG22:![0-9]+]]
27-
; CHECK-NEXT: call void @llvm.dbg.value(metadata i64 [[V2]], metadata !17, metadata !DIExpression()), !dbg [[DBG22]]
27+
; CHECK-NEXT: #dbg_value(i64 [[V2]], !17, !DIExpression(), [[DBG22]])
2828
; CHECK-NEXT: [[PTRIDX:%.*]] = getelementptr inbounds i64, ptr addrspace(1) %arg1, i64 2, !dbg [[DBG23:![0-9]+]]
29-
; CHECK-NEXT: call void @llvm.dbg.value(metadata ptr addrspace(1) [[PTRIDX]], metadata !19, metadata !DIExpression()), !dbg [[DBG23]]
29+
; CHECK-NEXT: #dbg_value(ptr addrspace(1) [[PTRIDX]], !19, !DIExpression(), [[DBG23]])
3030
; CHECK-NEXT: [[PTRIDXCAST:%.*]] = addrspacecast ptr addrspace(1) [[PTRIDX]] to ptr addrspace(4), !dbg [[DBG24:![0-9]+]]
31-
; CHECK-NEXT: call void @llvm.dbg.value(metadata ptr addrspace(4) [[PTRIDXCAST]], metadata !20, metadata !DIExpression()), !dbg [[DBG24]]
31+
; CHECK-NEXT: #dbg_value(ptr addrspace(4) [[PTRIDXCAST]], !20, !DIExpression(), [[DBG24]])
3232
; CHECK-NEXT: store i64 [[V2]], ptr addrspace(4) [[PTRIDXCAST]], align 4, !dbg [[DBG25:![0-9]+]]
3333
; CHECK-NEXT: ret void, !dbg [[DBG26:![0-9]+]]
3434
%1 = load <3 x i64>, ptr addrspace(4) addrspacecast (ptr addrspace(1) @__spirv_BuiltInGlobalInvocationId to ptr addrspace(4))

‎llvm/test/SYCLLowerIR/hier_par_debug1.ll

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@ define internal spir_func void @wibble(ptr addrspace(4) %arg, ptr byval(%struct.
1515
; CHECK-SAME: (ptr addrspace(4) [[ARG:%.*]], ptr byval(%struct.zot) align 8 [[ARG1:%.*]])
1616
bb:
1717
%tmp = alloca ptr addrspace(4), align 8
18-
; CHECK: [[TMP:%.*]] = alloca ptr addrspace(4), align 8
19-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP]], [[META9:metadata !.*]], metadata !DIExpression())
18+
; CHECK: [[TMP:%.*]] = alloca ptr addrspace(4), align 8, !dbg [[DBG1:!.*]]
19+
; CHECK: #dbg_value(ptr [[TMP]], [[META9:!.*]], !DIExpression(), [[DBG1]])
2020
%tmp1 = alloca %struct.foo.0, align 1
21-
; CHECK: [[TMP1:%.*]] = alloca %struct.foo.0, align 1
22-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP1]], [[META11:metadata !.*]], metadata !DIExpression())
21+
; CHECK: [[TMP1:%.*]] = alloca %struct.foo.0, align 1, !dbg [[DBG2:!.*]]
22+
; CHECK: #dbg_value(ptr [[TMP1]], [[META11:!.*]], !DIExpression(), [[DBG2]])
2323
store ptr addrspace(4) %arg, ptr %tmp, align 8
2424
%tmp3 = load ptr addrspace(4), ptr %tmp, align 8
25-
; CHECK: [[TMP3:%.*]] = load ptr addrspace(4), ptr [[TMP]], align 8
26-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[TMP3]], [[META12:metadata !.*]], metadata !DIExpression())
25+
; CHECK: [[TMP3:%.*]] = load ptr addrspace(4), ptr [[TMP]], align 8, !dbg [[DBG3:!.*]]
26+
; CHECK: #dbg_value(ptr addrspace(4) [[TMP3]], [[META12:!.*]], !DIExpression(), [[DBG3]])
2727
%tmp4 = addrspacecast ptr %arg1 to ptr addrspace(4)
28-
; CHECK: [[TMP4:%.*]] = addrspacecast ptr [[ARG1]] to ptr addrspace(4)
29-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[TMP4]], [[META13:metadata !.*]], metadata !DIExpression())
28+
; CHECK: [[TMP4:%.*]] = addrspacecast ptr [[ARG1]] to ptr addrspace(4), !dbg [[DBG4:!.*]]
29+
; CHECK: #dbg_value(ptr addrspace(4) [[TMP4]], [[META13:!.*]], !DIExpression(), [[DBG4]])
3030
call spir_func void @bar(ptr addrspace(4) %tmp4, ptr byval(%struct.foo.0) align 1 %tmp1)
3131
ret void
3232
}
3333

3434
define internal spir_func void @bar(ptr addrspace(4) %arg, ptr byval(%struct.foo.0) align 1 %arg1) align 2 !work_item_scope !0 !parallel_for_work_item !0 {
3535
; CHECK-LABEL: define {{[^@]+}}@bar
36-
; CHECK: call void @llvm.dbg.value(metadata i32 0, [[META23:metadata !.*]], metadata !DIExpression())
36+
; CHECK-SAME: !dbg [[DBGBAR:!.*]]
3737
bb:
3838
ret void
3939
}

‎llvm/test/SYCLLowerIR/hier_par_debug2.ll

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,43 @@ define internal spir_func void @wibble(ptr addrspace(4) dereferenceable_or_null(
1818
;
1919
bb:
2020
%tmp = alloca ptr addrspace(4), align 8
21-
; CHECK: [[TMP:%.*]] = alloca ptr addrspace(4), align 8
22-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP]], [[META9:metadata !.*]], metadata !DIExpression())
21+
; CHECK: [[TMP:%.*]] = alloca ptr addrspace(4), align 8, !dbg [[DBG1:!.*]]
22+
; CHECK: #dbg_value(ptr [[TMP]], [[META9:!.*]], !DIExpression(), [[DBG1]])
2323
%tmp2 = addrspacecast ptr %tmp to ptr addrspace(4)
24-
; CHECK: [[TMP2:%.*]] = addrspacecast ptr [[TMP]] to ptr addrspace(4)
25-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[TMP2]], [[META11:metadata !.*]], metadata !DIExpression())
24+
; CHECK: [[TMP2:%.*]] = addrspacecast ptr [[TMP]] to ptr addrspace(4), !dbg [[DBG2:!.*]]
25+
; CHECK: #dbg_value(ptr addrspace(4) [[TMP2]], [[META11:!.*]], !DIExpression(), [[DBG2]])
2626
%tmp3 = alloca %struct.ham, align 4, !work_item_scope !0
27-
; CHECK: [[TMP3:%.*]] = alloca %struct.ham, align 4, [[DBG24:!dbg !.*]], !work_item_scope ![[#]]
28-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP3]], [[META12:metadata !.*]], metadata !DIExpression())
27+
; CHECK: [[TMP3:%.*]] = alloca %struct.ham, align 4, !dbg [[DBG3:!.*]], !work_item_scope ![[#]]
28+
; CHECK: #dbg_value(ptr [[TMP3]], [[META12:!.*]], !DIExpression(), [[DBG3]])
2929
%tmp4 = addrspacecast ptr %tmp3 to ptr addrspace(4)
30-
; CHECK: [[TMP4:%.*]] = addrspacecast ptr [[TMP3]] to ptr addrspace(4)
31-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[TMP4]], [[META13:metadata !.*]], metadata !DIExpression())
30+
; CHECK: [[TMP4:%.*]] = addrspacecast ptr [[TMP3]] to ptr addrspace(4), !dbg [[DBG4:!.*]]
31+
; CHECK: #dbg_value(ptr addrspace(4) [[TMP4]], [[META13:!.*]], !DIExpression(), [[DBG4]])
3232
%tmp5 = alloca %struct.spam, align 8
33-
; CHECK: [[TMP5:%.*]] = alloca %struct.spam, align 8
34-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP5]], [[META14:metadata !.*]], metadata !DIExpression())
33+
; CHECK: [[TMP5:%.*]] = alloca %struct.spam, align 8, !dbg [[DBG5:!.*]]
34+
; CHECK: #dbg_value(ptr [[TMP5]], [[META14:!.*]], !DIExpression(), [[DBG5]])
3535
%tmp6 = addrspacecast ptr %tmp5 to ptr addrspace(4)
36-
; CHECK: [[TMP6:%.*]] = addrspacecast ptr [[TMP5]] to ptr addrspace(4)
37-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[TMP6]], [[META15:metadata !.*]], metadata !DIExpression())
36+
; CHECK: [[TMP6:%.*]] = addrspacecast ptr [[TMP5]] to ptr addrspace(4), !dbg [[DBG6:!.*]]
37+
; CHECK: #dbg_value(ptr addrspace(4) [[TMP6]], [[META15:!.*]], !DIExpression(), [[DBG6]])
3838
%tmp7 = alloca %struct.wibble, align 8
39-
; CHECK: [[TMP7:%.*]] = alloca %struct.wibble, align 8
40-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP7]], [[META16:metadata !.*]], metadata !DIExpression())
39+
; CHECK: [[TMP7:%.*]] = alloca %struct.wibble, align 8, !dbg [[DBG7:!.*]]
40+
; CHECK: #dbg_value(ptr [[TMP7]], [[META16:!.*]], !DIExpression(), [[DBG7]])
4141
%tmp8 = addrspacecast ptr %tmp7 to ptr addrspace(4)
42-
; CHECK: [[TMP8:%.*]] = addrspacecast ptr [[TMP7]] to ptr addrspace(4)
43-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[TMP8]], [[META17:metadata !.*]], metadata !DIExpression())
42+
; CHECK: [[TMP8:%.*]] = addrspacecast ptr [[TMP7]] to ptr addrspace(4), !dbg [[DBG8:!.*]]
43+
; CHECK: #dbg_value(ptr addrspace(4) [[TMP8]], [[META17:!.*]], !DIExpression(), [[DBG8]])
4444
store ptr addrspace(4) %arg, ptr addrspace(4) %tmp2, align 8
4545
%tmp9 = addrspacecast ptr %arg1 to ptr addrspace(4)
46-
; CHECK: [[TMP9:%.*]] = addrspacecast ptr [[ARG1]] to ptr addrspace(4)
47-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[TMP9]], [[META18:metadata !.*]], metadata !DIExpression())
46+
; CHECK: [[TMP9:%.*]] = addrspacecast ptr [[ARG1]] to ptr addrspace(4), !dbg [[DBG9:!.*]]
47+
; CHECK: #dbg_value(ptr addrspace(4) [[TMP9]], [[META18:!.*]], !DIExpression(), [[DBG9]])
4848
call spir_func void @eggs(ptr addrspace(4) dereferenceable_or_null(8) %tmp4, ptr addrspace(4) align 8 dereferenceable(64) %tmp9)
4949
call spir_func void @snork(ptr addrspace(4) dereferenceable_or_null(16) %tmp6, i64 7, i64 3)
5050
store ptr addrspace(4) %tmp4, ptr addrspace(4) %tmp8, align 8
5151
%tmp11 = addrspacecast ptr addrspace(4) %tmp6 to ptr
52-
; CHECK: [[TMP11:%.*]] = addrspacecast ptr addrspace(4) [[TMP6]] to ptr
53-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP11]], [[META20:metadata !.*]], metadata !DIExpression())
52+
; CHECK: [[TMP11:%.*]] = addrspacecast ptr addrspace(4) [[TMP6]] to ptr, !dbg [[DBG11:!.*]]
53+
; CHECK: #dbg_value(ptr [[TMP11]], [[META20:!.*]], !DIExpression(), [[DBG11]])
5454
%tmp12 = addrspacecast ptr addrspace(4) %tmp8 to ptr
5555
call spir_func void @wombat(ptr addrspace(4) dereferenceable_or_null(64) %tmp9, ptr byval(%struct.spam) align 8 %tmp11, ptr byval(%struct.wibble) align 8 %tmp12)
56-
; CHECK: [[TMP12:%.*]] = addrspacecast ptr addrspace(4) [[TMP8]] to ptr
57-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP12]], [[META21:metadata !.*]], metadata !DIExpression())
56+
; CHECK: [[TMP12:%.*]] = addrspacecast ptr addrspace(4) [[TMP8]] to ptr, !dbg [[DBG12:!.*]]
57+
; CHECK: #dbg_value(ptr [[TMP12]], [[META21:!.*]], !DIExpression(), [[DBG12]])
5858
ret void
5959
}
6060

@@ -65,7 +65,8 @@ bb:
6565

6666
define internal spir_func void @wombat(ptr addrspace(4) dereferenceable_or_null(64) %arg, ptr byval(%struct.spam) align 8 %arg1, ptr byval(%struct.wibble) align 8 %arg2) align 2 !work_item_scope !0 !parallel_for_work_item !0 {
6767
bb:
68-
; CHECK: call void @llvm.dbg.value(metadata i32 0, [[META42:metadata !.*]], metadata !DIExpression())
68+
; CHECK-LABEL: define {{[^@]+}}@wombat
69+
; CHECK: !dbg [[DBGWOMBAT:!.*]]
6970
ret void
7071
}
7172

‎llvm/test/SYCLLowerIR/hier_par_debug3.ll

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ define internal spir_func void @spam(ptr addrspace(4) %arg, ptr byval(%struct.sn
1818
; CHECK-SAME: (ptr addrspace(4) [[ARG:%.*]], ptr byval(%struct.snork.0) align 8 [[ARG1:%.*]])
1919
entry:
2020
%tmp = alloca ptr addrspace(4), align 8
21-
; CHECK: [[TMP:%.*]] = alloca ptr addrspace(4), align 8
22-
; CHECK: call void @llvm.dbg.value(metadata ptr [[TMP]], [[META9:metadata !.*]], metadata !DIExpression())
21+
; CHECK: [[TMP:%.*]] = alloca ptr addrspace(4), align 8, !dbg [[DBG1:!.*]]
22+
; CHECK: #dbg_value(ptr [[TMP]], [[META9:!.*]], !DIExpression(), [[DBG1]])
2323
store ptr addrspace(4) %arg, ptr %tmp, align 8
2424
%tmp2 = load ptr addrspace(4), ptr %tmp, align 8
25-
; CHECK: [[TMP2:%.*]] = load ptr addrspace(4), ptr [[TMP]], align 8
26-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[TMP2]], [[META11:metadata !.*]], metadata !DIExpression())
25+
; CHECK: [[TMP2:%.*]] = load ptr addrspace(4), ptr [[TMP]], align 8, !dbg [[DBG2:!.*]]
26+
; CHECK: #dbg_value(ptr addrspace(4) [[TMP2]], [[META11:!.*]], !DIExpression(), [[DBG2]])
2727
br label %arrayctor.loop
2828
arrayctor.loop: ; preds = %arrayctor.loop, %entry
2929
%arrayctor.cur = phi ptr addrspace(4) [ addrspacecast (ptr addrspace(3) @global to ptr addrspace(4)), %entry ], [ %arrayctor.next, %arrayctor.loop ]
30-
; CHECK: [[ARRAYCTOR_CUR:%.*]] = phi ptr addrspace(4) [ addrspacecast (ptr addrspace(3) @global to ptr addrspace(4)), [[ENTRY:%.*]] ], [ [[ARRAYCTOR_NEXT:%.*]], [[ARRAYCTOR_LOOP:%.*]] ]
31-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[ARRAYCTOR_CUR]], [[META12:metadata !.*]], metadata !DIExpression())
30+
; CHECK: [[ARRAYCTOR_CUR:%.*]] = phi ptr addrspace(4) [ addrspacecast (ptr addrspace(3) @global to ptr addrspace(4)), [[ENTRY:%.*]] ], [ [[ARRAYCTOR_NEXT:%.*]], [[ARRAYCTOR_LOOP:%.*]] ], !dbg [[DBGCUR:!.*]]
31+
; CHECK: #dbg_value(ptr addrspace(4) [[ARRAYCTOR_CUR]], [[META12:!.*]], !DIExpression(), [[DBGCUR]])
3232
call spir_func void @bar(ptr addrspace(4) %arrayctor.cur)
3333
%arrayctor.next = getelementptr inbounds %struct.snork, ptr addrspace(4) %arrayctor.cur, i64 1
34-
; CHECK: [[GEP_VAL:%.*]] = getelementptr inbounds %struct.snork, ptr addrspace(4) [[ARRAYCTOR_CUR]], i64 1
35-
; CHECK: call void @llvm.dbg.value(metadata ptr addrspace(4) [[GEP_VAL]], [[META13:metadata !.*]], metadata !DIExpression())
34+
; CHECK: [[GEP_VAL:%.*]] = getelementptr inbounds %struct.snork, ptr addrspace(4) [[ARRAYCTOR_CUR]], i64 1, !dbg [[DBGGEP:!.*]]
35+
; CHECK: #dbg_value(ptr addrspace(4) [[GEP_VAL]], [[META13:!.*]], !DIExpression(), [[DBGGEP]])
3636
%arrayctor.done = icmp eq ptr addrspace(4) %arrayctor.next, getelementptr inbounds (%struct.snork, ptr addrspace(4) addrspacecast (ptr addrspace(3) @global to ptr addrspace(4)), i64 12)
37-
; CHECK: [[ARRAYCTOR_DONE:%.*]] = icmp eq ptr addrspace(4) [[WG_VAL_ARRAYCTOR_NEXT:%.*]], getelementptr inbounds (%struct.snork, ptr addrspace(4) addrspacecast (ptr addrspace(3) @global to ptr addrspace(4)), i64 12)
38-
; CHECK: call void @llvm.dbg.value(metadata i1 [[ARRAYCTOR_DONE]], [[META14:metadata !.*]], metadata !DIExpression())
37+
; CHECK: [[ARRAYCTOR_DONE:%.*]] = icmp eq ptr addrspace(4) [[WG_VAL_ARRAYCTOR_NEXT:%.*]], getelementptr inbounds (%struct.snork, ptr addrspace(4) addrspacecast (ptr addrspace(3) @global to ptr addrspace(4)), i64 12), !dbg [[DBGDONE:!.*]]
38+
; CHECK: #dbg_value(i1 [[ARRAYCTOR_DONE]], [[META14:!.*]], !DIExpression(), [[DBGDONE]])
3939
br i1 %arrayctor.done, label %arrayctor.cont, label %arrayctor.loop
4040

4141
arrayctor.cont: ; preds = %arrayctor.loop

0 commit comments

Comments
 (0)