2018-02-02 17:41:07 +01:00
|
|
|
from __future__ import print_function
|
2018-01-30 01:40:05 +01:00
|
|
|
import re
|
2018-02-10 06:01:33 +01:00
|
|
|
import string
|
2018-01-30 01:40:05 +01:00
|
|
|
import subprocess
|
2018-02-02 17:41:07 +01:00
|
|
|
import sys
|
2018-06-01 15:37:01 +02:00
|
|
|
import copy
|
2018-01-30 01:40:05 +01:00
|
|
|
|
2018-02-10 06:01:33 +01:00
|
|
|
if sys.version_info[0] > 2:
|
|
|
|
|
class string:
|
|
|
|
|
expandtabs = str.expandtabs
|
|
|
|
|
else:
|
|
|
|
|
import string
|
2018-01-30 01:40:05 +01:00
|
|
|
|
2018-02-10 06:01:33 +01:00
|
|
|
##### Common utilities for update_*test_checks.py
|
2018-01-30 01:40:05 +01:00
|
|
|
|
2019-11-20 14:19:48 +01:00
|
|
|
|
2019-12-02 11:50:23 +01:00
|
|
|
_verbose = False
|
|
|
|
|
|
2019-11-20 14:19:48 +01:00
|
|
|
def parse_commandline_args(parser):
|
|
|
|
|
parser.add_argument('-v', '--verbose', action='store_true',
|
|
|
|
|
help='Show verbose output')
|
|
|
|
|
parser.add_argument('-u', '--update-only', action='store_true',
|
|
|
|
|
help='Only update test if it was already autogened')
|
2019-12-02 11:50:23 +01:00
|
|
|
args = parser.parse_args()
|
|
|
|
|
global _verbose
|
|
|
|
|
_verbose = args.verbose
|
|
|
|
|
return args
|
2019-11-20 14:19:48 +01:00
|
|
|
|
2018-01-30 01:40:05 +01:00
|
|
|
def should_add_line_to_output(input_line, prefix_set):
|
|
|
|
|
# Skip any blank comment lines in the IR.
|
|
|
|
|
if input_line.strip() == ';':
|
|
|
|
|
return False
|
|
|
|
|
# Skip any blank lines in the IR.
|
|
|
|
|
#if input_line.strip() == '':
|
|
|
|
|
# return False
|
|
|
|
|
# And skip any CHECK lines. We're building our own.
|
|
|
|
|
m = CHECK_RE.match(input_line)
|
|
|
|
|
if m and m.group(1) in prefix_set:
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
# Invoke the tool that is being tested.
|
|
|
|
|
def invoke_tool(exe, cmd_args, ir):
|
|
|
|
|
with open(ir) as ir_file:
|
[utils] Add utils/update_cc_test_checks.py
A utility to update LLVM IR in C/C++ FileCheck test files.
Example RUN lines in .c/.cc test files:
// RUN: %clang -S -Os -DXX %s -o - | FileCheck %s
// RUN: %clangxx -S -Os %s -o - | FileCheck -check-prefix=IR %s
Usage:
% utils/update_cc_test_checks.py --llvm-bin=release/bin test/a.cc
% utils/update_cc_test_checks.py --c-index-test=release/bin/c-index-test --clang=release/bin/clang /tmp/c/a.cc
// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py
// RUN: %clang -emit-llvm -S -Os -DXX %s -o - | FileCheck -check-prefix=AA %s
// RUN: %clangxx -emit-llvm -S -Os %s -o - | FileCheck -check-prefix=BB %s
using T =
#ifdef XX
int __attribute__((vector_size(16)))
#else
short __attribute__((vector_size(16)))
#endif
;
// AA-LABEL: _Z3fooDv4_i:
// AA: entry:
// AA-NEXT: %add = shl <4 x i32> %a, <i32 1, i32 1, i32 1, i32 1>
// AA-NEXT: ret <4 x i32> %add
//
// BB-LABEL: _Z3fooDv8_s:
// BB: entry:
// BB-NEXT: %add = shl <8 x i16> %a, <i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1>
// BB-NEXT: ret <8 x i16> %add
T foo(T a) {
return a + a;
}
Differential Revision: https://reviews.llvm.org/D42712
llvm-svn: 326591
2018-03-02 18:37:04 +01:00
|
|
|
# TODO Remove the str form which is used by update_test_checks.py and
|
|
|
|
|
# update_llc_test_checks.py
|
|
|
|
|
# The safer list form is used by update_cc_test_checks.py
|
|
|
|
|
if isinstance(cmd_args, list):
|
|
|
|
|
stdout = subprocess.check_output([exe] + cmd_args, stdin=ir_file)
|
|
|
|
|
else:
|
|
|
|
|
stdout = subprocess.check_output(exe + ' ' + cmd_args,
|
|
|
|
|
shell=True, stdin=ir_file)
|
2018-02-02 17:41:07 +01:00
|
|
|
if sys.version_info[0] > 2:
|
|
|
|
|
stdout = stdout.decode()
|
2018-01-30 01:40:05 +01:00
|
|
|
# Fix line endings to unix CR style.
|
2018-02-02 17:41:07 +01:00
|
|
|
return stdout.replace('\r\n', '\n')
|
2018-01-30 01:40:05 +01:00
|
|
|
|
2018-02-10 06:01:33 +01:00
|
|
|
##### LLVM IR parser
|
|
|
|
|
|
2019-12-02 11:50:23 +01:00
|
|
|
RUN_LINE_RE = re.compile(r'^\s*(?://|[;#])\s*RUN:\s*(.*)$')
|
2019-10-30 10:35:10 +01:00
|
|
|
CHECK_PREFIX_RE = re.compile(r'--?check-prefix(?:es)?[= ](\S+)')
|
[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
|
|
|
PREFIX_RE = re.compile('^[a-zA-Z0-9_-]+$')
|
2019-12-21 23:18:38 +01:00
|
|
|
CHECK_RE = re.compile(r'^\s*(?://|[;#])\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL|-SAME|-EMPTY)?:')
|
2018-02-10 06:01:33 +01:00
|
|
|
|
2019-11-01 04:45:17 +01:00
|
|
|
UTC_ARGS_KEY = 'UTC_ARGS:'
|
|
|
|
|
UTC_ARGS_CMD = re.compile(r'.*' + UTC_ARGS_KEY + '\s*(?P<cmd>.*)\s*$')
|
|
|
|
|
|
2018-02-10 06:01:33 +01:00
|
|
|
OPT_FUNCTION_RE = re.compile(
|
[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
|
|
|
r'^\s*define\s+(?:internal\s+)?[^@]*@(?P<func>[\w-]+?)\s*'
|
|
|
|
|
r'(?P<args_and_sig>\((\)|(.*?[\w\.\-]+?)\))[^{]*)\{\n(?P<body>.*?)^\}$',
|
2018-02-10 06:01:33 +01:00
|
|
|
flags=(re.M | re.S))
|
|
|
|
|
|
2018-04-06 14:36:27 +02:00
|
|
|
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))
|
|
|
|
|
|
2019-10-30 10:35:10 +01:00
|
|
|
IR_FUNCTION_RE = re.compile(r'^\s*define\s+(?:internal\s+)?[^@]*@(\w+)\s*\(')
|
2018-02-28 01:56:24 +01:00
|
|
|
TRIPLE_IR_RE = re.compile(r'^\s*target\s+triple\s*=\s*"([^"]+)"$')
|
|
|
|
|
TRIPLE_ARG_RE = re.compile(r'-mtriple[= ]([^ ]+)')
|
|
|
|
|
MARCH_ARG_RE = re.compile(r'-march[= ]([^ ]+)')
|
2018-02-10 06:01:33 +01:00
|
|
|
|
|
|
|
|
SCRUB_LEADING_WHITESPACE_RE = re.compile(r'^(\s+)')
|
|
|
|
|
SCRUB_WHITESPACE_RE = re.compile(r'(?!^(| \w))[ \t]+', flags=re.M)
|
|
|
|
|
SCRUB_TRAILING_WHITESPACE_RE = re.compile(r'[ \t]+$', flags=re.M)
|
2019-10-11 03:32:04 +02:00
|
|
|
SCRUB_TRAILING_WHITESPACE_TEST_RE = SCRUB_TRAILING_WHITESPACE_RE
|
|
|
|
|
SCRUB_TRAILING_WHITESPACE_AND_ATTRIBUTES_RE = re.compile(r'([ \t]|(#[0-9]+))+$', flags=re.M)
|
2018-02-10 06:01:33 +01:00
|
|
|
SCRUB_KILL_COMMENT_RE = re.compile(r'^ *#+ +kill:.*\n')
|
|
|
|
|
SCRUB_LOOP_COMMENT_RE = re.compile(
|
|
|
|
|
r'# =>This Inner Loop Header:.*|# in Loop:.*', flags=re.M)
|
|
|
|
|
|
2019-08-07 16:44:50 +02:00
|
|
|
|
|
|
|
|
def error(msg, test_file=None):
|
|
|
|
|
if test_file:
|
|
|
|
|
msg = '{}: {}'.format(msg, test_file)
|
|
|
|
|
print('ERROR: {}'.format(msg), file=sys.stderr)
|
|
|
|
|
|
|
|
|
|
def warn(msg, test_file=None):
|
|
|
|
|
if test_file:
|
|
|
|
|
msg = '{}: {}'.format(msg, test_file)
|
|
|
|
|
print('WARNING: {}'.format(msg), file=sys.stderr)
|
|
|
|
|
|
2019-12-02 11:50:23 +01:00
|
|
|
def debug(*args, **kwargs):
|
|
|
|
|
# Python2 does not allow def debug(*args, file=sys.stderr, **kwargs):
|
|
|
|
|
if 'file' not in kwargs:
|
|
|
|
|
kwargs['file'] = sys.stderr
|
|
|
|
|
if _verbose:
|
|
|
|
|
print(*args, **kwargs)
|
|
|
|
|
|
|
|
|
|
def find_run_lines(test, lines):
|
|
|
|
|
debug('Scanning for RUN lines in test file:', test)
|
|
|
|
|
raw_lines = [m.group(1)
|
|
|
|
|
for m in [RUN_LINE_RE.match(l) for l in 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('\\'):
|
2019-12-03 09:23:25 +01:00
|
|
|
run_lines[-1] = run_lines[-1].rstrip('\\') + ' ' + l
|
2019-12-02 11:50:23 +01:00
|
|
|
else:
|
|
|
|
|
run_lines.append(l)
|
|
|
|
|
debug('Found {} RUN lines in {}:'.format(len(run_lines), test))
|
|
|
|
|
for l in run_lines:
|
|
|
|
|
debug(' RUN: {}'.format(l))
|
|
|
|
|
return run_lines
|
|
|
|
|
|
2018-02-10 06:01:33 +01:00
|
|
|
def scrub_body(body):
|
|
|
|
|
# Scrub runs of whitespace out of the assembly, but leave the leading
|
|
|
|
|
# whitespace in place.
|
|
|
|
|
body = SCRUB_WHITESPACE_RE.sub(r' ', body)
|
|
|
|
|
# Expand the tabs used for indentation.
|
|
|
|
|
body = string.expandtabs(body, 2)
|
|
|
|
|
# Strip trailing whitespace.
|
2019-10-11 03:32:04 +02:00
|
|
|
body = SCRUB_TRAILING_WHITESPACE_TEST_RE.sub(r'', body)
|
2018-02-10 06:01:33 +01:00
|
|
|
return body
|
|
|
|
|
|
2018-06-01 15:37:01 +02:00
|
|
|
def do_scrub(body, scrubber, scrubber_args, extra):
|
|
|
|
|
if scrubber_args:
|
|
|
|
|
local_args = copy.deepcopy(scrubber_args)
|
|
|
|
|
local_args[0].extra_scrub = extra
|
|
|
|
|
return scrubber(body, *local_args)
|
|
|
|
|
return scrubber(body, *scrubber_args)
|
|
|
|
|
|
2018-01-30 01:40:05 +01:00
|
|
|
# Build up a dictionary of all the function bodies.
|
2018-06-01 15:37:01 +02:00
|
|
|
class function_body(object):
|
[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
|
|
|
def __init__(self, string, extra, args_and_sig):
|
2018-06-01 15:37:01 +02:00
|
|
|
self.scrub = string
|
|
|
|
|
self.extrascrub = extra
|
[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
|
|
|
self.args_and_sig = args_and_sig
|
|
|
|
|
def is_same_except_arg_names(self, extrascrub, args_and_sig):
|
|
|
|
|
arg_names = set()
|
|
|
|
|
def drop_arg_names(match):
|
|
|
|
|
arg_names.add(match.group(2))
|
|
|
|
|
return match.group(1) + match.group(3)
|
|
|
|
|
def repl_arg_names(match):
|
|
|
|
|
if match.group(2) in arg_names:
|
|
|
|
|
return match.group(1) + match.group(3)
|
|
|
|
|
return match.group(1) + match.group(2) + match.group(3)
|
|
|
|
|
ans0 = IR_VALUE_RE.sub(drop_arg_names, self.args_and_sig)
|
|
|
|
|
ans1 = IR_VALUE_RE.sub(drop_arg_names, args_and_sig)
|
|
|
|
|
if ans0 != ans1:
|
|
|
|
|
return False
|
|
|
|
|
es0 = IR_VALUE_RE.sub(repl_arg_names, self.extrascrub)
|
|
|
|
|
es1 = IR_VALUE_RE.sub(repl_arg_names, extrascrub)
|
|
|
|
|
es0 = SCRUB_IR_COMMENT_RE.sub(r'', es0)
|
|
|
|
|
es1 = SCRUB_IR_COMMENT_RE.sub(r'', es1)
|
|
|
|
|
return es0 == es1
|
|
|
|
|
|
2018-06-01 15:37:01 +02:00
|
|
|
def __str__(self):
|
|
|
|
|
return self.scrub
|
|
|
|
|
|
[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
|
|
|
def build_function_body_dictionary(function_re, scrubber, scrubber_args, raw_tool_output, prefixes, func_dict, verbose, record_args):
|
2018-01-30 01:40:05 +01:00
|
|
|
for m in function_re.finditer(raw_tool_output):
|
|
|
|
|
if not m:
|
|
|
|
|
continue
|
|
|
|
|
func = m.group('func')
|
2018-06-01 15:37:01 +02:00
|
|
|
body = m.group('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
|
|
|
# Determine if we print arguments, the opening brace, or nothing after the function name
|
|
|
|
|
if record_args and 'args_and_sig' in m.groupdict():
|
|
|
|
|
args_and_sig = scrub_body(m.group('args_and_sig').strip())
|
|
|
|
|
elif 'args_and_sig' in m.groupdict():
|
|
|
|
|
args_and_sig = '('
|
|
|
|
|
else:
|
|
|
|
|
args_and_sig = ''
|
2018-06-01 15:37:01 +02:00
|
|
|
scrubbed_body = do_scrub(body, scrubber, scrubber_args, extra = False)
|
|
|
|
|
scrubbed_extra = do_scrub(body, scrubber, scrubber_args, extra = True)
|
2018-12-07 10:49:21 +01:00
|
|
|
if 'analysis' in m.groupdict():
|
2018-04-06 14:36:27 +02:00
|
|
|
analysis = m.group('analysis')
|
|
|
|
|
if analysis.lower() != 'cost model analysis':
|
2019-08-07 16:44:50 +02:00
|
|
|
warn('Unsupported analysis mode: %r!' % (analysis,))
|
2018-01-30 01:40:05 +01:00
|
|
|
if func.startswith('stress'):
|
|
|
|
|
# We only use the last line of the function body for stress tests.
|
|
|
|
|
scrubbed_body = '\n'.join(scrubbed_body.splitlines()[-1:])
|
|
|
|
|
if verbose:
|
2018-02-02 17:41:07 +01:00
|
|
|
print('Processing function: ' + func, file=sys.stderr)
|
2018-01-30 01:40:05 +01:00
|
|
|
for l in scrubbed_body.splitlines():
|
2018-02-02 17:41:07 +01:00
|
|
|
print(' ' + l, file=sys.stderr)
|
2018-01-30 01:40:05 +01:00
|
|
|
for prefix in prefixes:
|
[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
|
|
|
if func in func_dict[prefix] and (str(func_dict[prefix][func]) != scrubbed_body or (func_dict[prefix][func] and func_dict[prefix][func].args_and_sig != args_and_sig)):
|
|
|
|
|
if func_dict[prefix][func] and func_dict[prefix][func].is_same_except_arg_names(scrubbed_extra, args_and_sig):
|
2018-06-01 15:37:01 +02:00
|
|
|
func_dict[prefix][func].scrub = scrubbed_extra
|
[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
|
|
|
func_dict[prefix][func].args_and_sig = args_and_sig
|
2018-01-30 01:40:05 +01:00
|
|
|
continue
|
2018-06-01 15:37:01 +02:00
|
|
|
else:
|
|
|
|
|
if prefix == prefixes[-1]:
|
2019-08-07 16:44:50 +02:00
|
|
|
warn('Found conflicting asm under the same prefix: %r!' % (prefix,))
|
2018-06-01 15:37:01 +02:00
|
|
|
else:
|
|
|
|
|
func_dict[prefix][func] = None
|
|
|
|
|
continue
|
2018-01-30 01:40:05 +01:00
|
|
|
|
[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
|
|
|
func_dict[prefix][func] = function_body(scrubbed_body, scrubbed_extra, args_and_sig)
|
2018-02-10 06:01:33 +01:00
|
|
|
|
|
|
|
|
##### Generator of LLVM IR CHECK lines
|
|
|
|
|
|
|
|
|
|
SCRUB_IR_COMMENT_RE = re.compile(r'\s*;.*')
|
|
|
|
|
|
|
|
|
|
# Match things that look at identifiers, but only if they are followed by
|
|
|
|
|
# spaces, commas, paren, or end of the string
|
2018-03-14 21:28:53 +01:00
|
|
|
IR_VALUE_RE = re.compile(r'(\s+)%([\w\.\-]+?)([,\s\(\)]|\Z)')
|
2018-02-10 06:01:33 +01:00
|
|
|
|
|
|
|
|
# Create a FileCheck variable name based on an IR name.
|
|
|
|
|
def get_value_name(var):
|
|
|
|
|
if var.isdigit():
|
|
|
|
|
var = 'TMP' + var
|
|
|
|
|
var = var.replace('.', '_')
|
2018-03-14 21:28:53 +01:00
|
|
|
var = var.replace('-', '_')
|
2018-02-10 06:01:33 +01:00
|
|
|
return var.upper()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Create a FileCheck variable from regex.
|
|
|
|
|
def get_value_definition(var):
|
|
|
|
|
return '[[' + get_value_name(var) + ':%.*]]'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Use a FileCheck variable.
|
|
|
|
|
def get_value_use(var):
|
|
|
|
|
return '[[' + get_value_name(var) + ']]'
|
|
|
|
|
|
|
|
|
|
# Replace IR value defs and uses with FileCheck variables.
|
2019-11-01 18:51:26 +01:00
|
|
|
def genericize_check_lines(lines, is_analyze, vars_seen):
|
2018-02-10 06:01:33 +01:00
|
|
|
# This gets called for each match that occurs in
|
|
|
|
|
# a line. We transform variables we haven't seen
|
|
|
|
|
# into defs, and variables we have seen into uses.
|
|
|
|
|
def transform_line_vars(match):
|
|
|
|
|
var = match.group(2)
|
|
|
|
|
if var in vars_seen:
|
|
|
|
|
rv = get_value_use(var)
|
|
|
|
|
else:
|
|
|
|
|
vars_seen.add(var)
|
|
|
|
|
rv = get_value_definition(var)
|
|
|
|
|
# re.sub replaces the entire regex match
|
|
|
|
|
# with whatever you return, so we have
|
|
|
|
|
# to make sure to hand it back everything
|
|
|
|
|
# including the commas and spaces.
|
|
|
|
|
return match.group(1) + rv + match.group(3)
|
|
|
|
|
|
|
|
|
|
lines_with_def = []
|
|
|
|
|
|
|
|
|
|
for i, line in enumerate(lines):
|
|
|
|
|
# An IR variable named '%.' matches the FileCheck regex string.
|
|
|
|
|
line = line.replace('%.', '%dot')
|
|
|
|
|
# Ignore any comments, since the check lines will too.
|
|
|
|
|
scrubbed_line = SCRUB_IR_COMMENT_RE.sub(r'', line)
|
2019-07-22 06:59:01 +02:00
|
|
|
if is_analyze:
|
|
|
|
|
lines[i] = scrubbed_line
|
2018-04-06 14:36:27 +02:00
|
|
|
else:
|
2019-07-22 06:59:01 +02:00
|
|
|
lines[i] = IR_VALUE_RE.sub(transform_line_vars, scrubbed_line)
|
2018-02-10 06:01:33 +01:00
|
|
|
return lines
|
|
|
|
|
|
|
|
|
|
|
2018-04-06 14:36:27 +02:00
|
|
|
def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, is_asm, is_analyze):
|
2019-10-11 03:23:17 +02:00
|
|
|
# prefix_blacklist are prefixes we cannot use to print the function because it doesn't exist in run lines that use these prefixes as well.
|
|
|
|
|
prefix_blacklist = set()
|
2018-02-10 06:01:33 +01:00
|
|
|
printed_prefixes = []
|
2018-03-14 18:47:07 +01:00
|
|
|
for p in prefix_list:
|
|
|
|
|
checkprefixes = p[0]
|
2019-10-11 03:23:17 +02:00
|
|
|
# If not all checkprefixes of this run line produced the function we cannot check for it as it does not
|
|
|
|
|
# exist for this run line. A subset of the check prefixes might know about the function but only because
|
|
|
|
|
# other run lines created it.
|
|
|
|
|
if any(map(lambda checkprefix: func_name not in func_dict[checkprefix], checkprefixes)):
|
|
|
|
|
prefix_blacklist |= set(checkprefixes)
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
# prefix_blacklist is constructed, we can now emit the output
|
|
|
|
|
for p in prefix_list:
|
|
|
|
|
checkprefixes = p[0]
|
|
|
|
|
saved_output = None
|
2018-02-10 06:01:33 +01:00
|
|
|
for checkprefix in checkprefixes:
|
|
|
|
|
if checkprefix in printed_prefixes:
|
|
|
|
|
break
|
2019-10-11 03:23:17 +02:00
|
|
|
|
|
|
|
|
# prefix is blacklisted. We remember the output as we might need it later but we will not emit anything for the prefix.
|
|
|
|
|
if checkprefix in prefix_blacklist:
|
|
|
|
|
if not saved_output and func_name in func_dict[checkprefix]:
|
|
|
|
|
saved_output = func_dict[checkprefix][func_name]
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
# If we do not have output for this prefix but there is one saved, we go ahead with this prefix and the saved output.
|
|
|
|
|
if not func_dict[checkprefix][func_name]:
|
|
|
|
|
if not saved_output:
|
|
|
|
|
continue
|
|
|
|
|
func_dict[checkprefix][func_name] = saved_output
|
2018-04-05 12:26:13 +02:00
|
|
|
|
2018-02-10 06:01:33 +01:00
|
|
|
# Add some space between different check prefixes, but not after the last
|
|
|
|
|
# check line (before the test code).
|
2019-07-22 06:59:01 +02:00
|
|
|
if is_asm:
|
2018-04-05 12:48:38 +02:00
|
|
|
if len(printed_prefixes) != 0:
|
|
|
|
|
output_lines.append(comment_marker)
|
2018-04-05 12:26:13 +02:00
|
|
|
|
2019-11-01 18:51:26 +01:00
|
|
|
vars_seen = set()
|
2018-02-10 06:01:33 +01:00
|
|
|
printed_prefixes.append(checkprefix)
|
[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
|
|
|
args_and_sig = str(func_dict[checkprefix][func_name].args_and_sig)
|
2019-11-01 18:51:26 +01:00
|
|
|
args_and_sig = genericize_check_lines([args_and_sig], is_analyze, vars_seen)[0]
|
[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
|
|
|
if '[[' in args_and_sig:
|
|
|
|
|
output_lines.append(check_label_format % (checkprefix, func_name, ''))
|
|
|
|
|
output_lines.append('%s %s-SAME: %s' % (comment_marker, checkprefix, args_and_sig))
|
|
|
|
|
else:
|
|
|
|
|
output_lines.append(check_label_format % (checkprefix, func_name, args_and_sig))
|
2018-06-01 15:37:01 +02:00
|
|
|
func_body = str(func_dict[checkprefix][func_name]).splitlines()
|
2018-02-10 06:01:33 +01:00
|
|
|
|
2018-04-05 12:48:38 +02:00
|
|
|
# For ASM output, just emit the check lines.
|
2019-07-22 06:59:01 +02:00
|
|
|
if is_asm:
|
2018-04-05 12:48:38 +02:00
|
|
|
output_lines.append('%s %s: %s' % (comment_marker, checkprefix, func_body[0]))
|
|
|
|
|
for func_line in func_body[1:]:
|
2019-10-30 17:52:16 +01:00
|
|
|
if func_line.strip() == '':
|
|
|
|
|
output_lines.append('%s %s-EMPTY:' % (comment_marker, checkprefix))
|
|
|
|
|
else:
|
|
|
|
|
output_lines.append('%s %s-NEXT: %s' % (comment_marker, checkprefix, func_line))
|
2018-04-05 12:48:38 +02:00
|
|
|
break
|
|
|
|
|
|
2018-02-10 06:01:33 +01:00
|
|
|
# For IR output, change all defs to FileCheck variables, so we're immune
|
|
|
|
|
# to variable naming fashions.
|
2019-11-01 18:51:26 +01:00
|
|
|
func_body = genericize_check_lines(func_body, is_analyze, vars_seen)
|
2018-02-10 06:01:33 +01:00
|
|
|
|
|
|
|
|
# This could be selectively enabled with an optional invocation argument.
|
|
|
|
|
# Disabled for now: better to check everything. Be safe rather than sorry.
|
|
|
|
|
|
|
|
|
|
# Handle the first line of the function body as a special case because
|
|
|
|
|
# it's often just noise (a useless asm comment or entry label).
|
|
|
|
|
#if func_body[0].startswith("#") or func_body[0].startswith("entry:"):
|
|
|
|
|
# is_blank_line = True
|
|
|
|
|
#else:
|
2018-04-05 12:26:13 +02:00
|
|
|
# output_lines.append('%s %s: %s' % (comment_marker, checkprefix, func_body[0]))
|
2018-02-10 06:01:33 +01:00
|
|
|
# is_blank_line = False
|
|
|
|
|
|
|
|
|
|
is_blank_line = False
|
|
|
|
|
|
|
|
|
|
for func_line in func_body:
|
|
|
|
|
if func_line.strip() == '':
|
|
|
|
|
is_blank_line = True
|
|
|
|
|
continue
|
|
|
|
|
# Do not waste time checking IR comments.
|
|
|
|
|
func_line = SCRUB_IR_COMMENT_RE.sub(r'', func_line)
|
|
|
|
|
|
|
|
|
|
# Skip blank lines instead of checking them.
|
2019-07-22 06:59:01 +02:00
|
|
|
if is_blank_line:
|
2018-03-14 18:47:07 +01:00
|
|
|
output_lines.append('{} {}: {}'.format(
|
|
|
|
|
comment_marker, checkprefix, func_line))
|
2018-02-10 06:01:33 +01:00
|
|
|
else:
|
2018-03-14 18:47:07 +01:00
|
|
|
output_lines.append('{} {}-NEXT: {}'.format(
|
|
|
|
|
comment_marker, checkprefix, func_line))
|
2018-02-10 06:01:33 +01:00
|
|
|
is_blank_line = False
|
|
|
|
|
|
|
|
|
|
# Add space between different check prefixes and also before the first
|
|
|
|
|
# line of code in the test function.
|
2018-03-14 18:47:07 +01:00
|
|
|
output_lines.append(comment_marker)
|
2018-02-10 06:01:33 +01:00
|
|
|
break
|
2018-04-05 12:26:13 +02:00
|
|
|
|
2019-10-07 16:37:20 +02:00
|
|
|
def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict,
|
2019-11-01 17:17:27 +01:00
|
|
|
func_name, preserve_names, function_sig):
|
2018-04-05 12:26:13 +02:00
|
|
|
# Label format is based on IR string.
|
2019-11-01 17:17:27 +01:00
|
|
|
function_def_regex = 'define {{[^@]+}}' if function_sig else ''
|
[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
|
|
|
check_label_format = '{} %s-LABEL: {}@%s%s'.format(comment_marker, function_def_regex)
|
2019-10-07 16:37:20 +02:00
|
|
|
add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name,
|
|
|
|
|
check_label_format, False, preserve_names)
|
2018-04-06 14:36:27 +02:00
|
|
|
|
|
|
|
|
def add_analyze_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
|
[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
|
|
|
check_label_format = '{} %s-LABEL: \'%s%s\''.format(comment_marker)
|
2018-04-06 14:36:27 +02:00
|
|
|
add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, True)
|
[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
|
|
|
|
|
|
|
|
|
|
|
|
|
def check_prefix(prefix):
|
|
|
|
|
if not PREFIX_RE.match(prefix):
|
|
|
|
|
hint = ""
|
|
|
|
|
if ',' in prefix:
|
|
|
|
|
hint = " Did you mean '--check-prefixes=" + prefix + "'?"
|
2019-08-07 16:44:50 +02:00
|
|
|
warn(("Supplied prefix '%s' is invalid. Prefix must contain only alphanumeric characters, hyphens and underscores." + hint) %
|
|
|
|
|
(prefix))
|
[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
|
|
|
|
|
|
|
|
|
|
|
|
|
def verify_filecheck_prefixes(fc_cmd):
|
|
|
|
|
fc_cmd_parts = fc_cmd.split()
|
|
|
|
|
for part in fc_cmd_parts:
|
|
|
|
|
if "check-prefix=" in part:
|
|
|
|
|
prefix = part.split('=', 1)[1]
|
|
|
|
|
check_prefix(prefix)
|
|
|
|
|
elif "check-prefixes=" in part:
|
|
|
|
|
prefixes = part.split('=', 1)[1].split(',')
|
|
|
|
|
for prefix in prefixes:
|
|
|
|
|
check_prefix(prefix)
|
|
|
|
|
if prefixes.count(prefix) > 1:
|
2019-08-07 16:44:50 +02:00
|
|
|
warn("Supplied prefix '%s' is not unique in the prefix list." % (prefix,))
|
2019-11-01 04:45:17 +01:00
|
|
|
|
|
|
|
|
def get_autogennote_suffix(parser, args):
|
|
|
|
|
autogenerated_note_args = ''
|
|
|
|
|
for k, v in args._get_kwargs():
|
|
|
|
|
if parser.get_default(k) == v or k == 'tests' or k == 'update_only' or k == 'opt_binary':
|
|
|
|
|
continue
|
|
|
|
|
k = k.replace('_', '-')
|
|
|
|
|
if type(v) is bool:
|
|
|
|
|
autogenerated_note_args += '--%s ' % (k)
|
|
|
|
|
else:
|
|
|
|
|
autogenerated_note_args += '--%s %s ' % (k, v)
|
|
|
|
|
if autogenerated_note_args:
|
|
|
|
|
autogenerated_note_args = ' %s %s' % (UTC_ARGS_KEY, autogenerated_note_args[:-1])
|
|
|
|
|
return autogenerated_note_args
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def check_for_command(line, parser, args, argv):
|
|
|
|
|
cmd_m = UTC_ARGS_CMD.match(line)
|
|
|
|
|
if cmd_m:
|
|
|
|
|
cmd = cmd_m.group('cmd').strip().split(' ')
|
|
|
|
|
argv = argv + cmd
|
|
|
|
|
args = parser.parse_args(filter(lambda arg: arg not in args.tests, argv))
|
|
|
|
|
return args, argv
|
