Skip to content

Commit 234ae9b

Browse files
OCHyamsOCHyams
authored
update_test_checks: indent dbg records (#139230)
LLVM prints debug records like `#dbg_value` indented 2 additional spaces.
1 parent 89d13f8 commit 234ae9b

7 files changed

+32
-27
lines changed

‎llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
4747
entry:
4848
%A.addr = alloca ptr, align 8, !DIAssignID !16
4949
%i = alloca i32, align 4
50-
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
50+
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
5151
store ptr %A, ptr %A.addr, align 8, !tbaa !18
52-
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
52+
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
5353
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
54-
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
54+
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
5555
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
5656
br label %for.cond, !dbg !22
5757

@@ -130,9 +130,9 @@ entry:
130130
%A.addr = alloca ptr, align 8
131131
%i = alloca i32, align 4
132132
store ptr %A, ptr %A.addr, align 8, !tbaa !18
133-
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
133+
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
134134
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
135-
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
135+
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
136136
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
137137
br label %for.cond, !dbg !47
138138

‎llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
4848
entry:
4949
%A.addr = alloca ptr, align 8, !DIAssignID !16
5050
%i = alloca i32, align 4
51-
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
51+
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
5252
store ptr %A, ptr %A.addr, align 8, !tbaa !18
53-
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
53+
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
5454
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
55-
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
55+
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
5656
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
5757
br label %for.cond, !dbg !22
5858

@@ -132,9 +132,9 @@ entry:
132132
%A.addr = alloca ptr, align 8
133133
%i = alloca i32, align 4
134134
store ptr %A, ptr %A.addr, align 8, !tbaa !18
135-
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
135+
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
136136
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
137-
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
137+
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
138138
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
139139
br label %for.cond, !dbg !47
140140

‎llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.globals.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
4848
entry:
4949
%A.addr = alloca ptr, align 8, !DIAssignID !16
5050
%i = alloca i32, align 4
51-
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
51+
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
5252
store ptr %A, ptr %A.addr, align 8, !tbaa !18
53-
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
53+
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
5454
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
55-
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
55+
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
5656
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
5757
br label %for.cond, !dbg !22
5858

@@ -132,9 +132,9 @@ entry:
132132
%A.addr = alloca ptr, align 8
133133
%i = alloca i32, align 4
134134
store ptr %A, ptr %A.addr, align 8, !tbaa !18
135-
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
135+
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
136136
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
137-
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
137+
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
138138
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
139139
br label %for.cond, !dbg !47
140140

‎llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.noglobals.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
4747
entry:
4848
%A.addr = alloca ptr, align 8, !DIAssignID !16
4949
%i = alloca i32, align 4
50-
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
50+
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
5151
store ptr %A, ptr %A.addr, align 8, !tbaa !18
52-
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
52+
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
5353
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
54-
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
54+
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
5555
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
5656
br label %for.cond, !dbg !22
5757

@@ -130,9 +130,9 @@ entry:
130130
%A.addr = alloca ptr, align 8
131131
%i = alloca i32, align 4
132132
store ptr %A, ptr %A.addr, align 8, !tbaa !18
133-
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
133+
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
134134
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
135-
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
135+
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
136136
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
137137
br label %for.cond, !dbg !47
138138

‎llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.transitiveglobals.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
4747
entry:
4848
%A.addr = alloca ptr, align 8, !DIAssignID !16
4949
%i = alloca i32, align 4
50-
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
50+
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
5151
store ptr %A, ptr %A.addr, align 8, !tbaa !18
52-
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
52+
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
5353
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
54-
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
54+
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
5555
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
5656
br label %for.cond, !dbg !22
5757

@@ -130,9 +130,9 @@ entry:
130130
%A.addr = alloca ptr, align 8
131131
%i = alloca i32, align 4
132132
store ptr %A, ptr %A.addr, align 8, !tbaa !18
133-
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
133+
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
134134
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
135-
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
135+
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
136136
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
137137
br label %for.cond, !dbg !47
138138

‎llvm/utils/UpdateTestChecks/common.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,8 @@ def invoke_tool(exe, cmd_args, ir, preprocess_cmd=None, verbose=False):
602602
MARCH_ARG_RE = re.compile(r"-march[= ]([^ ]+)")
603603
DEBUG_ONLY_ARG_RE = re.compile(r"-debug-only[= ]([^ ]+)")
604604

605+
IS_DEBUG_RECORD_RE = re.compile(r"^(\s+)#dbg_")
606+
605607
SCRUB_LEADING_WHITESPACE_RE = re.compile(r"^(\s+)")
606608
SCRUB_WHITESPACE_RE = re.compile(r"(?!^(| \w))[ \t]+", flags=re.M)
607609
SCRUB_PRESERVE_LEADING_WHITESPACE_RE = re.compile(r"((?!^)[ \t]*(\S))[ \t]+")

‎llvm/utils/update_test_checks.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,11 @@ def update_test(ti: common.TestInfo):
251251
skip_same_checks=dropped_previous_line,
252252
):
253253
# This input line of the function body will go as-is into the output.
254-
# Except make leading whitespace uniform: 2 spaces.
255-
input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(r" ", input_line)
254+
# Except make leading whitespace uniform: 2 spaces. 4 for debug records.
255+
indent = (
256+
" " if not common.IS_DEBUG_RECORD_RE.match(input_line) else " "
257+
)
258+
input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(indent, input_line)
256259
output_lines.append(input_line)
257260
dropped_previous_line = False
258261
if input_line.strip() == "}":

0 commit comments

Comments
 (0)