mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-18 18:42:46 +02:00
[UpdateTestChecks] Add update_analyze_test_checks.py for cost model analysis generation
The script allows the auto-generation of checks for cost model tests to speed up their creation and help improve coverage, which will help a lot with PR36550. If the need arises we can add support for other analyze passes as well, but the cost models was the one I needed to get done - at the moment it just warns that any other analysis mode is unsupported. I've regenerated a couple of x86 test files to show the effect. Differential Revision: https://reviews.llvm.org/D45272 llvm-svn: 329390
This commit is contained in:
parent
0bed948de8
commit
9b724910b4
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -218,4 +218,4 @@ def build_function_body_dictionary_for_triple(args, raw_tool_output, triple, pre
|
|||||||
def add_asm_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
|
def add_asm_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
|
||||||
# Label format is based on ASM string.
|
# Label format is based on ASM string.
|
||||||
check_label_format = '{} %s-LABEL: %s:'.format(comment_marker)
|
check_label_format = '{} %s-LABEL: %s:'.format(comment_marker)
|
||||||
common.add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, True)
|
common.add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, True, False)
|
||||||
|
@ -53,6 +53,11 @@ OPT_FUNCTION_RE = re.compile(
|
|||||||
r'(\s+)?[^)]*[^{]*\{\n(?P<body>.*?)^\}$',
|
r'(\s+)?[^)]*[^{]*\{\n(?P<body>.*?)^\}$',
|
||||||
flags=(re.M | re.S))
|
flags=(re.M | re.S))
|
||||||
|
|
||||||
|
ANALYZE_FUNCTION_RE = re.compile(
|
||||||
|
r'^\s*\'(?P<analysis>[\w\s-]+?)\'\s+for\s+function\s+\'(?P<func>[\w-]+?)\':'
|
||||||
|
r'\s*\n(?P<body>.*)$',
|
||||||
|
flags=(re.X | re.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*\(')
|
||||||
TRIPLE_IR_RE = re.compile(r'^\s*target\s+triple\s*=\s*"([^"]+)"$')
|
TRIPLE_IR_RE = re.compile(r'^\s*target\s+triple\s*=\s*"([^"]+)"$')
|
||||||
TRIPLE_ARG_RE = re.compile(r'-mtriple[= ]([^ ]+)')
|
TRIPLE_ARG_RE = re.compile(r'-mtriple[= ]([^ ]+)')
|
||||||
@ -82,6 +87,10 @@ def build_function_body_dictionary(function_re, scrubber, scrubber_args, raw_too
|
|||||||
continue
|
continue
|
||||||
func = m.group('func')
|
func = m.group('func')
|
||||||
scrubbed_body = scrubber(m.group('body'), *scrubber_args)
|
scrubbed_body = scrubber(m.group('body'), *scrubber_args)
|
||||||
|
if m.groupdict().has_key('analysis'):
|
||||||
|
analysis = m.group('analysis')
|
||||||
|
if analysis.lower() != 'cost model analysis':
|
||||||
|
print('WARNING: Unsupported analysis mode: %r!' % (analysis,), file=sys.stderr)
|
||||||
if func.startswith('stress'):
|
if func.startswith('stress'):
|
||||||
# We only use the last line of the function body for stress tests.
|
# We only use the last line of the function body for stress tests.
|
||||||
scrubbed_body = '\n'.join(scrubbed_body.splitlines()[-1:])
|
scrubbed_body = '\n'.join(scrubbed_body.splitlines()[-1:])
|
||||||
@ -127,7 +136,7 @@ def get_value_use(var):
|
|||||||
return '[[' + get_value_name(var) + ']]'
|
return '[[' + get_value_name(var) + ']]'
|
||||||
|
|
||||||
# Replace IR value defs and uses with FileCheck variables.
|
# Replace IR value defs and uses with FileCheck variables.
|
||||||
def genericize_check_lines(lines):
|
def genericize_check_lines(lines, is_analyze):
|
||||||
# This gets called for each match that occurs in
|
# This gets called for each match that occurs in
|
||||||
# a line. We transform variables we haven't seen
|
# a line. We transform variables we haven't seen
|
||||||
# into defs, and variables we have seen into uses.
|
# into defs, and variables we have seen into uses.
|
||||||
@ -152,11 +161,14 @@ def genericize_check_lines(lines):
|
|||||||
line = line.replace('%.', '%dot')
|
line = line.replace('%.', '%dot')
|
||||||
# Ignore any comments, since the check lines will too.
|
# Ignore any comments, since the check lines will too.
|
||||||
scrubbed_line = SCRUB_IR_COMMENT_RE.sub(r'', line)
|
scrubbed_line = SCRUB_IR_COMMENT_RE.sub(r'', line)
|
||||||
lines[i] = IR_VALUE_RE.sub(transform_line_vars, scrubbed_line)
|
if is_analyze == False:
|
||||||
|
lines[i] = IR_VALUE_RE.sub(transform_line_vars, scrubbed_line)
|
||||||
|
else:
|
||||||
|
lines[i] = scrubbed_line
|
||||||
return lines
|
return lines
|
||||||
|
|
||||||
|
|
||||||
def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, is_asm):
|
def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, is_asm, is_analyze):
|
||||||
printed_prefixes = []
|
printed_prefixes = []
|
||||||
for p in prefix_list:
|
for p in prefix_list:
|
||||||
checkprefixes = p[0]
|
checkprefixes = p[0]
|
||||||
@ -187,7 +199,7 @@ def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name,
|
|||||||
|
|
||||||
# For IR output, change all defs to FileCheck variables, so we're immune
|
# For IR output, change all defs to FileCheck variables, so we're immune
|
||||||
# to variable naming fashions.
|
# to variable naming fashions.
|
||||||
func_body = genericize_check_lines(func_body)
|
func_body = genericize_check_lines(func_body, is_analyze)
|
||||||
|
|
||||||
# This could be selectively enabled with an optional invocation argument.
|
# This could be selectively enabled with an optional invocation argument.
|
||||||
# Disabled for now: better to check everything. Be safe rather than sorry.
|
# Disabled for now: better to check everything. Be safe rather than sorry.
|
||||||
@ -226,4 +238,8 @@ def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name,
|
|||||||
def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
|
def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
|
||||||
# Label format is based on IR string.
|
# Label format is based on IR string.
|
||||||
check_label_format = '{} %s-LABEL: @%s('.format(comment_marker)
|
check_label_format = '{} %s-LABEL: @%s('.format(comment_marker)
|
||||||
add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False)
|
add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, False)
|
||||||
|
|
||||||
|
def add_analyze_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
|
||||||
|
check_label_format = '{} %s-LABEL: \'%s\''.format(comment_marker)
|
||||||
|
add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, True)
|
||||||
|
191
utils/update_analyze_test_checks.py
Normal file
191
utils/update_analyze_test_checks.py
Normal file
@ -0,0 +1,191 @@
|
|||||||
|
#!/usr/bin/env python2.7
|
||||||
|
|
||||||
|
"""A script to generate FileCheck statements for 'opt' analysis tests.
|
||||||
|
|
||||||
|
This script is a utility to update LLVM opt analysis test cases with new
|
||||||
|
FileCheck patterns. It can either update all of the tests in the file or
|
||||||
|
a single test function.
|
||||||
|
|
||||||
|
Example usage:
|
||||||
|
$ update_analyze_test_checks.py --opt=../bin/opt test/foo.ll
|
||||||
|
|
||||||
|
Workflow:
|
||||||
|
1. Make a compiler patch that requires updating some number of FileCheck lines
|
||||||
|
in regression test files.
|
||||||
|
2. Save the patch and revert it from your local work area.
|
||||||
|
3. Update the RUN-lines in the affected regression tests to look canonical.
|
||||||
|
Example: "; RUN: opt < %s -analyze -cost-model -S | FileCheck %s"
|
||||||
|
4. Refresh the FileCheck lines for either the entire file or select functions by
|
||||||
|
running this script.
|
||||||
|
5. Commit the fresh baseline of checks.
|
||||||
|
6. Apply your patch from step 1 and rebuild your local binaries.
|
||||||
|
7. Re-run this script on affected regression tests.
|
||||||
|
8. Check the diffs to ensure the script has done something reasonable.
|
||||||
|
9. Submit a patch including the regression test diffs for review.
|
||||||
|
|
||||||
|
A common pattern is to have the script insert complete checking of every
|
||||||
|
instruction. Then, edit it down to only check the relevant instructions.
|
||||||
|
The script is designed to make adding checks to a test case fast, it is *not*
|
||||||
|
designed to be authoratitive about what constitutes a good test!
|
||||||
|
"""
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import itertools
|
||||||
|
import os # Used to advertise this file's name ("autogenerated_note").
|
||||||
|
import string
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
import tempfile
|
||||||
|
import re
|
||||||
|
|
||||||
|
from UpdateTestChecks import common
|
||||||
|
|
||||||
|
ADVERT = '; NOTE: Assertions have been autogenerated by '
|
||||||
|
|
||||||
|
# RegEx: this is where the magic happens.
|
||||||
|
|
||||||
|
IR_FUNCTION_RE = re.compile('^\s*define\s+(?:internal\s+)?[^@]*@([\w-]+)\s*\(')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
from argparse import RawTextHelpFormatter
|
||||||
|
parser = argparse.ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
|
||||||
|
parser.add_argument('-v', '--verbose', action='store_true',
|
||||||
|
help='Show verbose output')
|
||||||
|
parser.add_argument('--opt-binary', default='opt',
|
||||||
|
help='The opt binary used to generate the test case')
|
||||||
|
parser.add_argument(
|
||||||
|
'--function', help='The function in the test file to update')
|
||||||
|
parser.add_argument('tests', nargs='+')
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
autogenerated_note = (ADVERT + 'utils/' + os.path.basename(__file__))
|
||||||
|
|
||||||
|
opt_basename = os.path.basename(args.opt_binary)
|
||||||
|
if (opt_basename != "opt"):
|
||||||
|
print >>sys.stderr, 'ERROR: Unexpected opt name: ' + opt_basename
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
for test in args.tests:
|
||||||
|
if args.verbose:
|
||||||
|
print >>sys.stderr, 'Scanning for RUN lines in test file: %s' % (test,)
|
||||||
|
with open(test) as f:
|
||||||
|
input_lines = [l.rstrip() for l in f]
|
||||||
|
|
||||||
|
raw_lines = [m.group(1)
|
||||||
|
for m in [common.RUN_LINE_RE.match(l) for l in input_lines] if m]
|
||||||
|
run_lines = [raw_lines[0]] if len(raw_lines) > 0 else []
|
||||||
|
for l in raw_lines[1:]:
|
||||||
|
if run_lines[-1].endswith("\\"):
|
||||||
|
run_lines[-1] = run_lines[-1].rstrip("\\") + " " + l
|
||||||
|
else:
|
||||||
|
run_lines.append(l)
|
||||||
|
|
||||||
|
if args.verbose:
|
||||||
|
print >>sys.stderr, 'Found %d RUN lines:' % (len(run_lines),)
|
||||||
|
for l in run_lines:
|
||||||
|
print >>sys.stderr, ' RUN: ' + l
|
||||||
|
|
||||||
|
prefix_list = []
|
||||||
|
for l in run_lines:
|
||||||
|
(tool_cmd, filecheck_cmd) = tuple([cmd.strip() for cmd in l.split('|', 1)])
|
||||||
|
|
||||||
|
if not tool_cmd.startswith(opt_basename + ' '):
|
||||||
|
print >>sys.stderr, 'WARNING: Skipping non-%s RUN line: %s' % (opt_basename, l)
|
||||||
|
continue
|
||||||
|
|
||||||
|
if not filecheck_cmd.startswith('FileCheck '):
|
||||||
|
print >>sys.stderr, 'WARNING: Skipping non-FileChecked RUN line: ' + l
|
||||||
|
continue
|
||||||
|
|
||||||
|
tool_cmd_args = tool_cmd[len(opt_basename):].strip()
|
||||||
|
tool_cmd_args = tool_cmd_args.replace('< %s', '').replace('%s', '').strip()
|
||||||
|
|
||||||
|
check_prefixes = [item for m in common.CHECK_PREFIX_RE.finditer(filecheck_cmd)
|
||||||
|
for item in m.group(1).split(',')]
|
||||||
|
if not check_prefixes:
|
||||||
|
check_prefixes = ['CHECK']
|
||||||
|
|
||||||
|
# FIXME: We should use multiple check prefixes to common check lines. For
|
||||||
|
# now, we just ignore all but the last.
|
||||||
|
prefix_list.append((check_prefixes, tool_cmd_args))
|
||||||
|
|
||||||
|
func_dict = {}
|
||||||
|
for prefixes, _ in prefix_list:
|
||||||
|
for prefix in prefixes:
|
||||||
|
func_dict.update({prefix: dict()})
|
||||||
|
for prefixes, opt_args in prefix_list:
|
||||||
|
if args.verbose:
|
||||||
|
print >>sys.stderr, 'Extracted opt cmd: ' + opt_basename + ' ' + opt_args
|
||||||
|
print >>sys.stderr, 'Extracted FileCheck prefixes: ' + str(prefixes)
|
||||||
|
|
||||||
|
raw_tool_outputs = common.invoke_tool(args.opt_binary, opt_args, test)
|
||||||
|
|
||||||
|
# Split analysis outputs by "Printing analysis " declarations.
|
||||||
|
for raw_tool_output in re.split(r'Printing analysis ', raw_tool_outputs):
|
||||||
|
common.build_function_body_dictionary(
|
||||||
|
common.ANALYZE_FUNCTION_RE, common.scrub_body, [],
|
||||||
|
raw_tool_output, prefixes, func_dict, args.verbose)
|
||||||
|
|
||||||
|
is_in_function = False
|
||||||
|
is_in_function_start = False
|
||||||
|
prefix_set = set([prefix for prefixes, _ in prefix_list for prefix in prefixes])
|
||||||
|
if args.verbose:
|
||||||
|
print >>sys.stderr, 'Rewriting FileCheck prefixes: %s' % (prefix_set,)
|
||||||
|
output_lines = []
|
||||||
|
output_lines.append(autogenerated_note)
|
||||||
|
|
||||||
|
for input_line in input_lines:
|
||||||
|
if is_in_function_start:
|
||||||
|
if input_line == '':
|
||||||
|
continue
|
||||||
|
if input_line.lstrip().startswith(';'):
|
||||||
|
m = common.CHECK_RE.match(input_line)
|
||||||
|
if not m or m.group(1) not in prefix_set:
|
||||||
|
output_lines.append(input_line)
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Print out the various check lines here.
|
||||||
|
common.add_analyze_checks(output_lines, ';', prefix_list, func_dict, func_name)
|
||||||
|
is_in_function_start = False
|
||||||
|
|
||||||
|
if is_in_function:
|
||||||
|
if common.should_add_line_to_output(input_line, prefix_set):
|
||||||
|
# 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)
|
||||||
|
output_lines.append(input_line)
|
||||||
|
else:
|
||||||
|
continue
|
||||||
|
if input_line.strip() == '}':
|
||||||
|
is_in_function = False
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Discard any previous script advertising.
|
||||||
|
if input_line.startswith(ADVERT):
|
||||||
|
continue
|
||||||
|
|
||||||
|
# If it's outside a function, it just gets copied to the output.
|
||||||
|
output_lines.append(input_line)
|
||||||
|
|
||||||
|
m = IR_FUNCTION_RE.match(input_line)
|
||||||
|
if not m:
|
||||||
|
continue
|
||||||
|
func_name = m.group(1)
|
||||||
|
if args.function is not None and func_name != args.function:
|
||||||
|
# When filtering on a specific function, skip all others.
|
||||||
|
continue
|
||||||
|
is_in_function = is_in_function_start = True
|
||||||
|
|
||||||
|
if args.verbose:
|
||||||
|
print>>sys.stderr, 'Writing %d lines to %s...' % (len(output_lines), test)
|
||||||
|
|
||||||
|
with open(test, 'wb') as f:
|
||||||
|
f.writelines([l + '\n' for l in output_lines])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
Loading…
Reference in New Issue
Block a user