shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update_test_checks: indent dbg records (#139230)

Browse Source 
LLVM prints debug records like `#dbg_value` indented 2 additional spaces.
This commit is contained in:
Orlando Cazalet-Hyams 2025-05-09 11:23:43 +01:00 committed by GitHub
parent 89d13f87c7
commit 234ae9bfd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.expected
View File

@ -47,11 +47,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
entry:
%A.addr = alloca ptr, align 8, !DIAssignID !16
%i = alloca i32, align 4
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
br label %for.cond, !dbg !22
@ -130,9 +130,9 @@ entry:
%A.addr = alloca ptr, align 8
%i = alloca i32, align 4
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
br label %for.cond, !dbg !47

10
llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.expected
View File

@ -48,11 +48,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
entry:
%A.addr = alloca ptr, align 8, !DIAssignID !16
%i = alloca i32, align 4
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
br label %for.cond, !dbg !22
@ -132,9 +132,9 @@ entry:
%A.addr = alloca ptr, align 8
%i = alloca i32, align 4
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
br label %for.cond, !dbg !47

10
llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.globals.expected
View File

@ -48,11 +48,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
entry:
%A.addr = alloca ptr, align 8, !DIAssignID !16
%i = alloca i32, align 4
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
br label %for.cond, !dbg !22
@ -132,9 +132,9 @@ entry:
%A.addr = alloca ptr, align 8
%i = alloca i32, align 4
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
br label %for.cond, !dbg !47

10
llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.noglobals.expected
View File

@ -47,11 +47,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
entry:
%A.addr = alloca ptr, align 8, !DIAssignID !16
%i = alloca i32, align 4
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
br label %for.cond, !dbg !22
@ -130,9 +130,9 @@ entry:
%A.addr = alloca ptr, align 8
%i = alloca i32, align 4
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
br label %for.cond, !dbg !47

10
llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.transitiveglobals.expected
View File

@ -47,11 +47,11 @@ define dso_local void @foo(ptr %A) #0 !dbg !7 {
entry:
%A.addr = alloca ptr, align 8, !DIAssignID !16
%i = alloca i32, align 4
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
#dbg_assign(i1 undef, !13, !DIExpression(), !16, ptr %A.addr, !DIExpression(), !17)
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
#dbg_declare(ptr %A.addr, !13, !DIExpression(), !17)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !22
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
#dbg_declare(ptr %i, !14, !DIExpression(), !23)
store i32 0, ptr %i, align 4, !dbg !23, !tbaa !24
br label %for.cond, !dbg !22
@ -130,9 +130,9 @@ entry:
%A.addr = alloca ptr, align 8
%i = alloca i32, align 4
store ptr %A, ptr %A.addr, align 8, !tbaa !18
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
#dbg_declare(ptr %A.addr, !43, !DIExpression(), !46)
call void @llvm.lifetime.start.p0(i64 4, ptr %i) #2, !dbg !47
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
#dbg_declare(ptr %i, !44, !DIExpression(), !48)
store i32 0, ptr %i, align 4, !dbg !48, !tbaa !24
br label %for.cond, !dbg !47

2
llvm/utils/UpdateTestChecks/common.py
View File

@ -602,6 +602,8 @@ TRIPLE_ARG_RE = re.compile(r"-m?triple[= ]([^ ]+)")
MARCH_ARG_RE = re.compile(r"-march[= ]([^ ]+)")
DEBUG_ONLY_ARG_RE = re.compile(r"-debug-only[= ]([^ ]+)")
IS_DEBUG_RECORD_RE = re.compile(r"^(\s+)#dbg_")
SCRUB_LEADING_WHITESPACE_RE = re.compile(r"^(\s+)")
SCRUB_WHITESPACE_RE = re.compile(r"(?!^(| \w))[ \t]+", flags=re.M)
SCRUB_PRESERVE_LEADING_WHITESPACE_RE = re.compile(r"((?!^)[ \t]*(\S))[ \t]+")

7
llvm/utils/update_test_checks.py
View File

@ -251,8 +251,11 @@ def update_test(ti: common.TestInfo):
skip_same_checks=dropped_previous_line,
):
# This input line of the function body will go as-is into the output.
# Except make leading whitespace uniform: 2 spaces.
input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(r" ", input_line)
# Except make leading whitespace uniform: 2 spaces. 4 for debug records.
indent = (
" " if not common.IS_DEBUG_RECORD_RE.match(input_line) else " "
)
input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(indent, input_line)
output_lines.append(input_line)
dropped_previous_line = False
if input_line.strip() == "}":