This is an archive of the discontinued LLVM Phabricator instance.

Differential D28572

[utils] Improve extraction of check prefixes from RUN lines
ClosedPublic

Authored by n.bozhenov on Jan 11 2017, 10:50 AM.

Details

Reviewers
spatel
chandlerc
• dberlin
bryant
Commits
rG33ee40edd92c: [utils] Improve extraction of check prefixes from RUN lines
rL292008: [utils] Improve extraction of check prefixes from RUN lines
Summary

Correct handling of the following FileCheck options is implemented in
update_llc_test_checks.py and update_test_checks.py scripts:

  1. -check-prefix (with a single dash)
  2. -check-prefixes (with multiple prefixes)

Diff Detail

Event Timeline

n.bozhenov updated this revision to Diff 84002.Jan 11 2017, 10:50 AM
n.bozhenov retitled this revision from to [utils] Improve extraction of check prefixes from RUN lines.
n.bozhenov updated this object.
n.bozhenov added reviewers: chandlerc, spatel.
n.bozhenov added a subscriber: llvm-commits.
spatel added reviewers: • dberlin, bryant.Jan 13 2017, 10:47 AM

Seems reasonable, but adding reviewers that know more about python.

• dberlin accepted this revision.Jan 13 2017, 10:54 AM
• dberlin edited edge metadata.

this looks correct.
i wonder at what point we should start adding at least docstring tests to this code.

This revision is now accepted and ready to land.Jan 13 2017, 10:54 AM
Closed by commit rL292008: [utils] Improve extraction of check prefixes from RUN lines (authored by n.bozhenov). · Explain WhyJan 14 2017, 1:50 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 84002

utils/update_llc_test_checks.py

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 LinesASM_FUNCTION_ARM_RE = re.compile(
r'(?P<body>.*?)\n' # (body of the function) r'(?P<body>.*?)\n' # (body of the function)
r'.Lfunc_end[0-9]+:\n', # .Lfunc_end0: r'.Lfunc_end[0-9]+:\n', # .Lfunc_end0:
flags=(re.M | re.S)) flags=(re.M | re.S))
RUN_LINE_RE = re.compile('^\s*;\s*RUN:\s*(.*)$') RUN_LINE_RE = re.compile('^\s*;\s*RUN:\s*(.*)$')
TRIPLE_ARG_RE = re.compile(r'-mtriple=([^ ]+)') TRIPLE_ARG_RE = re.compile(r'-mtriple=([^ ]+)')
TRIPLE_IR_RE = re.compile(r'^target\s+triple\s*=\s*"([^"]+)"$') TRIPLE_IR_RE = re.compile(r'^target\s+triple\s*=\s*"([^"]+)"$')
IR_FUNCTION_RE = re.compile('^\s*define\s+(?:internal\s+)?[^@]*@(\w+)\s*\(') IR_FUNCTION_RE = re.compile('^\s*define\s+(?:internal\s+)?[^@]*@(\w+)\s*\(')
CHECK_PREFIX_RE = re.compile('--check-prefix=(\S+)') CHECK_PREFIX_RE = re.compile('--?check-prefix(?:es)?=(\S+)')
CHECK_RE = re.compile(r'^\s*;\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:') CHECK_RE = re.compile(r'^\s*;\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:')
ASM_FUNCTION_PPC_RE = re.compile( ASM_FUNCTION_PPC_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n' r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n'
r'\.Lfunc_begin[0-9]+:\n' r'\.Lfunc_begin[0-9]+:\n'
r'[ \t]+.cfi_startproc\n' r'[ \t]+.cfi_startproc\n'
r'(?:\.Lfunc_[gl]ep[0-9]+:\n(?:[ \t]+.*?\n)*)*' r'(?:\.Lfunc_[gl]ep[0-9]+:\n(?:[ \t]+.*?\n)*)*'
r'(?P<body>.*?)\n' r'(?P<body>.*?)\n'
▲ Show 20 Lines • Show All 189 Lines • ▼ Show 20 Lines for l in run_lines:
if not filecheck_cmd.startswith('FileCheck '): if not filecheck_cmd.startswith('FileCheck '):
print >>sys.stderr, 'WARNING: Skipping non-FileChecked RUN line: ' + l print >>sys.stderr, 'WARNING: Skipping non-FileChecked RUN line: ' + l
continue continue
llc_cmd_args = llc_cmd[len('llc'):].strip() llc_cmd_args = llc_cmd[len('llc'):].strip()
llc_cmd_args = llc_cmd_args.replace('< %s', '').replace('%s', '').strip() llc_cmd_args = llc_cmd_args.replace('< %s', '').replace('%s', '').strip()
check_prefixes = [m.group(1) check_prefixes = [item for m in CHECK_PREFIX_RE.finditer(filecheck_cmd)
for m in CHECK_PREFIX_RE.finditer(filecheck_cmd)] for item in m.group(1).split(',')]
if not check_prefixes: if not check_prefixes:
check_prefixes = ['CHECK'] check_prefixes = ['CHECK']
# FIXME: We should use multiple check prefixes to common check lines. For # FIXME: We should use multiple check prefixes to common check lines. For
# now, we just ignore all but the last. # now, we just ignore all but the last.
run_list.append((check_prefixes, llc_cmd_args, triple_in_cmd)) run_list.append((check_prefixes, llc_cmd_args, triple_in_cmd))
func_dict = {} func_dict = {}
▲ Show 20 Lines • Show All 73 Lines • Show Last 20 Lines

utils/update_test_checks.py

Show First 20 Lines • Show All 60 Lines • ▼ Show 20 LinesLLC_FUNCTION_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n[^:]*?' r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n[^:]*?'
r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*' r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*'
r'^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section)', r'^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section)',
flags=(re.M | re.S)) flags=(re.M | re.S))
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'(\s+)?[^{]*\{\n(?P<body>.*?)^\}$', r'(\s+)?[^{]*\{\n(?P<body>.*?)^\}$',
flags=(re.M | re.S)) flags=(re.M | re.S))
CHECK_PREFIX_RE = re.compile('--check-prefix=(\S+)') CHECK_PREFIX_RE = re.compile('--?check-prefix(?:es)?=(\S+)')
CHECK_RE = re.compile(r'^\s*;\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:') CHECK_RE = re.compile(r'^\s*;\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:')
IR_VALUE_DEF_RE = re.compile(r'\s+%(.*) =') IR_VALUE_DEF_RE = re.compile(r'\s+%(.*) =')
# Invoke the tool that is being tested. # Invoke the tool that is being tested.
def invoke_tool(args, cmd_args, ir): def invoke_tool(args, cmd_args, ir):
with open(ir) as ir_file: with open(ir) as ir_file:
stdout = subprocess.check_output(args.tool_binary + ' ' + cmd_args, stdout = subprocess.check_output(args.tool_binary + ' ' + cmd_args,
▲ Show 20 Lines • Show All 238 Lines • ▼ Show 20 Lines for l in run_lines:
if not filecheck_cmd.startswith('FileCheck '): if not filecheck_cmd.startswith('FileCheck '):
print >>sys.stderr, 'WARNING: Skipping non-FileChecked RUN line: ' + l print >>sys.stderr, 'WARNING: Skipping non-FileChecked RUN line: ' + l
continue continue
tool_cmd_args = tool_cmd[len(tool_basename):].strip() tool_cmd_args = tool_cmd[len(tool_basename):].strip()
tool_cmd_args = tool_cmd_args.replace('< %s', '').replace('%s', '').strip() tool_cmd_args = tool_cmd_args.replace('< %s', '').replace('%s', '').strip()
check_prefixes = [m.group(1) check_prefixes = [item for m in CHECK_PREFIX_RE.finditer(filecheck_cmd)
for m in CHECK_PREFIX_RE.finditer(filecheck_cmd)] for item in m.group(1).split(',')]
if not check_prefixes: if not check_prefixes:
check_prefixes = ['CHECK'] check_prefixes = ['CHECK']
# FIXME: We should use multiple check prefixes to common check lines. For # FIXME: We should use multiple check prefixes to common check lines. For
# now, we just ignore all but the last. # now, we just ignore all but the last.
prefix_list.append((check_prefixes, tool_cmd_args)) prefix_list.append((check_prefixes, tool_cmd_args))
func_dict = {} func_dict = {}
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines