diff options
author | Florian Hahn <flo@fhahn.com> | 2023-11-09 17:18:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-09 17:18:11 +0000 |
commit | 24839c32539bab96f972c9736a6e43de951449e6 (patch) | |
tree | 8f53d5fd84d7945c97ca36f672a48c695a6ad372 /llvm | |
parent | 24577bd089c94d607de0d3df1b4259a28e7e23f5 (diff) | |
download | llvm-24839c32539bab96f972c9736a6e43de951449e6.zip llvm-24839c32539bab96f972c9736a6e43de951449e6.tar.gz llvm-24839c32539bab96f972c9736a6e43de951449e6.tar.bz2 |
[UTC] Escape multiple {{ or }} in input for check lines. (#71790)
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.
Diffstat (limited to 'llvm')
3 files changed, 12 insertions, 5 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 adc9d15..fb101d8 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 113f03d..58655ff 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 74044f9..88b2ccc2 100644 --- a/llvm/utils/UpdateTestChecks/common.py +++ b/llvm/utils/UpdateTestChecks/common.py @@ -1171,6 +1171,9 @@ def generalize_check_lines_common( return match.group(1) + rv + match.group(match.lastindex) lines_with_def = [] + multiple_braces_re = re.compile(r"({{+)|(}}+)") + def escape_braces(match_obj): + return '{{' + re.escape(match_obj.group(0)) + '}}' for i, line in enumerate(lines): if not is_asm and not is_analyze: @@ -1200,6 +1203,10 @@ def generalize_check_lines_common( (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(escape_braces, lines[i]) + lines[i] = scrubbed_line return lines |