[Utils] Hide the default behavior change of D68819 under a flag

[jdoerfert]

Summary

With D69701, the options used when running the script on a file will be
recorded and reused on a rerun. This allows us to hide new features
behind flags, starting with the "define" that was introduced in D68819.

[xbolva00]

+1

[jdoerfert]

closed in e67f6477fd1e

llvm/utils/UpdateTestChecks/common.py

for checkprefix in checkprefixes:
         is_blank_line = False
 
       # Add space between different check prefixes and also before the first
       # line of code in the test function.
       output_lines.append(comment_marker)
       break
 
 def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict,
-                  func_name, preserve_names):
+                  func_name, preserve_names, function_sig):
   # Label format is based on IR string.
-  function_def_regex = 'define {{[^@]+}}'
+  function_def_regex = 'define {{[^@]+}}' if function_sig else ''
   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,
              check_label_format, False, preserve_names)
 
 def add_analyze_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
   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)
 

llvm/utils/update_cc_test_checks.py

 def main():
   args = config()
   script_name = os.path.basename(__file__)
   autogenerated_note = (ADVERT + 'utils/' + script_name)
 
   for filename in args.tests:
     with open(filename) as f:
       input_lines = [l.rstrip() for l in f]
-    
     first_line = input_lines[0] if input_lines else ""
     if 'autogenerated' in first_line and script_name not in first_line:
       common.warn("Skipping test which wasn't autogenerated by " + script_name, filename)
       continue
 
     if args.update_only:
       if not first_line or 'autogenerated' not in first_line:
         common.warn("Skipping test which isn't autogenerated: " + filename)
for idx, line in enumerate(input_lines):
           # we simply require the spelling name to appear on the line
           # to exclude functions from other files.
           if mangled in added or spell not in line:
             continue
           if args.functions is None or any(re.search(regex, spell) for regex in args.functions):
             if added:
               output_lines.append('//')
             added.add(mangled)
-            common.add_ir_checks(output_lines, '//', run_list, func_dict, mangled, False)
+            common.add_ir_checks(output_lines, '//', run_list, func_dict, mangled, False, False)
       output_lines.append(line.rstrip('\n'))
 
     # Update the test file.
     with open(filename, 'w') as f:
       for line in output_lines:
         f.write(line + '\n')
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())

llvm/utils/update_test_checks.py

for input_line in input_lines:
         if input_line.lstrip().startswith(';'):
           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.
         common.add_ir_checks(output_lines, ';', prefix_list, func_dict,
-                             func_name, args.preserve_names)
+                             func_name, args.preserve_names, args.function_signature)
         is_in_function_start = False
 
       if is_in_function:
         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.
           # Except make leading whitespace uniform: 2 spaces.
           input_line = common.SCRUB_LEADING_WHITESPACE_RE.sub(r'  ', input_line)
           output_lines.append(input_line)