Fix LLVM IR check lines in utils/update_cc_test_checks.py

[MaskRay]

utils/update_test_checks.py still works.

Verified with utils/update_test_checks.py --opt-binary=~/Dev/llvm/release/bin/opt test/CodeGen/Generic/expand-experimental-reductions.ll

asm and IR check lines really should be unified..

[arichardson]

Just tested it and it works perfectly for me.

[mike.dvoretsky]

Could somebody here please clarify what's happening with test/CodeGen/X86/avx2-intrinsics-x86.ll? Before recent changes to the utils (D42654, D42805, this) it had a pattern ret{{l|q}} with which the same blocks of checks corresponded to 2 run lines each. Now the utils produce separate checks for those lines. Was this intended? If so, please update the tests after your changes, otherwise it may be an issue with the utils.

[RKSimon]

In D44400#1055628, @mike.dvoretsky wrote:

Could somebody here please clarify what's happening with test/CodeGen/X86/avx2-intrinsics-x86.ll? Before recent changes to the utils (D42654, D42805, this) it had a pattern ret{{l|q}} with which the same blocks of checks corresponded to 2 run lines each. Now the utils produce separate checks for those lines. Was this intended? If so, please update the tests after your changes, otherwise it may be an issue with the utils.

Some x86 test files were generated with the '--x86_extra_scrub' flag - as part of an ongoing attempt to merge 32/64 bit checks that only differ with the retl/retq - see PR35003

[MaskRay]

Regarding test/CodeGen/X86/avx2-intrinsics-x86.ll
Several RUN lines share the same --check-prefix=. I am not sure the CHECK lines were created by utils/update_llc_test_checks.py. It is very likely hand-crafted after applying the tool.

[RKSimon]

In D44400#1056172, @MaskRay wrote:

Regarding test/CodeGen/X86/avx2-intrinsics-x86.ll
Several RUN lines share the same --check-prefix=. I am not sure the CHECK lines were created by utils/update_llc_test_checks.py. It is very likely hand-crafted after applying the tool.

First step - get rid of --x86_extra_scrub entirely so we don't rely on updating the scripts with an optional arg.

@MaskRay Is there any chance you could help here? We need the ret{{[l|q]}} pattern to be used only if that is the only diff between 32/64 bit codegen and it allows us to use a common prefix

utils/UpdateTestChecks/common.py

for i, line in enumerate(lines):
     # An IR variable named '%.' matches the FileCheck regex string.
     line = line.replace('%.', '%dot')
     # Ignore any comments, since the check lines will too.
     scrubbed_line = SCRUB_IR_COMMENT_RE.sub(r'', line)
     lines[i] =  IR_VALUE_RE.sub(transform_line_vars, scrubbed_line)
   return lines
 
 
-def add_ir_checks(output_lines, prefix_list, func_dict, func_name, opt_basename):
+def add_ir_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
   # Label format is based on IR string.
-  check_label_format = "; %s-LABEL: @%s("
+  check_label_format = '{} %s-LABEL: @%s('.format(comment_marker)
 
   printed_prefixes = []
-  for checkprefixes, _ in prefix_list:
+  for p in prefix_list:
+    checkprefixes = p[0]
     for checkprefix in checkprefixes:
       if checkprefix in printed_prefixes:
         break
       if not func_dict[checkprefix][func_name]:
         continue
       # Add some space between different check prefixes, but not after the last
       # check line (before the test code).
       #if len(printed_prefixes) != 0:
for checkprefix in checkprefixes:
         if func_line.strip() == '':
           is_blank_line = True
           continue
         # Do not waste time checking IR comments.
         func_line = SCRUB_IR_COMMENT_RE.sub(r'', func_line)
 
         # Skip blank lines instead of checking them.
         if is_blank_line == True:
-          output_lines.append('; %s:       %s' % (checkprefix, func_line))
+          output_lines.append('{} {}:       {}'.format(
+              comment_marker, checkprefix, func_line))
         else:
-          output_lines.append('; %s-NEXT:  %s' % (checkprefix, func_line))
+          output_lines.append('{} {}-NEXT:  {}'.format(
+              comment_marker, checkprefix, func_line))
         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(';')
+      output_lines.append(comment_marker)
       break
   return output_lines

utils/update_cc_test_checks.py

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)
-            # This is also used for adding IR CHECK lines.
-            asm.add_asm_checks(output_lines, '//', run_list, func_dict, mangled)
+            common.add_ir_checks(output_lines, '//', run_list, func_dict, mangled)
       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())

utils/update_test_checks.py

for input_line in input_lines:
           continue
         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.
-        output_lines = common.add_ir_checks(output_lines, prefix_list, func_dict, func_name, opt_basename)
+        output_lines = common.add_ir_checks(output_lines, ';', prefix_list, func_dict, func_name)
         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)