[llvm] update_test_checks: indent dbg records (PR #139230)
Orlando Cazalet-Hyams via llvm-commits
llvm-commits at lists.llvm.org
Fri May 9 02:57:36 PDT 2025
https://github.com/OCHyams updated https://github.com/llvm/llvm-project/pull/139230
>From a34ee52645b5a3818bff86c962bb66744925172d Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hyams at sony.com>
Date: Fri, 9 May 2025 10:26:36 +0100
Subject: [PATCH 1/3] update_test_checks: indent dbg records
---
llvm/utils/UpdateTestChecks/common.py | 2 ++
llvm/utils/update_test_checks.py | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py
index e747ae3f385a9..d150612dd368e 100644
--- a/llvm/utils/UpdateTestChecks/common.py
+++ b/llvm/utils/UpdateTestChecks/common.py
@@ -602,6 +602,8 @@ def invoke_tool(exe, cmd_args, ir, preprocess_cmd=None, verbose=False):
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]+")
diff --git a/llvm/utils/update_test_checks.py b/llvm/utils/update_test_checks.py
index f4b45c5581c71..a544a565aa42d 100755
--- a/llvm/utils/update_test_checks.py
+++ b/llvm/utils/update_test_checks.py
@@ -251,8 +251,9 @@ 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() == "}":
>From cd7a16a88d10fb31048bed531ede18bff1efffa1 Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hyams at sony.com>
Date: Fri, 9 May 2025 10:36:19 +0100
Subject: [PATCH 2/3] fmt / darker
---
llvm/utils/update_test_checks.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/llvm/utils/update_test_checks.py b/llvm/utils/update_test_checks.py
index a544a565aa42d..ff5bb7d782346 100755
--- a/llvm/utils/update_test_checks.py
+++ b/llvm/utils/update_test_checks.py
@@ -252,7 +252,9 @@ def update_test(ti: common.TestInfo):
):
# This input line of the function body will go as-is into the output.
# Except make leading whitespace uniform: 2 spaces. 4 for debug records.
- indent = " " if not common.IS_DEBUG_RECORD_RE.match(input_line) else " "
+ 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
>From ded36e3decd243ae8483f2c5ea092e22ee8d7449 Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hyams at sony.com>
Date: Fri, 9 May 2025 10:57:14 +0100
Subject: [PATCH 3/3] update utc tests
---
.../Inputs/various_ir_values_dbgrecords.ll.expected | 10 +++++-----
.../various_ir_values_dbgrecords.ll.funcsig.expected | 10 +++++-----
...us_ir_values_dbgrecords.ll.funcsig.globals.expected | 10 +++++-----
..._ir_values_dbgrecords.ll.funcsig.noglobals.expected | 10 +++++-----
...es_dbgrecords.ll.funcsig.transitiveglobals.expected | 10 +++++-----
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.expected b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.expected
index c175409c3afb9..65048305a2277 100644
--- a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.expected
+++ b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.expected
@@ -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
diff --git a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.expected b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.expected
index 870ed4d31acc6..7c1ea5e716b99 100644
--- a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.expected
+++ b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.expected
@@ -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
diff --git a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.globals.expected b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.globals.expected
index 02575d4cff11e..94af952353a3c 100644
--- a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.globals.expected
+++ b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.globals.expected
@@ -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
diff --git a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.noglobals.expected b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.noglobals.expected
index c175409c3afb9..65048305a2277 100644
--- a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.noglobals.expected
+++ b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.noglobals.expected
@@ -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
diff --git a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.transitiveglobals.expected b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.transitiveglobals.expected
index cd8dac743e2e0..a656c4aefa0e1 100644
--- a/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.transitiveglobals.expected
+++ b/llvm/test/tools/UpdateTestChecks/update_test_checks/Inputs/various_ir_values_dbgrecords.ll.funcsig.transitiveglobals.expected
@@ -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
More information about the llvm-commits
mailing list