From b1f55c33d435ef8a68735774ea32f0252750ebcd Mon Sep 17 00:00:00 2001 From: Roman Lebedev Date: Sun, 20 Jun 2021 13:14:33 +0300 Subject: [PATCH] [UpdateTestUtils] Print test filename when complaining about conflicting prefix Now that FileCheck eagerly complains when prefixes are unused, the update script does the same, and is becoming very common to need to drop some prefixes, yet figuring out the file it complains about isn't obvious unless it actually tells us. --- llvm/utils/UpdateTestChecks/common.py | 5 +++-- llvm/utils/update_analyze_test_checks.py | 3 ++- llvm/utils/update_cc_test_checks.py | 3 ++- llvm/utils/update_llc_test_checks.py | 3 ++- llvm/utils/update_test_checks.py | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/llvm/utils/UpdateTestChecks/common.py b/llvm/utils/UpdateTestChecks/common.py index 358a06d..80b0c84 100644 --- a/llvm/utils/UpdateTestChecks/common.py +++ b/llvm/utils/UpdateTestChecks/common.py @@ -291,11 +291,12 @@ class function_body(object): return self.scrub class FunctionTestBuilder: - def __init__(self, run_list, flags, scrubber_args): + def __init__(self, run_list, flags, scrubber_args, path): self._verbose = flags.verbose self._record_args = flags.function_signature self._check_attributes = flags.check_attributes self._scrubber_args = scrubber_args + self._path = path # Strip double-quotes if input was read by UTC_ARGS self._replace_value_regex = list(map(lambda x: x.strip('"'), flags.replace_value_regex)) self._func_dict = {} @@ -309,7 +310,7 @@ class FunctionTestBuilder: def finish_and_get_func_dict(self): for prefix in self._get_failed_prefixes(): - warn('Prefix %s had conflicting output from different RUN lines for all functions' % (prefix,)) + warn('Prefix %s had conflicting output from different RUN lines for all functions in test %s' % (prefix,self._path,)) return self._func_dict def func_order(self): diff --git a/llvm/utils/update_analyze_test_checks.py b/llvm/utils/update_analyze_test_checks.py index 2faa08d..6c5bc52 100755 --- a/llvm/utils/update_analyze_test_checks.py +++ b/llvm/utils/update_analyze_test_checks.py @@ -115,7 +115,8 @@ def main(): 'function_signature': False, 'check_attributes': False, 'replace_value_regex': []}), - scrubber_args = []) + scrubber_args = [], + path=test) for prefixes, opt_args in prefix_list: common.debug('Extracted opt cmd:', opt_basename, opt_args, file=sys.stderr) diff --git a/llvm/utils/update_cc_test_checks.py b/llvm/utils/update_cc_test_checks.py index cbe5876..068a9e4 100755 --- a/llvm/utils/update_cc_test_checks.py +++ b/llvm/utils/update_cc_test_checks.py @@ -275,7 +275,8 @@ def main(): builder = common.FunctionTestBuilder( run_list=filecheck_run_list, flags=ti.args, - scrubber_args=[]) + scrubber_args=[], + path=ti.path) for prefixes, args, extra_commands, triple_in_cmd in run_list: # Execute non-filechecked runline. diff --git a/llvm/utils/update_llc_test_checks.py b/llvm/utils/update_llc_test_checks.py index d5ff299..7e20a58 100755 --- a/llvm/utils/update_llc_test_checks.py +++ b/llvm/utils/update_llc_test_checks.py @@ -114,7 +114,8 @@ def main(): 'function_signature': False, 'check_attributes': False, 'replace_value_regex': []}), - scrubber_args=[ti.args]) + scrubber_args=[ti.args], + path=ti.path) for prefixes, llc_tool, llc_args, preprocess_cmd, triple_in_cmd, march_in_cmd in run_list: common.debug('Extracted LLC cmd:', llc_tool, llc_args) diff --git a/llvm/utils/update_test_checks.py b/llvm/utils/update_test_checks.py index e240c6c..9ac95cc 100755 --- a/llvm/utils/update_test_checks.py +++ b/llvm/utils/update_test_checks.py @@ -113,7 +113,8 @@ def main(): builder = common.FunctionTestBuilder( run_list=prefix_list, flags=ti.args, - scrubber_args=[]) + scrubber_args=[], + path=ti.path) for prefixes, opt_args, preprocess_cmd in prefix_list: common.debug('Extracted opt cmd: ' + opt_basename + ' ' + opt_args) -- 2.7.4