[llvm] [UTC] Escape multiple {{ or }} in input for check lines. (PR #71790)
Florian Hahn via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 9 09:05:59 PST 2023
https://github.com/fhahn updated https://github.com/llvm/llvm-project/pull/71790
>From 2e3bf91a8f117744fe7e01d54aa2084c212f81a2 Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo at fhahn.com>
Date: Thu, 9 Nov 2023 10:03:13 +0000
Subject: [PATCH 1/4] [UTC] Escape multiple {{ or }} in input for check lines.
SCEV expressions may contain multiple {{ or }} in the debug output,
which needs escaping.
See llvm/test/Analysis/LoopAccessAnalysis/loops-with-indirect-reads-and-writes.ll
for a test that needs escaping.
---
.../Inputs/loop-access-analysis.ll.expected | 2 +-
llvm/utils/UpdateTestChecks/common.py | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/loop-access-analysis.ll.expected b/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/loop-access-analysis.ll.expected
index 113f03d091b1b25..ac032990d8c2d86 100644
--- a/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/loop-access-analysis.ll.expected
+++ b/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/loop-access-analysis.ll.expected
@@ -81,7 +81,7 @@ define void @test_brace_escapes(ptr noundef %arr) {
; CHECK-NEXT: Grouped accesses:
; CHECK-NEXT: Group [[GRP4]]:
; CHECK-NEXT: (Low: {(64 + %arr),+,64}<%loop.1> High: {(8064 + %arr),+,64}<%loop.1>)
-; CHECK-NEXT: Member: {{(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
+; CHECK-NEXT: Member: {{\{{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
; CHECK-NEXT: Group [[GRP5]]:
; CHECK-NEXT: (Low: %arr High: (8000 + %arr))
; CHECK-NEXT: Member: {%arr,+,8}<nuw><%loop.2>
diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py
index 74044f925aadde4..e8d8d99257e81d0 100644
--- a/llvm/utils/UpdateTestChecks/common.py
+++ b/llvm/utils/UpdateTestChecks/common.py
@@ -1171,6 +1171,7 @@ def transform_line_vars(match):
return match.group(1) + rv + match.group(match.lastindex)
lines_with_def = []
+ multiple_braces_re = re.compile(r"(({{+)|(}}+))")
for i, line in enumerate(lines):
if not is_asm and not is_analyze:
@@ -1200,6 +1201,10 @@ def transform_line_vars(match):
(lines[i], changed) = nameless_value_regex.subn(
transform_line_vars, lines[i], count=1
)
+ if is_analyze:
+ # Escape multiple {{ or }} as {{}} denotes a FileCheck regex.
+ scrubbed_line = multiple_braces_re.sub(r"{{\\\1}}", lines[i])
+ lines[i] = scrubbed_line
return lines
>From a560cfbd2fc45ecfd7e73054d5866398b13ee162 Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo at fhahn.com>
Date: Thu, 9 Nov 2023 16:11:21 +0000
Subject: [PATCH 2/4] Escape each brace.
---
.../loops-with-indirect-reads-and-writes.ll | 8 ++++----
.../Inputs/loop-access-analysis.ll.expected | 2 +-
llvm/utils/UpdateTestChecks/common.py | 12 ++++++++++--
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/llvm/test/Analysis/LoopAccessAnalysis/loops-with-indirect-reads-and-writes.ll b/llvm/test/Analysis/LoopAccessAnalysis/loops-with-indirect-reads-and-writes.ll
index adc9d159a93c465..fb101d86c27ffc5 100644
--- a/llvm/test/Analysis/LoopAccessAnalysis/loops-with-indirect-reads-and-writes.ll
+++ b/llvm/test/Analysis/LoopAccessAnalysis/loops-with-indirect-reads-and-writes.ll
@@ -34,7 +34,7 @@ define void @test_indirect_read_write_loop_also_modifies_pointer_array(ptr nound
; CHECK-NEXT: Grouped accesses:
; CHECK-NEXT: Group [[GRP1]]:
; CHECK-NEXT: (Low: {(64 + %arr),+,64}<%loop.1> High: {(8064 + %arr),+,64}<%loop.1>)
-; CHECK-NEXT: Member: {{\{{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
+; CHECK-NEXT: Member: {{\{\{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
; CHECK-NEXT: Group [[GRP2]]:
; CHECK-NEXT: (Low: %arr High: (8000 + %arr))
; CHECK-NEXT: Member: {%arr,+,8}<nuw><%loop.2>
@@ -105,7 +105,7 @@ define void @test_indirect_read_loop_also_modifies_pointer_array(ptr noundef %ar
; CHECK-NEXT: Grouped accesses:
; CHECK-NEXT: Group [[GRP3]]:
; CHECK-NEXT: (Low: {(64 + %arr),+,64}<%loop.1> High: {(8064 + %arr),+,64}<%loop.1>)
-; CHECK-NEXT: Member: {{\{{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
+; CHECK-NEXT: Member: {{\{\{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
; CHECK-NEXT: Group [[GRP4]]:
; CHECK-NEXT: (Low: %arr High: (8000 + %arr))
; CHECK-NEXT: Member: {%arr,+,8}<nuw><%loop.2>
@@ -175,7 +175,7 @@ define void @test_indirect_write_loop_also_modifies_pointer_array(ptr noundef %a
; CHECK-NEXT: Grouped accesses:
; CHECK-NEXT: Group [[GRP5]]:
; CHECK-NEXT: (Low: {(64 + %arr),+,64}<%loop.1> High: {(8064 + %arr),+,64}<%loop.1>)
-; CHECK-NEXT: Member: {{\{{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
+; CHECK-NEXT: Member: {{\{\{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
; CHECK-NEXT: Group [[GRP6]]:
; CHECK-NEXT: (Low: %arr High: (8000 + %arr))
; CHECK-NEXT: Member: {%arr,+,8}<nuw><%loop.2>
@@ -244,7 +244,7 @@ define void @test_indirect_read_write_loop_does_not_modify_pointer_array(ptr nou
; CHECK-NEXT: Grouped accesses:
; CHECK-NEXT: Group [[GRP7]]:
; CHECK-NEXT: (Low: {(64 + %arr),+,64}<%loop.1> High: {(8064 + %arr),+,64}<%loop.1>)
-; CHECK-NEXT: Member: {{\{{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
+; CHECK-NEXT: Member: {{\{\{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
; CHECK-NEXT: Group [[GRP8]]:
; CHECK-NEXT: (Low: %arr High: (8000 + %arr))
; CHECK-NEXT: Member: {%arr,+,8}<nuw><%loop.2>
diff --git a/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/loop-access-analysis.ll.expected b/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/loop-access-analysis.ll.expected
index ac032990d8c2d86..58655ff979afc3c 100644
--- a/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/loop-access-analysis.ll.expected
+++ b/llvm/test/tools/UpdateTestChecks/update_analyze_test_checks/Inputs/loop-access-analysis.ll.expected
@@ -81,7 +81,7 @@ define void @test_brace_escapes(ptr noundef %arr) {
; CHECK-NEXT: Grouped accesses:
; CHECK-NEXT: Group [[GRP4]]:
; CHECK-NEXT: (Low: {(64 + %arr),+,64}<%loop.1> High: {(8064 + %arr),+,64}<%loop.1>)
-; CHECK-NEXT: Member: {{\{{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
+; CHECK-NEXT: Member: {{\{\{}}(64 + %arr),+,64}<%loop.1>,+,8}<%loop.2>
; CHECK-NEXT: Group [[GRP5]]:
; CHECK-NEXT: (Low: %arr High: (8000 + %arr))
; CHECK-NEXT: Member: {%arr,+,8}<nuw><%loop.2>
diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py
index e8d8d99257e81d0..9c04cfa9c1eba98 100644
--- a/llvm/utils/UpdateTestChecks/common.py
+++ b/llvm/utils/UpdateTestChecks/common.py
@@ -1171,7 +1171,15 @@ def transform_line_vars(match):
return match.group(1) + rv + match.group(match.lastindex)
lines_with_def = []
- multiple_braces_re = re.compile(r"(({{+)|(}}+))")
+ multiple_braces_re = re.compile(r"({{+)|(}}+)")
+ def escape_braces(match_obj):
+ s = match_obj.group(0)
+ escaped = ''
+ if s[0] == '{':
+ escaped = s.replace('{', '\\{')
+ else:
+ escaped = s.replace('}', '\\}')
+ return ''.join(['{{', escaped, '}}'])
for i, line in enumerate(lines):
if not is_asm and not is_analyze:
@@ -1203,7 +1211,7 @@ def transform_line_vars(match):
)
if is_analyze:
# Escape multiple {{ or }} as {{}} denotes a FileCheck regex.
- scrubbed_line = multiple_braces_re.sub(r"{{\\\1}}", lines[i])
+ scrubbed_line = multiple_braces_re.sub(escape_braces, lines[i])
lines[i] = scrubbed_line
return lines
>From 7e50045bf18c151b3f55a90b5bd6cb433a31f1e6 Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo at fhahn.com>
Date: Thu, 9 Nov 2023 16:49:59 +0000
Subject: [PATCH 3/4] Use re.escape.
---
llvm/utils/UpdateTestChecks/common.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py
index 9c04cfa9c1eba98..db4acc5a20ab720 100644
--- a/llvm/utils/UpdateTestChecks/common.py
+++ b/llvm/utils/UpdateTestChecks/common.py
@@ -1173,13 +1173,7 @@ def transform_line_vars(match):
lines_with_def = []
multiple_braces_re = re.compile(r"({{+)|(}}+)")
def escape_braces(match_obj):
- s = match_obj.group(0)
- escaped = ''
- if s[0] == '{':
- escaped = s.replace('{', '\\{')
- else:
- escaped = s.replace('}', '\\}')
- return ''.join(['{{', escaped, '}}'])
+ return ''.join(['{{', re.escape(match_obj.group(0)), '}}'])
for i, line in enumerate(lines):
if not is_asm and not is_analyze:
>From acbd908b61f81cd8bb180f363c167dedf7d0c38d Mon Sep 17 00:00:00 2001
From: Florian Hahn <flo at fhahn.com>
Date: Thu, 9 Nov 2023 17:05:52 +0000
Subject: [PATCH 4/4] Update llvm/utils/UpdateTestChecks/common.py
Co-authored-by: Nikita Popov <github at npopov.com>
---
llvm/utils/UpdateTestChecks/common.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py
index db4acc5a20ab720..88b2ccc238d9943 100644
--- a/llvm/utils/UpdateTestChecks/common.py
+++ b/llvm/utils/UpdateTestChecks/common.py
@@ -1173,7 +1173,7 @@ def transform_line_vars(match):
lines_with_def = []
multiple_braces_re = re.compile(r"({{+)|(}}+)")
def escape_braces(match_obj):
- return ''.join(['{{', re.escape(match_obj.group(0)), '}}'])
+ return '{{' + re.escape(match_obj.group(0)) + '}}'
for i, line in enumerate(lines):
if not is_asm and not is_analyze:
More information about the llvm-commits
mailing list