Add wildcard support to all update_*_test_checks.py scripts (PR37500)

[RKSimon]

Summary

We can already update multiple files in each update call, this extends it to work with wildcards as well in the same way as update_mca_test_checks.py

[gbedwell]

utils/update_mir_test_checks.py

429 ↗

(On Diff #188876)

typo? test_path*s*

[lebedev.ri]

Hm, never noticed this. I guess bash always expanded glob beforehand for me.

As a footnote, i wonder if utils/update_cc_test_checks.py bitrot nowadays.
I wasn't successful in using it last year.

[RKSimon]

utils/update_mir_test_checks.py

429 ↗

(On Diff #188876)

cheers - I tested llc/opt/analyze variants but hadn't mir as I hit some python3 issues ("bytes-like object is required, not 'str'"") that I hadn't tracked down...

[RKSimon]

Fixed mir + tested on python27 (although it still doesn't run on python3 - that needs to be fixed separately).

Dropped the cc change as like Roman said it needs some attention first.

Tested llc/opt/analyze on python3 and python27

[MaskRay]

Doesn't the shell glob files for you?

[RKSimon]

In D58817#1416064, @MaskRay wrote:

Doesn't the shell glob files for you?

Not on windows (which is what I care about) and probably others. Bash usually works, although I've seen problems with subfolder expansion on git bash - haven't tested much else.

[RKSimon]

any more comments?

llvm/trunk/utils/update_analyze_test_checks.py

 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!
 """
 
 from __future__ import print_function
 
 import argparse
+import glob
 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('ERROR: Unexpected opt name: ' + opt_basename, file=sys.stderr)
     sys.exit(1)
 
-  for test in args.tests:
+  test_paths = [test for pattern in args.tests for test in glob.glob(pattern)]
+  for test in test_paths:
     if args.verbose:
       print('Scanning for RUN lines in test file: %s' % (test,), file=sys.stderr)
     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 []

llvm/trunk/utils/update_llc_test_checks.py

 #!/usr/bin/env python
 
 """A test case update script.
 
 This script is a utility to update LLVM 'llc' based test cases with new
 FileCheck patterns. It can either update all of the tests in the file or
 a single test function.
 """
 
 from __future__ import print_function
 
 import argparse
+import glob
 import os         # Used to advertise this file's name ("autogenerated_note").
 import string
 import subprocess
 import sys
 import re
 
 from UpdateTestChecks import asm, common
 
parser.add_argument(
       help='Use more regex for x86 matching to reduce diffs between various subtargets')
   parser.add_argument(
       '--no_x86_scrub_rip', action='store_false', dest='x86_scrub_rip')
   parser.add_argument('tests', nargs='+')
   args = parser.parse_args()
 
   autogenerated_note = (ADVERT + 'utils/' + os.path.basename(__file__))
 
-  for test in args.tests:
+  test_paths = [test for pattern in args.tests for test in glob.glob(pattern)]
+  for test in test_paths:
     if args.verbose:
       print('Scanning for RUN lines in test file: %s' % (test,), file=sys.stderr)
     with open(test) as f:
       input_lines = [l.rstrip() for l in f]
 
     triple_in_ir = None
     for l in input_lines:
       m = common.TRIPLE_IR_RE.match(l)

llvm/trunk/utils/update_mir_test_checks.py

 that are common between different commands will be left as-is by
 default, or removed if the --remove-common-prefixes flag is provided.
 """
 
 from __future__ import print_function
 
 import argparse
 import collections
+import glob
 import os
 import re
 import subprocess
 import sys
 
 from UpdateTestChecks import common
 
 MIR_FUNC_NAME_RE = re.compile(r' *name: *(?P<func>[A-Za-z0-9_.-]+)')
def main():
     parser.add_argument('--llc-binary', dest='llc', default='llc', type=LLC,
                         help='The "llc" binary to generate the test case with')
     parser.add_argument('--remove-common-prefixes', action='store_true',
                         help='Remove existing check lines whose prefixes are '
                              'shared between multiple commands')
     parser.add_argument('tests', nargs='+')
     args = parser.parse_args()
 
-    for test in args.tests:
+    test_paths = [test for pattern in args.tests for test in glob.glob(pattern)]
+    for test in test_paths:
         try:
             update_test_file(args.llc, test, args.remove_common_prefixes,
                              verbose=args.verbose)
         except Exception:
             warn('Error processing file', test_file=test)
             raise
 
 
 if __name__ == '__main__':
   main()

llvm/trunk/utils/update_test_checks.py

 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!
 """
 
 from __future__ import print_function
 
 import argparse
+import glob
 import itertools
 import os         # Used to advertise this file's name ("autogenerated_note").
 import string
 import subprocess
 import sys
 import tempfile
 import re
 
def main():
 
   autogenerated_note = (ADVERT + 'utils/' + os.path.basename(__file__))
 
   opt_basename = os.path.basename(args.opt_binary)
   if (opt_basename != "opt"):
     print('ERROR: Unexpected opt name: ' + opt_basename, file=sys.stderr)
     sys.exit(1)
 
-  for test in args.tests:
+  test_paths = [test for pattern in args.tests for test in glob.glob(pattern)]
+  for test in test_paths:
     if args.verbose:
       print('Scanning for RUN lines in test file: %s' % (test,), file=sys.stderr)
     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 []