This is an archive of the discontinued LLVM Phabricator instance.

Differential D70890

[update_cc_test_checks.py] Use CHECK_RE from common
ClosedPublic

Authored by arichardson on Dec 2 2019, 3:06 AM.

Details

Reviewers
MaskRay
jdoerfert
Commits
rG3b55eebd239e: [update_cc_test_checks.py] Use CHECK_RE from common
Summary

This change modifies the common.CHECK_RE regex to also handle '//'
comment prefixes which allows us to share it between clang and IR tests.
Using the regex from common means that *-SAME lines are also stripped
now. Before this change using the --function-signature flag would result
in -SAME: lines from previous runs not being removed.

Diff Detail

Event Timeline

arichardson created this revision.Dec 2 2019, 3:06 AM
Herald added a project: Restricted Project. · View Herald TranscriptDec 2 2019, 3:06 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B41690: Diff 231659.Dec 2 2019, 3:09 AM
arichardson added a child revision: D70660: Add initial tests for update_{llc,cc}_test_checks.py.Dec 2 2019, 3:44 AM
arichardson mentioned this in D70660: Add initial tests for update_{llc,cc}_test_checks.py.
jdoerfert accepted this revision.Dec 2 2019, 9:26 AM
jdoerfert added a subscriber: jdoerfert.

LGTM.

I think I have the same downstream patch :)

This revision is now accepted and ready to land.Dec 2 2019, 9:26 AM
Closed by commit rG3b55eebd239e: [update_cc_test_checks.py] Use CHECK_RE from common (authored by arichardson). · Explain WhyDec 2 2019, 10:25 AM
This revision was automatically updated to reflect the committed changes.
arichardson removed a child revision: D70660: Add initial tests for update_{llc,cc}_test_checks.py.Dec 13 2019, 3:34 AM

Revision Contents

PathSize
llvm/
utils/
UpdateTestChecks/
2 lines
4 lines

Diff 231659

llvm/utils/UpdateTestChecks/common.py

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Linesdef invoke_tool(exe, cmd_args, ir):
# Fix line endings to unix CR style. # Fix line endings to unix CR style.
return stdout.replace('\r\n', '\n') return stdout.replace('\r\n', '\n')
##### LLVM IR parser ##### LLVM IR parser
RUN_LINE_RE = re.compile(r'^\s*(?://|[;#])\s*RUN:\s*(.*)$') RUN_LINE_RE = re.compile(r'^\s*(?://|[;#])\s*RUN:\s*(.*)$')
CHECK_PREFIX_RE = re.compile(r'--?check-prefix(?:es)?[= ](\S+)') CHECK_PREFIX_RE = re.compile(r'--?check-prefix(?:es)?[= ](\S+)')
PREFIX_RE = re.compile('^[a-zA-Z0-9_-]+$') PREFIX_RE = re.compile('^[a-zA-Z0-9_-]+$')
CHECK_RE = re.compile(r'^\s*[;#]\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL|-SAME)?:') CHECK_RE = re.compile(r'^\s*(?://|[;#])\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL|-SAME)?:')
OPT_FUNCTION_RE = re.compile( OPT_FUNCTION_RE = re.compile(
r'^\s*define\s+(?:internal\s+)?[^@]*@(?P<func>[\w-]+?)\s*' r'^\s*define\s+(?:internal\s+)?[^@]*@(?P<func>[\w-]+?)\s*'
r'(?P<args_and_sig>\((\)|(.*?[\w\.\-]+?)\))[^{]*)\{\n(?P<body>.*?)^\}$', r'(?P<args_and_sig>\((\)|(.*?[\w\.\-]+?)\))[^{]*)\{\n(?P<body>.*?)^\}$',
flags=(re.M | re.S)) flags=(re.M | re.S))
ANALYZE_FUNCTION_RE = re.compile( ANALYZE_FUNCTION_RE = re.compile(
r'^\s*\'(?P<analysis>[\w\s-]+?)\'\s+for\s+function\s+\'(?P<func>[\w-]+?)\':' r'^\s*\'(?P<analysis>[\w\s-]+?)\'\s+for\s+function\s+\'(?P<func>[\w-]+?)\':'
▲ Show 20 Lines • Show All 303 Lines • Show Last 20 Lines

llvm/utils/update_cc_test_checks.py

Show All 22 Lines
import sys import sys
import re import re
import tempfile import tempfile
from UpdateTestChecks import asm, common from UpdateTestChecks import asm, common
ADVERT = '// NOTE: Assertions have been autogenerated by ' ADVERT = '// NOTE: Assertions have been autogenerated by '
CHECK_RE = re.compile(r'^\s*//\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:')
SUBST = { SUBST = {
'%clang': [], '%clang': [],
'%clang_cc1': ['-cc1'], '%clang_cc1': ['-cc1'],
'%clangxx': ['--driver-mode=g++'], '%clangxx': ['--driver-mode=g++'],
} }
def get_line2spell_and_mangled(args, clang_args): def get_line2spell_and_mangled(args, clang_args):
ret = {} ret = {}
▲ Show 20 Lines • Show All 192 Lines • ▼ Show 20 Lines for l in run_lines:
check_prefixes = ['CHECK'] check_prefixes = ['CHECK']
run_list.append((check_prefixes, clang_args, commands[1:-1], triple_in_cmd)) run_list.append((check_prefixes, clang_args, commands[1:-1], triple_in_cmd))
# Strip CHECK lines which are in `prefix_set`, update test file. # Strip CHECK lines which are in `prefix_set`, update test file.
prefix_set = set([prefix for p in run_list for prefix in p[0]]) prefix_set = set([prefix for p in run_list for prefix in p[0]])
input_lines = [] input_lines = []
with open(filename, 'r+') as f: with open(filename, 'r+') as f:
for line in f: for line in f:
m = CHECK_RE.match(line) m = common.CHECK_RE.match(line)
if not (m and m.group(1) in prefix_set) and line != '//\n': if not (m and m.group(1) in prefix_set) and line != '//\n':
input_lines.append(line) input_lines.append(line)
f.seek(0) f.seek(0)
f.writelines(input_lines) f.writelines(input_lines)
f.truncate() f.truncate()
# Execute clang, generate LLVM IR, and extract functions. # Execute clang, generate LLVM IR, and extract functions.
func_dict = {} func_dict = {}
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines