This is an archive of the discontinued LLVM Phabricator instance.

Differential D83629

[Utils] Check function attributes in update_test_checks
ClosedPublic

Authored by sstefan1 on Jul 11 2020, 12:58 PM.

Details

Reviewers
jdoerfert
MaskRay
arichardson
baziotis
Commits
rG937bad3594e7: [Utils] Check function attributes in update_test_checks
Summary

This introduces new flag to the update_test_checks that allows for
function attributes to be checked in a check-line. If the flag is not,
the behavior should remain the same.

Diff Detail

Unit TestsFailed

TimeTest
450 mswindows > Clang.utils/update_cc_test_checks::Unknown Unit Message ("")
400 mswindows > Clang.utils/update_cc_test_checks::Unknown Unit Message ("")
360 mswindows > Clang.utils/update_cc_test_checks::Unknown Unit Message ("")
400 mswindows > Clang.utils/update_cc_test_checks::Unknown Unit Message ("")

Event Timeline

sstefan1 created this revision.Jul 11 2020, 12:58 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 11 2020, 12:58 PM
Herald added subscribers: llvm-commits, arichardson. · View Herald Transcript
Harbormaster failed remote builds in B63872: Diff 277257!Jul 11 2020, 1:34 PM
sstefan1 updated this revision to Diff 277263.Jul 11 2020, 2:51 PM

remove unnecessary flag, fix update_cc_test_checks

Harbormaster completed remote builds in B63876: Diff 277263.Jul 11 2020, 3:47 PM
jdoerfert added reviewers: MaskRay, arichardson.Jul 13 2020, 3:11 PM

We need tests for this. There are lit tests for these tools now :)

sstefan1 updated this revision to Diff 278295.Jul 15 2020, 1:36 PM

add a test

Herald added a reviewer: baziotis. · View Herald TranscriptJul 15 2020, 1:36 PM
Herald added a subscriber: bbn. · View Herald Transcript
Harbormaster failed remote builds in B64417: Diff 278295!Jul 15 2020, 2:05 PM
jdoerfert accepted this revision.Jul 17 2020, 6:16 PM

This is great, thanks! We'll have to update all the Attributor tests now :D

LGTM, one minor request below.

llvm/utils/UpdateTestChecks/common.py
394

Nit: Maybe add the ; too.

llvm/utils/update_test_checks.py
56

Can we add this to the _cc_test script too (with test). Seems useful when you come from C as well.

This revision is now accepted and ready to land.Jul 17 2020, 6:16 PM
sstefan1 marked an inline comment as done.Jul 19 2020, 3:48 AM
sstefan1 added a subscriber: lebedev.ri.
sstefan1 added inline comments.
llvm/utils/update_test_checks.py
56

Sure. One concern though. I think this would require running the test with at least -O1 and -attributor-enable flags.
I remember @lebedev.ri having concerns about this. Should I go ahead with that?

lebedev.ri added inline comments.Jul 19 2020, 4:11 AM
llvm/utils/update_test_checks.py
56

Why would that test require attributor?
Just check that some attribute isn't dropped at -O0?

sstefan1 marked an inline comment as done.Jul 19 2020, 4:21 AM
sstefan1 added inline comments.
llvm/utils/update_test_checks.py
56

Ok, makes sense. Will do that.

Closed by commit rG937bad3594e7: [Utils] Check function attributes in update_test_checks (authored by sstefan1). · Explain WhyJul 19 2020, 11:22 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptJul 19 2020, 11:22 AM
Herald added a subscriber: cfe-commits. · View Herald Transcript

Revision Contents

PathSize
llvm/
utils/
UpdateTestChecks/
47 lines
2 lines
6 lines

Diff 277257

llvm/utils/UpdateTestChecks/common.py

Show First 20 Lines • Show All 136 Lines • ▼ Show 20 Lines
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|-EMPTY)?:') CHECK_RE = re.compile(r'^\s*(?://|[;#])\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL|-SAME|-EMPTY)?:')
UTC_ARGS_KEY = 'UTC_ARGS:' UTC_ARGS_KEY = 'UTC_ARGS:'
UTC_ARGS_CMD = re.compile(r'.*' + UTC_ARGS_KEY + '\s*(?P<cmd>.*)\s*$') UTC_ARGS_CMD = re.compile(r'.*' + UTC_ARGS_KEY + '\s*(?P<cmd>.*)\s*$')
UTC_ADVERT = 'NOTE: Assertions have been autogenerated by ' UTC_ADVERT = 'NOTE: Assertions have been autogenerated by '
OPT_FUNCTION_RE = re.compile( OPT_FUNCTION_RE = re.compile(
r'^\s*define\s+(?:internal\s+)?[^@]*@(?P<func>[\w.-]+?)\s*' r'^(\s*;\s*Function\sAttrs:\s(?P<attrs>[\w\s]+?))?\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.-]+?)\':'
r'\s*\n(?P<body>.*)$', r'\s*\n(?P<body>.*)$',
flags=(re.X | re.S)) flags=(re.X | re.S))
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Linesdef do_scrub(body, scrubber, scrubber_args, extra):
if scrubber_args: if scrubber_args:
local_args = copy.deepcopy(scrubber_args) local_args = copy.deepcopy(scrubber_args)
local_args[0].extra_scrub = extra local_args[0].extra_scrub = extra
return scrubber(body, *local_args) return scrubber(body, *local_args)
return scrubber(body, *scrubber_args) return scrubber(body, *scrubber_args)
# Build up a dictionary of all the function bodies. # Build up a dictionary of all the function bodies.
class function_body(object): class function_body(object):
def __init__(self, string, extra, args_and_sig): def __init__(self, string, extra, args_and_sig, attrs):
self.scrub = string self.scrub = string
self.extrascrub = extra self.extrascrub = extra
self.args_and_sig = args_and_sig self.args_and_sig = args_and_sig
def is_same_except_arg_names(self, extrascrub, args_and_sig): self.attrs = attrs
def is_same_except_arg_names(self, extrascrub, args_and_sig, attrs):
arg_names = set() arg_names = set()
def drop_arg_names(match): def drop_arg_names(match):
arg_names.add(match.group(2)) arg_names.add(match.group(2))
return match.group(1) + match.group(3) return match.group(1) + match.group(3)
def repl_arg_names(match): def repl_arg_names(match):
if match.group(2) in arg_names: if match.group(2) in arg_names:
return match.group(1) + match.group(3) return match.group(1) + match.group(3)
return match.group(1) + match.group(2) + match.group(3) return match.group(1) + match.group(2) + match.group(3)
if self.attrs != attrs:
return False
ans0 = IR_VALUE_RE.sub(drop_arg_names, self.args_and_sig) ans0 = IR_VALUE_RE.sub(drop_arg_names, self.args_and_sig)
ans1 = IR_VALUE_RE.sub(drop_arg_names, args_and_sig) ans1 = IR_VALUE_RE.sub(drop_arg_names, args_and_sig)
if ans0 != ans1: if ans0 != ans1:
return False return False
es0 = IR_VALUE_RE.sub(repl_arg_names, self.extrascrub) es0 = IR_VALUE_RE.sub(repl_arg_names, self.extrascrub)
es1 = IR_VALUE_RE.sub(repl_arg_names, extrascrub) es1 = IR_VALUE_RE.sub(repl_arg_names, extrascrub)
es0 = SCRUB_IR_COMMENT_RE.sub(r'', es0) es0 = SCRUB_IR_COMMENT_RE.sub(r'', es0)
es1 = SCRUB_IR_COMMENT_RE.sub(r'', es1) es1 = SCRUB_IR_COMMENT_RE.sub(r'', es1)
return es0 == es1 return es0 == es1
def __str__(self): def __str__(self):
return self.scrub return self.scrub
def build_function_body_dictionary(function_re, scrubber, scrubber_args, raw_tool_output, prefixes, func_dict, verbose, record_args): def build_function_body_dictionary(function_re, scrubber, scrubber_args, raw_tool_output, prefixes, func_dict, verbose, record_args, check_attributes):
for m in function_re.finditer(raw_tool_output): for m in function_re.finditer(raw_tool_output):
if not m: if not m:
continue continue
func = m.group('func') func = m.group('func')
body = m.group('body') body = m.group('body')
attrs = m.group('attrs') if check_attributes else ''
# Determine if we print arguments, the opening brace, or nothing after the function name # Determine if we print arguments, the opening brace, or nothing after the function name
if record_args and 'args_and_sig' in m.groupdict(): if record_args and 'args_and_sig' in m.groupdict():
args_and_sig = scrub_body(m.group('args_and_sig').strip()) args_and_sig = scrub_body(m.group('args_and_sig').strip())
elif 'args_and_sig' in m.groupdict(): elif 'args_and_sig' in m.groupdict():
args_and_sig = '(' args_and_sig = '('
else: else:
args_and_sig = '' args_and_sig = ''
scrubbed_body = do_scrub(body, scrubber, scrubber_args, extra = False) scrubbed_body = do_scrub(body, scrubber, scrubber_args, extra = False)
scrubbed_extra = do_scrub(body, scrubber, scrubber_args, extra = True) scrubbed_extra = do_scrub(body, scrubber, scrubber_args, extra = True)
if 'analysis' in m.groupdict(): if 'analysis' in m.groupdict():
analysis = m.group('analysis') analysis = m.group('analysis')
if analysis.lower() != 'cost model analysis': if analysis.lower() != 'cost model analysis':
warn('Unsupported analysis mode: %r!' % (analysis,)) warn('Unsupported analysis mode: %r!' % (analysis,))
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:])
if verbose: if verbose:
print('Processing function: ' + func, file=sys.stderr) print('Processing function: ' + func, file=sys.stderr)
for l in scrubbed_body.splitlines(): for l in scrubbed_body.splitlines():
print(' ' + l, file=sys.stderr) print(' ' + l, file=sys.stderr)
for prefix in prefixes: for prefix in prefixes:
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 in func_dict[prefix]:
if func_dict[prefix][func] and func_dict[prefix][func].is_same_except_arg_names(scrubbed_extra, args_and_sig): if str(func_dict[prefix][func]) != scrubbed_body or (func_dict[prefix][func] and (func_dict[prefix][func].args_and_sig != args_and_sig or func_dict[prefix][func].attrs != attrs)):
if func_dict[prefix][func] and func_dict[prefix][func].is_same_except_arg_names(scrubbed_extra, args_and_sig, attrs):
func_dict[prefix][func].scrub = scrubbed_extra func_dict[prefix][func].scrub = scrubbed_extra
func_dict[prefix][func].args_and_sig = args_and_sig func_dict[prefix][func].args_and_sig = args_and_sig
continue continue
else: else:
if prefix == prefixes[-1]: if prefix == prefixes[-1]:
warn('Found conflicting asm under the same prefix: %r!' % (prefix,)) warn('Found conflicting asm under the same prefix: %r!' % (prefix,))
else: else:
func_dict[prefix][func] = None func_dict[prefix][func] = None
continue continue
func_dict[prefix][func] = function_body(scrubbed_body, scrubbed_extra, args_and_sig) func_dict[prefix][func] = function_body(scrubbed_body, scrubbed_extra, args_and_sig, attrs)
##### Generator of LLVM IR CHECK lines ##### Generator of LLVM IR CHECK lines
SCRUB_IR_COMMENT_RE = re.compile(r'\s*;.*') SCRUB_IR_COMMENT_RE = re.compile(r'\s*;.*')
# Match things that look at identifiers, but only if they are followed by # Match things that look at identifiers, but only if they are followed by
# spaces, commas, paren, or end of the string # spaces, commas, paren, or end of the string
IR_VALUE_RE = re.compile(r'(\s+)%([\w.-]+?)([,\s\(\)]|\Z)') IR_VALUE_RE = re.compile(r'(\s+)%([\w.-]+?)([,\s\(\)]|\Z)')
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines for i, line in enumerate(lines):
scrubbed_line = SCRUB_IR_COMMENT_RE.sub(r'', line) scrubbed_line = SCRUB_IR_COMMENT_RE.sub(r'', line)
if is_analyze: if is_analyze:
lines[i] = scrubbed_line lines[i] = scrubbed_line
else: else:
lines[i] = IR_VALUE_RE.sub(transform_line_vars, scrubbed_line) lines[i] = IR_VALUE_RE.sub(transform_line_vars, scrubbed_line)
return lines return lines
def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, is_asm, is_analyze): def add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, is_asm, is_analyze, check_attributes):
# prefix_exclusions are prefixes we cannot use to print the function because it doesn't exist in run lines that use these prefixes as well. # prefix_exclusions are prefixes we cannot use to print the function because it doesn't exist in run lines that use these prefixes as well.
prefix_exclusions = set() prefix_exclusions = set()
printed_prefixes = [] printed_prefixes = []
for p in prefix_list: for p in prefix_list:
checkprefixes = p[0] checkprefixes = p[0]
# If not all checkprefixes of this run line produced the function we cannot check for it as it does not # 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 # exist for this run line. A subset of the check prefixes might know about the function but only because
# other run lines created it. # other run lines created it.
Show All 19 Lines for checkprefix in checkprefixes:
# Add some space between different check prefixes, but not after the last # Add some space between different check prefixes, but not after the last
# check line (before the test code). # check line (before the test code).
if is_asm: if is_asm:
if len(printed_prefixes) != 0: if len(printed_prefixes) != 0:
output_lines.append(comment_marker) output_lines.append(comment_marker)
vars_seen = set() vars_seen = set()
printed_prefixes.append(checkprefix) printed_prefixes.append(checkprefix)
attrs = str(func_dict[checkprefix][func_name].attrs)
attrs = '' if attrs == 'None' else attrs
if attrs and check_attributes:
output_lines.append('%s %s: Function Attrs: %s' % (comment_marker, checkprefix, attrs))
jdoerfertUnsubmitted
Not Done
ReplyInline Actions

Nit: Maybe add the ; too.

jdoerfert: Nit: Maybe add the `;` too.
args_and_sig = str(func_dict[checkprefix][func_name].args_and_sig) args_and_sig = str(func_dict[checkprefix][func_name].args_and_sig)
args_and_sig = genericize_check_lines([args_and_sig], is_analyze, vars_seen)[0] args_and_sig = genericize_check_lines([args_and_sig], is_analyze, vars_seen)[0]
if '[[' in args_and_sig: if '[[' in args_and_sig:
output_lines.append(check_label_format % (checkprefix, func_name, '')) output_lines.append(check_label_format % (checkprefix, func_name, ''))
output_lines.append('%s %s-SAME: %s' % (comment_marker, checkprefix, args_and_sig)) output_lines.append('%s %s-SAME: %s' % (comment_marker, checkprefix, args_and_sig))
else: else:
output_lines.append(check_label_format % (checkprefix, func_name, args_and_sig)) output_lines.append(check_label_format % (checkprefix, func_name, args_and_sig))
func_body = str(func_dict[checkprefix][func_name]).splitlines() func_body = str(func_dict[checkprefix][func_name]).splitlines()
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines for checkprefix in checkprefixes:
is_blank_line = False is_blank_line = False
# Add space between different check prefixes and also before the first # Add space between different check prefixes and also before the first
# line of code in the test function. # line of code in the test function.
output_lines.append(comment_marker) output_lines.append(comment_marker)
break break
def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict, def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict,
func_name, preserve_names, function_sig): func_name, preserve_names, function_sig, check_attributes):
# Label format is based on IR string. # Label format is based on IR string.
function_def_regex = 'define {{[^@]+}}' if function_sig else '' function_def_regex = 'define {{[^@]+}}' if function_sig else ''
check_label_format = '{} %s-LABEL: {}@%s%s'.format(comment_marker, function_def_regex) check_label_format = '{} %s-LABEL: {}@%s%s'.format(comment_marker, function_def_regex)
add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name,
check_label_format, False, preserve_names) check_label_format, False, preserve_names, check_attributes)
def add_analyze_checks(output_lines, comment_marker, prefix_list, func_dict, func_name): def add_analyze_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
check_label_format = '{} %s-LABEL: \'%s%s\''.format(comment_marker) check_label_format = '{} %s-LABEL: \'%s%s\''.format(comment_marker)
add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, True) add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, False, True, False)
def check_prefix(prefix): def check_prefix(prefix):
if not PREFIX_RE.match(prefix): if not PREFIX_RE.match(prefix):
hint = "" hint = ""
if ',' in prefix: if ',' in prefix:
hint = " Did you mean '--check-prefixes=" + prefix + "'?" hint = " Did you mean '--check-prefixes=" + prefix + "'?"
warn(("Supplied prefix '%s' is invalid. Prefix must contain only alphanumeric characters, hyphens and underscores." + hint) % warn(("Supplied prefix '%s' is invalid. Prefix must contain only alphanumeric characters, hyphens and underscores." + hint) %
▲ Show 20 Lines • Show All 49 Lines • Show Last 20 Lines

llvm/utils/update_analyze_test_checks.py

Show First 20 Lines • Show All 116 Lines • ▼ Show 20 Lines for prefixes, opt_args in prefix_list:
common.debug('Extracted FileCheck prefixes:', str(prefixes), file=sys.stderr) common.debug('Extracted FileCheck prefixes:', str(prefixes), file=sys.stderr)
raw_tool_outputs = common.invoke_tool(args.opt_binary, opt_args, test) raw_tool_outputs = common.invoke_tool(args.opt_binary, opt_args, test)
# Split analysis outputs by "Printing analysis " declarations. # Split analysis outputs by "Printing analysis " declarations.
for raw_tool_output in re.split(r'Printing analysis ', raw_tool_outputs): for raw_tool_output in re.split(r'Printing analysis ', raw_tool_outputs):
common.build_function_body_dictionary( common.build_function_body_dictionary(
common.ANALYZE_FUNCTION_RE, common.scrub_body, [], common.ANALYZE_FUNCTION_RE, common.scrub_body, [],
raw_tool_output, prefixes, func_dict, args.verbose, False) raw_tool_output, prefixes, func_dict, args.verbose, False, False)
is_in_function = False is_in_function = False
is_in_function_start = False is_in_function_start = False
prefix_set = set([prefix for prefixes, _ in prefix_list for prefix in prefixes]) prefix_set = set([prefix for prefixes, _ in prefix_list for prefix in prefixes])
common.debug('Rewriting FileCheck prefixes:', str(prefix_set), file=sys.stderr) common.debug('Rewriting FileCheck prefixes:', str(prefix_set), file=sys.stderr)
output_lines = [] output_lines = []
output_lines.append(autogenerated_note) output_lines.append(autogenerated_note)
▲ Show 20 Lines • Show All 50 Lines • Show Last 20 Lines

llvm/utils/update_test_checks.py

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Linesdef main():
parser.add_argument( parser.add_argument(
'--function', help='The function in the test file to update') '--function', help='The function in the test file to update')
parser.add_argument('-p', '--preserve-names', action='store_true', parser.add_argument('-p', '--preserve-names', action='store_true',
help='Do not scrub IR names') help='Do not scrub IR names')
parser.add_argument('--function-signature', action='store_true', parser.add_argument('--function-signature', action='store_true',
help='Keep function signature information around for the check line') help='Keep function signature information around for the check line')
parser.add_argument('--scrub-attributes', action='store_true', parser.add_argument('--scrub-attributes', action='store_true',
help='Remove attribute annotations (#0) from the end of check line') help='Remove attribute annotations (#0) from the end of check line')
parser.add_argument('--check-attributes', action='store_true',
help='Check "Function Attributes" for functions')
jdoerfertUnsubmitted
Not Done
ReplyInline Actions

Can we add this to the _cc_test script too (with test). Seems useful when you come from C as well.

jdoerfert: Can we add this to the _cc_test script too (with test). Seems useful when you come from C as…
sstefan1AuthorUnsubmitted
Done
ReplyInline Actions

Sure. One concern though. I think this would require running the test with at least -O1 and -attributor-enable flags.
I remember @lebedev.ri having concerns about this. Should I go ahead with that?

sstefan1: Sure. One concern though. I think this would require running the test with at least `-O1` and `…
lebedev.riUnsubmitted
Not Done
ReplyInline Actions

Why would that test require attributor?
Just check that some attribute isn't dropped at -O0?

lebedev.ri: Why would that test require attributor? Just check that some attribute isn't dropped at `-O0`?
sstefan1AuthorUnsubmitted
Done
ReplyInline Actions

Ok, makes sense. Will do that.

sstefan1: Ok, makes sense. Will do that.
parser.add_argument('tests', nargs='+') parser.add_argument('tests', nargs='+')
initial_args = common.parse_commandline_args(parser) initial_args = common.parse_commandline_args(parser)
script_name = os.path.basename(__file__) script_name = os.path.basename(__file__)
opt_basename = os.path.basename(initial_args.opt_binary) opt_basename = os.path.basename(initial_args.opt_binary)
if not re.match(r'^opt(-\d+)?$', opt_basename): if not re.match(r'^opt(-\d+)?$', opt_basename):
common.error('Unexpected opt name: ' + opt_basename) common.error('Unexpected opt name: ' + opt_basename)
sys.exit(1) sys.exit(1)
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines for ti in common.itertests(initial_args.tests, parser,
for prefixes, opt_args in prefix_list: for prefixes, opt_args in prefix_list:
common.debug('Extracted opt cmd: ' + opt_basename + ' ' + opt_args) common.debug('Extracted opt cmd: ' + opt_basename + ' ' + opt_args)
common.debug('Extracted FileCheck prefixes: ' + str(prefixes)) common.debug('Extracted FileCheck prefixes: ' + str(prefixes))
raw_tool_output = common.invoke_tool(ti.args.opt_binary, opt_args, ti.path) raw_tool_output = common.invoke_tool(ti.args.opt_binary, opt_args, ti.path)
common.build_function_body_dictionary( common.build_function_body_dictionary(
common.OPT_FUNCTION_RE, common.scrub_body, [], common.OPT_FUNCTION_RE, common.scrub_body, [],
raw_tool_output, prefixes, func_dict, ti.args.verbose, raw_tool_output, prefixes, func_dict, ti.args.verbose,
ti.args.function_signature) ti.args.function_signature, ti.args.check_attributes)
is_in_function = False is_in_function = False
is_in_function_start = False is_in_function_start = False
prefix_set = set([prefix for prefixes, _ in prefix_list for prefix in prefixes]) prefix_set = set([prefix for prefixes, _ in prefix_list for prefix in prefixes])
common.debug('Rewriting FileCheck prefixes:', str(prefix_set)) common.debug('Rewriting FileCheck prefixes:', str(prefix_set))
output_lines = [] output_lines = []
for input_line_info in ti.iterlines(output_lines): for input_line_info in ti.iterlines(output_lines):
input_line = input_line_info.line input_line = input_line_info.line
args = input_line_info.args args = input_line_info.args
if is_in_function_start: if is_in_function_start:
if input_line == '': if input_line == '':
continue continue
if input_line.lstrip().startswith(';'): if input_line.lstrip().startswith(';'):
m = common.CHECK_RE.match(input_line) m = common.CHECK_RE.match(input_line)
if not m or m.group(1) not in prefix_set: if not m or m.group(1) not in prefix_set:
output_lines.append(input_line) output_lines.append(input_line)
continue continue
# Print out the various check lines here. # Print out the various check lines here.
common.add_ir_checks(output_lines, ';', prefix_list, func_dict, common.add_ir_checks(output_lines, ';', prefix_list, func_dict,
func_name, args.preserve_names, args.function_signature) func_name, args.preserve_names, args.function_signature, args.check_attributes)
is_in_function_start = False is_in_function_start = False
if is_in_function: if is_in_function:
if common.should_add_line_to_output(input_line, prefix_set): 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. # This input line of the function body will go as-is into the output.
# Except make leading whitespace uniform: 2 spaces. # Except make leading whitespace uniform: 2 spaces.
input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(r' ', input_line) input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(r' ', input_line)
output_lines.append(input_line) output_lines.append(input_line)
Show All 26 Lines