[utils] De-duplicate utils/update_{llc_,}test_checks.py

[MaskRay]

Summary

No functional change. Moved common part to UpdateTestChecks/common.py

[MaskRay]

Rename

[MaskRay]

Make them more similar so that easier to merge in future revision

[MaskRay]

Minor

[MaskRay]

Move asm parts to UpdateTestChecks/asm.py to be reused by other scripts

[echristo]

SGTM. Did you try running it on a file to double check that you didn't change anything? :)

[MaskRay]

Unchanged

% utils/update_test_checks.py --opt-binary=~/Dev/llvm/release/bin/opt test/CodeGen/Generic/expand-experimental-reductions.ll
% utils/update_llc_test_checks.py --llc-binary=~/Dev/llvm/release/bin/llc test/CodeGen/X86/GlobalISel/gep.ll

[echristo]

Awesome. Do you have commit ability or do you need me to commit for you?

utils/UpdateTestChecks/common.py

+import re
+import subprocess
+
+RUN_LINE_RE = re.compile('^\s*;\s*RUN:\s*(.*)$')
+CHECK_PREFIX_RE = re.compile('--?check-prefix(?:es)?=(\S+)')
+CHECK_RE = re.compile(r'^\s*;\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:')
+
+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)
+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)
+
+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:
+    stdout = subprocess.check_output(exe + ' ' + cmd_args,
+                                     shell=True, stdin=ir_file)
+  # Fix line endings to unix CR style.
+  stdout = stdout.replace('\r\n', '\n')
+  return stdout
+
+# Build up a dictionary of all the function bodies.
+def build_function_body_dictionary(function_re, scrubber, scrubber_args, raw_tool_output, prefixes, func_dict, verbose):
+  for m in function_re.finditer(raw_tool_output):
+    if not m:
+      continue
+    func = m.group('func')
+    scrubbed_body = scrubber(m.group('body'), *scrubber_args)
+    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:
+      print >>sys.stderr, 'Processing function: ' + func
+      for l in scrubbed_body.splitlines():
+        print >>sys.stderr, '  ' + l
+    for prefix in prefixes:
+      if func in func_dict[prefix] and func_dict[prefix][func] != scrubbed_body:
+        if prefix == prefixes[-1]:
+          print >>sys.stderr, ('WARNING: Found conflicting asm under the '
+                               'same prefix: %r!' % (prefix,))
+        else:
+          func_dict[prefix][func] = None
+          continue
+
+      func_dict[prefix][func] = scrubbed_body

utils/update_llc_test_checks.py

 #!/usr/bin/env python2.7
 
 """A test case update script.
 
 This script is a utility to update LLVM X86 'llc' based test cases with new
 FileCheck patterns. It can either update all of the tests in the file or
 a single test function.
 """
 
 import argparse
 import os         # Used to advertise this file's name ("autogenerated_note").
 import string
 import subprocess
 import sys
 import re
 
-# Invoke the tool that is being tested.
-def llc(args, cmd_args, ir):
-  with open(ir) as ir_file:
-    stdout = subprocess.check_output(args.llc_binary + ' ' + cmd_args,
-                                     shell=True, stdin=ir_file)
-  # Fix line endings to unix CR style.
-  stdout = stdout.replace('\r\n', '\n')
-  return stdout
+from UpdateTestChecks import common
 
+ADVERT = '; NOTE: Assertions have been autogenerated by '
 
 # RegEx: this is where the magic happens.
 
 ASM_FUNCTION_X86_RE = re.compile(
     r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n[^:]*?'
     r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*'
     r'^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section|#+ -- End function)',
     flags=(re.M | re.S))

 ASM_FUNCTION_SYSTEMZ_RE = re.compile(
     r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n'
     r'[ \t]+.cfi_startproc\n'
     r'(?P<body>.*?)\n'
     r'.Lfunc_end[0-9]+:\n',
     flags=(re.M | re.S))
 
 
-SCRUB_WHITESPACE_RE = re.compile(r'(?!^(|  \w))[ \t]+', flags=re.M)
-SCRUB_TRAILING_WHITESPACE_RE = re.compile(r'[ \t]+$', flags=re.M)
-SCRUB_KILL_COMMENT_RE = re.compile(r'^ *#+ +kill:.*\n')
+common.SCRUB_WHITESPACE_RE = re.compile(r'(?!^(|  \w))[ \t]+', flags=re.M)
+common.SCRUB_TRAILING_WHITESPACE_RE = re.compile(r'[ \t]+$', flags=re.M)
+common.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)
 
 SCRUB_X86_SHUFFLES_RE = (
     re.compile(
         r'^(\s*\w+) [^#\n]+#+ ((?:[xyz]mm\d+|mem)( \{%k\d+\}( \{z\})?)? = .*)$',
         flags=re.M))
 SCRUB_X86_SP_RE = re.compile(r'\d+\(%(esp|rsp)\)')
 SCRUB_X86_RIP_RE = re.compile(r'[.\w]+\(%rip\)')
 SCRUB_X86_LCP_RE = re.compile(r'\.LCPI[0-9]+_[0-9]+')
 SCRUB_X86_RET_RE = re.compile(r'ret[l|q]')
 
-RUN_LINE_RE = re.compile('^\s*;\s*RUN:\s*(.*)$')
 TRIPLE_ARG_RE = re.compile(r'-mtriple=([^ ]+)')
 TRIPLE_IR_RE = re.compile(r'^target\s+triple\s*=\s*"([^"]+)"$')
 IR_FUNCTION_RE = re.compile('^\s*define\s+(?:internal\s+)?[^@]*@(\w+)\s*\(')
-CHECK_PREFIX_RE = re.compile('--?check-prefix(?:es)?=(\S+)')
-CHECK_RE = re.compile(r'^\s*;\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:')
 
 def scrub_asm_x86(asm, args):
   # Scrub runs of whitespace out of the assembly, but leave the leading
   # whitespace in place.
-  asm = SCRUB_WHITESPACE_RE.sub(r' ', asm)
+  asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)
   # Expand the tabs used for indentation.
   asm = string.expandtabs(asm, 2)
   # Detect shuffle asm comments and hide the operands in favor of the comments.
   asm = SCRUB_X86_SHUFFLES_RE.sub(r'\1 {{.*#+}} \2', asm)
   # Generically match the stack offset of a memory operand.
   asm = SCRUB_X86_SP_RE.sub(r'{{[0-9]+}}(%\1)', asm)
   # Generically match a RIP-relative memory operand.
   asm = SCRUB_X86_RIP_RE.sub(r'{{.*}}(%rip)', asm)
   # Generically match a LCP symbol.
   asm = SCRUB_X86_LCP_RE.sub(r'{{\.LCPI.*}}', asm)
   if args.x86_extra_scrub:
     # Avoid generating different checks for 32- and 64-bit because of 'retl' vs 'retq'.
     asm = SCRUB_X86_RET_RE.sub(r'ret{{[l|q]}}', asm)
   # Strip kill operands inserted into the asm.
-  asm = SCRUB_KILL_COMMENT_RE.sub('', asm)
+  asm = common.SCRUB_KILL_COMMENT_RE.sub('', asm)
   # Strip trailing whitespace.
-  asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
+  asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
   return asm
 
 def scrub_asm_arm_eabi(asm, args):
   # Scrub runs of whitespace out of the assembly, but leave the leading
   # whitespace in place.
-  asm = SCRUB_WHITESPACE_RE.sub(r' ', asm)
+  asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)
   # Expand the tabs used for indentation.
   asm = string.expandtabs(asm, 2)
   # Strip kill operands inserted into the asm.
-  asm = SCRUB_KILL_COMMENT_RE.sub('', asm)
+  asm = common.SCRUB_KILL_COMMENT_RE.sub('', asm)
   # Strip trailing whitespace.
-  asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
+  asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
   return asm
 
 def scrub_asm_powerpc64(asm, args):
   # Scrub runs of whitespace out of the assembly, but leave the leading
   # whitespace in place.
-  asm = SCRUB_WHITESPACE_RE.sub(r' ', asm)
+  asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)
   # Expand the tabs used for indentation.
   asm = string.expandtabs(asm, 2)
   # Stripe unimportant comments
   asm = SCRUB_LOOP_COMMENT_RE.sub(r'', asm)
   # Strip trailing whitespace.
-  asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
+  asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
   return asm
 
 def scrub_asm_mips(asm, args):
   # Scrub runs of whitespace out of the assembly, but leave the leading
   # whitespace in place.
-  asm = SCRUB_WHITESPACE_RE.sub(r' ', asm)
+  asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)
   # Expand the tabs used for indentation.
   asm = string.expandtabs(asm, 2)
   # Strip trailing whitespace.
-  asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
+  asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
   return asm
 
 def scrub_asm_riscv(asm, args):
   # Scrub runs of whitespace out of the assembly, but leave the leading
   # whitespace in place.
-  asm = SCRUB_WHITESPACE_RE.sub(r' ', asm)
+  asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)
   # Expand the tabs used for indentation.
   asm = string.expandtabs(asm, 2)
   # Strip trailing whitespace.
-  asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
+  asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
   return asm
 
 def scrub_asm_systemz(asm, args):
   # Scrub runs of whitespace out of the assembly, but leave the leading
   # whitespace in place.
-  asm = SCRUB_WHITESPACE_RE.sub(r' ', asm)
+  asm = common.SCRUB_WHITESPACE_RE.sub(r' ', asm)
   # Expand the tabs used for indentation.
   asm = string.expandtabs(asm, 2)
   # Strip trailing whitespace.
-  asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
+  asm = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
   return asm
 
 
-# Build up a dictionary of all the function bodies.
-def build_function_body_dictionary(raw_tool_output, triple, prefixes, func_dict,
-                                   args):
+def build_function_body_dictionary_for_triple(args, raw_tool_output, triple, prefixes, func_dict):
   target_handlers = {
       'x86_64': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
       'i686': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
       'x86': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
       'i386': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
       'aarch64': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_RE),
       'arm-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
       'thumb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
def build_function_body_dictionary_for_triple(args, raw_tool_output, triple, prefixes, func_dict):
   for prefix, s in target_handlers.items():
     if triple.startswith(prefix):
       handlers = s
       break
   else:
     raise KeyError('Triple %r is not supported' % (triple))
 
   scrubber, function_re = handlers
-  for m in function_re.finditer(raw_tool_output):
-    if not m:
-      continue
-    func = m.group('func')
-    scrubbed_body = scrubber(m.group('body'), args)
-    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 args.verbose:
-      print >>sys.stderr, 'Processing function: ' + func
-      for l in scrubbed_body.splitlines():
-        print >>sys.stderr, '  ' + l
-    for prefix in prefixes:
-      if func in func_dict[prefix] and func_dict[prefix][func] != scrubbed_body:
-        if prefix == prefixes[-1]:
-          print >>sys.stderr, ('WARNING: Found conflicting asm under the '
-                               'same prefix: %r!' % (prefix,))
-        else:
-          func_dict[prefix][func] = None
-          continue
+  common.build_function_body_dictionary(
+          function_re, scrubber, [args], raw_tool_output, prefixes,
+          func_dict, args.verbose)
 
-      func_dict[prefix][func] = scrubbed_body
 
 
 def add_checks(output_lines, run_list, func_dict, func_name):
   printed_prefixes = []
   for p in run_list:
     checkprefixes = p[0]
     for checkprefix in checkprefixes:
       if checkprefix in printed_prefixes:
for checkprefix in checkprefixes:
       for func_line in func_body[1:]:
         output_lines.append('; %s-NEXT:  %s' % (checkprefix, func_line))
       # Add space between different check prefixes and the first line of code.
       # output_lines.append(';')
       break
   return output_lines
 
 
-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
-
 
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument('-v', '--verbose', action='store_true',
                       help='Show verbose output')
   parser.add_argument('--llc-binary', default='llc',
                       help='The "llc" binary to use to generate the test case')
   parser.add_argument(
       '--function', help='The function in the test file to update')
   parser.add_argument(
       '--x86_extra_scrub', action='store_true',
       help='Use more regex for x86 matching to reduce diffs between various subtargets')
   parser.add_argument('tests', nargs='+')
   args = parser.parse_args()
 
-  autogenerated_note = ('; NOTE: Assertions have been autogenerated by '
-                        'utils/' + os.path.basename(__file__))
+  autogenerated_note = (ADVERT + 'utils/' + os.path.basename(__file__))
 
   for test in args.tests:
     if args.verbose:
       print >>sys.stderr, 'Scanning for RUN lines in test file: %s' % (test,)
     with open(test) as f:
       input_lines = [l.rstrip() for l in f]
 
     triple_in_ir = None
     for l in input_lines:
       m = TRIPLE_IR_RE.match(l)
       if m:
         triple_in_ir = m.groups()[0]
         break
 
     raw_lines = [m.group(1)
-                 for m in [RUN_LINE_RE.match(l) for l in input_lines] if m]
+                 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 []
     for l in raw_lines[1:]:
       if run_lines[-1].endswith("\\"):
         run_lines[-1] = run_lines[-1].rstrip("\\") + " " + l
       else:
         run_lines.append(l)
 
     if args.verbose:
for l in run_lines:
 
       if not filecheck_cmd.startswith('FileCheck '):
         print >>sys.stderr, 'WARNING: Skipping non-FileChecked RUN line: ' + l
         continue
 
       llc_cmd_args = llc_cmd[len('llc'):].strip()
       llc_cmd_args = llc_cmd_args.replace('< %s', '').replace('%s', '').strip()
 
-      check_prefixes = [item for m in CHECK_PREFIX_RE.finditer(filecheck_cmd)
+      check_prefixes = [item for m in common.CHECK_PREFIX_RE.finditer(filecheck_cmd)
                                for item in m.group(1).split(',')]
       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.
       run_list.append((check_prefixes, llc_cmd_args, triple_in_cmd))
 
     func_dict = {}
     for p in run_list:
       prefixes = p[0]
       for prefix in prefixes:
         func_dict.update({prefix: dict()})
     for prefixes, llc_args, triple_in_cmd in run_list:
       if args.verbose:
         print >>sys.stderr, 'Extracted LLC cmd: llc ' + llc_args
         print >>sys.stderr, 'Extracted FileCheck prefixes: ' + str(prefixes)
 
-      raw_tool_output = llc(args, llc_args, test)
+      raw_tool_output = common.invoke_tool(args.llc_binary, llc_args, test)
       if not (triple_in_cmd or triple_in_ir):
         print >>sys.stderr, "Cannot find a triple. Assume 'x86'"
 
-      build_function_body_dictionary(raw_tool_output,
-          triple_in_cmd or triple_in_ir or 'x86', prefixes, func_dict, args)
+      build_function_body_dictionary_for_triple(args, raw_tool_output,
+          triple_in_cmd or triple_in_ir or 'x86', prefixes, func_dict)
 
     is_in_function = False
     is_in_function_start = False
     func_name = None
     prefix_set = set([prefix for p in run_list for prefix in p[0]])
     if args.verbose:
       print >>sys.stderr, 'Rewriting FileCheck prefixes: %s' % (prefix_set,)
     output_lines = []
     output_lines.append(autogenerated_note)
 
     for input_line in input_lines:
       if is_in_function_start:
         if input_line == '':
           continue
         if input_line.lstrip().startswith(';'):
-          m = CHECK_RE.match(input_line)
+          m = common.CHECK_RE.match(input_line)
           if not m or m.group(1) not in prefix_set:
             output_lines.append(input_line)
             continue
 
         # Print out the various check lines here.
         output_lines = add_checks(output_lines, run_list, func_dict, func_name)
         is_in_function_start = False
 
       if is_in_function:
-        if should_add_line_to_output(input_line, prefix_set) == True:
+        if common.should_add_line_to_output(input_line, prefix_set) == True:
           # This input line of the function body will go as-is into the output.
           output_lines.append(input_line)
         else:
           continue
         if input_line.strip() == '}':
           is_in_function = False
         continue
 
-      if input_line == autogenerated_note:
+      # Discard any previous script advertising.
+      if input_line.startswith(ADVERT):
         continue
 
       # If it's outside a function, it just gets copied to the output.
       output_lines.append(input_line)
 
       m = IR_FUNCTION_RE.match(input_line)
       if not m:
         continue

utils/update_test_checks.py

 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.
 
-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)
-SCRUB_KILL_COMMENT_RE = re.compile(r'^ *#+ +kill:.*\n')
 SCRUB_IR_COMMENT_RE = re.compile(r'\s*;.*')
 
-RUN_LINE_RE = re.compile('^\s*;\s*RUN:\s*(.*)$')
 IR_FUNCTION_RE = re.compile('^\s*define\s+(?:internal\s+)?[^@]*@([\w-]+)\s*\(')
 OPT_FUNCTION_RE = re.compile(
     r'^\s*define\s+(?:internal\s+)?[^@]*@(?P<func>[\w-]+?)\s*\('
     r'(\s+)?[^)]*[^{]*\{\n(?P<body>.*?)^\}$',
     flags=(re.M | re.S))
-CHECK_PREFIX_RE = re.compile('--?check-prefix(?:es)?=(\S+)')
-CHECK_RE = re.compile(r'^\s*;\s*([^:]+?)(?:-NEXT|-NOT|-DAG|-LABEL)?:')
 # Match things that look at identifiers, but only if they are followed by
 # spaces, commas, paren, or end of the string
 IR_VALUE_RE = re.compile(r'(\s+)%([\w\.]+?)([,\s\(\)]|\Z)')
 
 
-# Invoke the tool that is being tested.
-def invoke_tool(args, cmd_args, ir):
-  with open(ir) as ir_file:
-    stdout = subprocess.check_output(args.opt_binary + ' ' + cmd_args,
-                                     shell=True, stdin=ir_file)
-  # Fix line endings to unix CR style.
-  stdout = stdout.replace('\r\n', '\n')
-  return stdout
-
 
 def scrub_body(body, opt_basename):
   # Scrub runs of whitespace out of the assembly, but leave the leading
   # whitespace in place.
-  body = SCRUB_WHITESPACE_RE.sub(r' ', body)
+  body = common.SCRUB_WHITESPACE_RE.sub(r' ', body)
   # Expand the tabs used for indentation.
   body = string.expandtabs(body, 2)
   # Strip trailing whitespace.
-  body = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', body)
+  body = common.SCRUB_TRAILING_WHITESPACE_RE.sub(r'', body)
   return body
 
 
-# Build up a dictionary of all the function bodies.
-def build_function_body_dictionary(raw_tool_output, prefixes, func_dict, verbose, opt_basename):
-  func_regex = OPT_FUNCTION_RE
-  for m in func_regex.finditer(raw_tool_output):
-    if not m:
-      continue
-    func = m.group('func')
-    scrubbed_body = scrub_body(m.group('body'), opt_basename)
-    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:
-      print >>sys.stderr, 'Processing function: ' + func
-      for l in scrubbed_body.splitlines():
-        print >>sys.stderr, '  ' + l
-    for prefix in prefixes:
-      if func in func_dict[prefix] and func_dict[prefix][func] != scrubbed_body:
-        if prefix == prefixes[-1]:
-          print >>sys.stderr, ('WARNING: Found conflicting asm under the '
-                               'same prefix: %r!' % (prefix,))
-        else:
-          func_dict[prefix][func] = None
-          continue
-
-      func_dict[prefix][func] = scrubbed_body
-
 
 # Create a FileCheck variable name based on an IR name.
 def get_value_name(var):
   if var.isdigit():
     var = 'TMP' + var
   var = var.replace('.', '_')
   return var.upper()
 
for checkprefix in checkprefixes:
 
       # Add space between different check prefixes and also before the first
       # line of code in the test function.
       output_lines.append(';')
       break
   return output_lines
 
 
-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
-
-
 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(
def main():
 
   for test in args.tests:
     if args.verbose:
       print >>sys.stderr, 'Scanning for RUN lines in test file: %s' % (test,)
     with open(test) as f:
       input_lines = [l.rstrip() for l in f]
 
     raw_lines = [m.group(1)
-                 for m in [RUN_LINE_RE.match(l) for l in input_lines] if m]
+                 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 []
     for l in raw_lines[1:]:
       if run_lines[-1].endswith("\\"):
         run_lines[-1] = run_lines[-1].rstrip("\\") + " " + l
       else:
         run_lines.append(l)
 
     if args.verbose:
for l in run_lines:
 
       if not filecheck_cmd.startswith('FileCheck '):
         print >>sys.stderr, 'WARNING: Skipping non-FileChecked RUN line: ' + l
         continue
 
       tool_cmd_args = tool_cmd[len(opt_basename):].strip()
       tool_cmd_args = tool_cmd_args.replace('< %s', '').replace('%s', '').strip()
 
-      check_prefixes = [item for m in CHECK_PREFIX_RE.finditer(filecheck_cmd)
+      check_prefixes = [item for m in common.CHECK_PREFIX_RE.finditer(filecheck_cmd)
                                for item in m.group(1).split(',')]
       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()})
     for prefixes, opt_args in prefix_list:
       if args.verbose:
         print >>sys.stderr, 'Extracted opt cmd: ' + opt_basename + ' ' + opt_args
         print >>sys.stderr, 'Extracted FileCheck prefixes: ' + str(prefixes)
 
-      raw_tool_output = invoke_tool(args, opt_args, test)
-      build_function_body_dictionary(raw_tool_output, prefixes, func_dict, args.verbose, opt_basename)
+      raw_tool_output = common.invoke_tool(args.opt_binary, opt_args, test)
+      common.build_function_body_dictionary(
+              OPT_FUNCTION_RE, scrub_body, [opt_basename], raw_tool_output,
+              prefixes, func_dict, args.verbose)
 
     is_in_function = False
     is_in_function_start = False
     prefix_set = set([prefix for prefixes, _ in prefix_list for prefix in prefixes])
     if args.verbose:
       print >>sys.stderr, 'Rewriting FileCheck prefixes: %s' % (prefix_set,)
     output_lines = []
     output_lines.append(autogenerated_note)
 
     for input_line in input_lines:
       if is_in_function_start:
         if input_line == '':
           continue
         if input_line.lstrip().startswith(';'):
-          m = CHECK_RE.match(input_line)
+          m = common.CHECK_RE.match(input_line)
           if not m or m.group(1) not in prefix_set:
             output_lines.append(input_line)
             continue
 
         # Print out the various check lines here.
-        output_lines = add_checks(output_lines, prefix_list, func_dict, name, opt_basename)
+        output_lines = add_checks(output_lines, prefix_list, func_dict, func_name, opt_basename)
         is_in_function_start = False
 
       if is_in_function:
-        if should_add_line_to_output(input_line, prefix_set) == True:
+        if common.should_add_line_to_output(input_line, prefix_set) == True:
           # This input line of the function body will go as-is into the output.
           # Except make leading whitespace uniform: 2 spaces.
-          input_line = SCRUB_LEADING_WHITESPACE_RE.sub(r'  ', input_line)
+          input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(r'  ', input_line)
           output_lines.append(input_line)
         else:
           continue
         if input_line.strip() == '}':
           is_in_function = False
         continue
 
       # Discard any previous script advertising.
       if input_line.startswith(ADVERT):
         continue
 
       # If it's outside a function, it just gets copied to the output.
       output_lines.append(input_line)
 
       m = IR_FUNCTION_RE.match(input_line)
       if not m:
         continue
-      name = m.group(1)
-      if args.function is not None and name != args.function:
+      func_name = m.group(1)
+      if args.function is not None and func_name != args.function:
         # When filtering on a specific function, skip all others.
         continue
       is_in_function = is_in_function_start = True
 
     if args.verbose:
       print>>sys.stderr, 'Writing %d lines to %s...' % (len(output_lines), test)
 
     with open(test, 'wb') as f:
       f.writelines([l + '\n' for l in output_lines])
 
 
 if __name__ == '__main__':
   main()
-