2019-11-26 19:40:52 +01:00
|
|
|
#!/usr/bin/env python3
|
2016-03-25 00:19:26 +01:00
|
|
|
|
2017-06-12 19:44:30 +02:00
|
|
|
"""A script to generate FileCheck statements for 'opt' regression tests.
|
2016-03-25 00:19:26 +01:00
|
|
|
|
2017-06-12 19:44:30 +02:00
|
|
|
This script is a utility to update LLVM opt test cases with new
|
2016-03-25 00:19:26 +01:00
|
|
|
FileCheck patterns. It can either update all of the tests in the file or
|
|
|
|
a single test function.
|
2016-04-05 20:00:47 +02:00
|
|
|
|
|
|
|
Example usage:
|
2017-06-12 19:44:30 +02:00
|
|
|
$ update_test_checks.py --opt=../bin/opt test/foo.ll
|
2016-04-05 20:00:47 +02:00
|
|
|
|
|
|
|
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 -instcombine -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!
|
2016-03-25 00:19:26 +01:00
|
|
|
"""
|
|
|
|
|
2019-01-03 15:11:33 +01:00
|
|
|
from __future__ import print_function
|
|
|
|
|
2016-03-25 00:19:26 +01:00
|
|
|
import argparse
|
2019-03-05 11:44:37 +01:00
|
|
|
import glob
|
2016-03-25 00:19:26 +01:00
|
|
|
import itertools
|
|
|
|
import os # Used to advertise this file's name ("autogenerated_note").
|
|
|
|
import string
|
|
|
|
import subprocess
|
|
|
|
import sys
|
|
|
|
import tempfile
|
|
|
|
import re
|
|
|
|
|
2018-01-30 01:40:05 +01:00
|
|
|
from UpdateTestChecks import common
|
|
|
|
|
2016-04-05 21:50:21 +02:00
|
|
|
ADVERT = '; NOTE: Assertions have been autogenerated by '
|
2016-03-25 00:19:26 +01:00
|
|
|
|
|
|
|
def main():
|
2016-04-05 20:00:47 +02:00
|
|
|
from argparse import RawTextHelpFormatter
|
|
|
|
parser = argparse.ArgumentParser(description=__doc__, formatter_class=RawTextHelpFormatter)
|
2017-06-12 19:44:30 +02:00
|
|
|
parser.add_argument('--opt-binary', default='opt',
|
|
|
|
help='The opt binary used to generate the test case')
|
2016-03-25 00:19:26 +01:00
|
|
|
parser.add_argument(
|
|
|
|
'--function', help='The function in the test file to update')
|
2019-10-07 16:37:20 +02:00
|
|
|
parser.add_argument('-p', '--preserve-names', action='store_true',
|
|
|
|
help='Do not scrub IR names')
|
[Utils] Allow update_test_checks to check function information
Summary:
This adds a switch to the update_test_checks that triggers arguments and
other function annotations, e.g., personality, to be present in the
check line. If not set, the behavior should be the same as before.
If arguments are recorded, their names are scrubbed from the IR to allow
merging.
This patch includes D68153.
Reviewers: lebedev.ri, greened, spatel, xbolva00, RKSimon, mehdi_amini
Subscribers: bollu, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D68819
2019-10-10 19:08:21 +02:00
|
|
|
parser.add_argument('--function-signature', action='store_true',
|
|
|
|
help='Keep function signature information around for the check line')
|
2019-10-11 03:32:04 +02:00
|
|
|
parser.add_argument('--scrub-attributes', action='store_true',
|
|
|
|
help='Remove attribute annotations (#0) from the end of check line')
|
2019-11-01 04:45:17 +01:00
|
|
|
parser.add_argument('--enable', action='store_true', dest='enabled', default=True,
|
|
|
|
help='Activate CHECK line generation from this point forward')
|
|
|
|
parser.add_argument('--disable', action='store_false', dest='enabled',
|
2020-02-11 23:43:52 +01:00
|
|
|
help='Deactivate CHECK line generation from this point forward')
|
2016-03-25 00:19:26 +01:00
|
|
|
parser.add_argument('tests', nargs='+')
|
2019-11-20 14:19:48 +01:00
|
|
|
args = common.parse_commandline_args(parser)
|
2016-03-25 00:19:26 +01:00
|
|
|
|
2019-08-07 16:44:50 +02:00
|
|
|
script_name = os.path.basename(__file__)
|
|
|
|
autogenerated_note = (ADVERT + 'utils/' + script_name)
|
2016-03-25 00:19:26 +01:00
|
|
|
|
2017-06-12 19:44:30 +02:00
|
|
|
opt_basename = os.path.basename(args.opt_binary)
|
2019-05-12 06:55:09 +02:00
|
|
|
if not re.match(r'^opt(-\d+)?$', opt_basename):
|
2019-08-07 16:44:50 +02:00
|
|
|
common.error('Unexpected opt name: ' + opt_basename)
|
2016-03-25 00:19:26 +01:00
|
|
|
sys.exit(1)
|
2019-05-12 06:55:09 +02:00
|
|
|
opt_basename = 'opt'
|
2016-03-25 00:19:26 +01:00
|
|
|
|
2019-07-11 22:14:22 +02:00
|
|
|
for test in args.tests:
|
|
|
|
if not glob.glob(test):
|
2019-09-27 12:04:16 +02:00
|
|
|
common.warn("Test file pattern '%s' was not found. Ignoring it." % (test,))
|
2019-07-11 22:14:22 +02:00
|
|
|
continue
|
|
|
|
|
2019-09-27 12:04:16 +02:00
|
|
|
# On Windows we must expand the patterns ourselves.
|
|
|
|
test_paths = [test for pattern in args.tests for test in glob.glob(pattern)]
|
2019-03-05 11:44:37 +01:00
|
|
|
for test in test_paths:
|
2019-11-01 04:45:17 +01:00
|
|
|
argv = sys.argv[:]
|
|
|
|
args = parser.parse_args()
|
2016-03-25 00:19:26 +01:00
|
|
|
with open(test) as f:
|
|
|
|
input_lines = [l.rstrip() for l in f]
|
|
|
|
|
2019-08-07 16:44:50 +02:00
|
|
|
first_line = input_lines[0] if input_lines else ""
|
|
|
|
if 'autogenerated' in first_line and script_name not in first_line:
|
|
|
|
common.warn("Skipping test which wasn't autogenerated by " + script_name, test)
|
|
|
|
continue
|
2019-11-01 04:45:17 +01:00
|
|
|
if first_line and 'autogenerated' in first_line:
|
|
|
|
args, argv = common.check_for_command(first_line, parser, args, argv)
|
|
|
|
test_autogenerated_note = autogenerated_note + common.get_autogennote_suffix(parser, args)
|
2019-08-07 16:44:50 +02:00
|
|
|
|
2019-08-05 20:25:08 +02:00
|
|
|
if args.update_only:
|
2019-08-07 16:44:50 +02:00
|
|
|
if not first_line or 'autogenerated' not in first_line:
|
|
|
|
common.warn("Skipping test which isn't autogenerated: " + test)
|
2019-08-06 11:42:00 +02:00
|
|
|
continue
|
2019-08-05 20:25:08 +02:00
|
|
|
|
2019-12-02 11:50:23 +01:00
|
|
|
run_lines = common.find_run_lines(test, input_lines)
|
2019-10-11 03:32:04 +02:00
|
|
|
|
|
|
|
# If requested we scrub trailing attribute annotations, e.g., '#0', together with whitespaces
|
|
|
|
if args.scrub_attributes:
|
|
|
|
common.SCRUB_TRAILING_WHITESPACE_TEST_RE = common.SCRUB_TRAILING_WHITESPACE_AND_ATTRIBUTES_RE
|
|
|
|
else:
|
|
|
|
common.SCRUB_TRAILING_WHITESPACE_TEST_RE = common.SCRUB_TRAILING_WHITESPACE_RE
|
|
|
|
|
2016-03-25 00:19:26 +01:00
|
|
|
prefix_list = []
|
|
|
|
for l in run_lines:
|
2019-08-05 20:25:08 +02:00
|
|
|
if '|' not in l:
|
2019-08-07 16:44:50 +02:00
|
|
|
common.warn('Skipping unparseable RUN line: ' + l)
|
2019-08-05 20:25:08 +02:00
|
|
|
continue
|
2019-08-06 11:42:00 +02:00
|
|
|
|
2016-03-25 00:19:26 +01:00
|
|
|
(tool_cmd, filecheck_cmd) = tuple([cmd.strip() for cmd in l.split('|', 1)])
|
[UpdateTestChecks] Emit warning when invalid value for -check-prefix(es) option
Summary:
The script is silent for the following issue:
FileCheck %s -check-prefix=CHECK,POPCOUNT
FileCheck will catch it later, but I think we can warn here too.
Now it warns:
./update_llc_test_checks.py file.ll
WARNING: Supplied prefix 'CHECK,POPCOUNT' is invalid. Prefix must contain only alphanumeric characters, hyphens and underscores. Did you mean --check-prefixes=CHECK,POPCOUNT?
Reviewers: lebedev.ri, spatel, RKSimon, craig.topper, nikic, gbedwell
Reviewed By: RKSimon
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D64589
llvm-svn: 367244
2019-07-29 19:41:00 +02:00
|
|
|
common.verify_filecheck_prefixes(filecheck_cmd)
|
2017-06-12 19:44:30 +02:00
|
|
|
if not tool_cmd.startswith(opt_basename + ' '):
|
2019-08-07 16:44:50 +02:00
|
|
|
common.warn('Skipping non-%s RUN line: %s' % (opt_basename, l))
|
2016-03-25 00:19:26 +01:00
|
|
|
continue
|
|
|
|
|
|
|
|
if not filecheck_cmd.startswith('FileCheck '):
|
2019-08-07 16:44:50 +02:00
|
|
|
common.warn('Skipping non-FileChecked RUN line: ' + l)
|
2016-03-25 00:19:26 +01:00
|
|
|
continue
|
|
|
|
|
2017-06-12 19:44:30 +02:00
|
|
|
tool_cmd_args = tool_cmd[len(opt_basename):].strip()
|
2016-03-25 00:19:26 +01:00
|
|
|
tool_cmd_args = tool_cmd_args.replace('< %s', '').replace('%s', '').strip()
|
|
|
|
|
2018-01-30 01:40:05 +01:00
|
|
|
check_prefixes = [item for m in common.CHECK_PREFIX_RE.finditer(filecheck_cmd)
|
2017-01-14 10:39:35 +01:00
|
|
|
for item in m.group(1).split(',')]
|
2016-03-25 00:19:26 +01:00
|
|
|
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()})
|
2017-06-12 19:44:30 +02:00
|
|
|
for prefixes, opt_args in prefix_list:
|
2019-12-02 11:50:23 +01:00
|
|
|
common.debug('Extracted opt cmd: ' + opt_basename + ' ' + opt_args)
|
|
|
|
common.debug('Extracted FileCheck prefixes: ' + str(prefixes))
|
2016-03-25 00:19:26 +01:00
|
|
|
|
2018-01-30 01:40:05 +01:00
|
|
|
raw_tool_output = common.invoke_tool(args.opt_binary, opt_args, test)
|
|
|
|
common.build_function_body_dictionary(
|
2018-02-10 06:01:33 +01:00
|
|
|
common.OPT_FUNCTION_RE, common.scrub_body, [],
|
[Utils] Allow update_test_checks to check function information
Summary:
This adds a switch to the update_test_checks that triggers arguments and
other function annotations, e.g., personality, to be present in the
check line. If not set, the behavior should be the same as before.
If arguments are recorded, their names are scrubbed from the IR to allow
merging.
This patch includes D68153.
Reviewers: lebedev.ri, greened, spatel, xbolva00, RKSimon, mehdi_amini
Subscribers: bollu, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D68819
2019-10-10 19:08:21 +02:00
|
|
|
raw_tool_output, prefixes, func_dict, args.verbose,
|
|
|
|
args.function_signature)
|
2016-03-25 00:19:26 +01:00
|
|
|
|
|
|
|
is_in_function = False
|
|
|
|
is_in_function_start = False
|
|
|
|
prefix_set = set([prefix for prefixes, _ in prefix_list for prefix in prefixes])
|
2019-12-02 11:50:23 +01:00
|
|
|
common.debug('Rewriting FileCheck prefixes:', str(prefix_set))
|
2016-03-25 00:19:26 +01:00
|
|
|
output_lines = []
|
2019-11-01 04:45:17 +01:00
|
|
|
output_lines.append(test_autogenerated_note)
|
2016-03-25 00:19:26 +01:00
|
|
|
|
|
|
|
for input_line in input_lines:
|
2019-11-01 04:45:17 +01:00
|
|
|
# Discard any previous script advertising.
|
|
|
|
if input_line.startswith(ADVERT):
|
|
|
|
continue
|
|
|
|
|
|
|
|
args, argv = common.check_for_command(input_line, parser, args, argv)
|
|
|
|
if not args.enabled:
|
|
|
|
output_lines.append(input_line)
|
|
|
|
continue
|
2016-03-25 00:19:26 +01:00
|
|
|
if is_in_function_start:
|
|
|
|
if input_line == '':
|
|
|
|
continue
|
|
|
|
if input_line.lstrip().startswith(';'):
|
2018-01-30 01:40:05 +01:00
|
|
|
m = common.CHECK_RE.match(input_line)
|
2016-03-25 00:19:26 +01:00
|
|
|
if not m or m.group(1) not in prefix_set:
|
|
|
|
output_lines.append(input_line)
|
|
|
|
continue
|
|
|
|
|
|
|
|
# Print out the various check lines here.
|
2019-10-07 16:37:20 +02:00
|
|
|
common.add_ir_checks(output_lines, ';', prefix_list, func_dict,
|
2019-11-01 17:17:27 +01:00
|
|
|
func_name, args.preserve_names, args.function_signature)
|
2016-03-25 00:19:26 +01:00
|
|
|
is_in_function_start = False
|
|
|
|
|
|
|
|
if is_in_function:
|
2018-01-30 01:40:05 +01:00
|
|
|
if common.should_add_line_to_output(input_line, prefix_set):
|
2016-03-25 00:19:26 +01:00
|
|
|
# This input line of the function body will go as-is into the output.
|
2016-03-27 22:43:02 +02:00
|
|
|
# Except make leading whitespace uniform: 2 spaces.
|
2018-01-30 01:40:05 +01:00
|
|
|
input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(r' ', input_line)
|
2016-03-25 00:19:26 +01:00
|
|
|
output_lines.append(input_line)
|
|
|
|
else:
|
|
|
|
continue
|
|
|
|
if input_line.strip() == '}':
|
|
|
|
is_in_function = False
|
|
|
|
continue
|
|
|
|
|
|
|
|
# If it's outside a function, it just gets copied to the output.
|
|
|
|
output_lines.append(input_line)
|
|
|
|
|
2020-03-24 11:59:08 +01:00
|
|
|
m = common.IR_FUNCTION_RE.match(input_line)
|
2016-03-25 00:19:26 +01:00
|
|
|
if not m:
|
|
|
|
continue
|
2018-01-30 01:40:05 +01:00
|
|
|
func_name = m.group(1)
|
|
|
|
if args.function is not None and func_name != args.function:
|
2016-03-25 00:19:26 +01:00
|
|
|
# When filtering on a specific function, skip all others.
|
|
|
|
continue
|
|
|
|
is_in_function = is_in_function_start = True
|
|
|
|
|
2019-12-02 11:50:23 +01:00
|
|
|
common.debug('Writing %d lines to %s...' % (len(output_lines), test))
|
2016-03-25 00:19:26 +01:00
|
|
|
|
|
|
|
with open(test, 'wb') as f:
|
2019-01-30 17:15:59 +01:00
|
|
|
f.writelines(['{}\n'.format(l).encode('utf-8') for l in output_lines])
|
2016-03-25 00:19:26 +01:00
|
|
|
|
|
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
|
main()
|