[PATCH] D44400: Fix LLVM IR check lines in utils/update_cc_test_checks.py

[Fangrui Song via Phabricator via llvm-commits]

MaskRay created this revision.
MaskRay added a reviewer: arichardson.
Herald added a subscriber: llvm-commits.

Repository:
  rL LLVM

https://reviews.llvm.org/D44400

Files:
  utils/UpdateTestChecks/common.py
  utils/update_cc_test_checks.py
  utils/update_test_checks.py


Index: utils/update_test_checks.py
===================================================================
--- utils/update_test_checks.py
+++ utils/update_test_checks.py
@@ -146,7 +146,7 @@
             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:
Index: utils/update_cc_test_checks.py
===================================================================
--- utils/update_cc_test_checks.py
+++ utils/update_cc_test_checks.py
@@ -226,8 +226,7 @@
             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.
Index: utils/UpdateTestChecks/common.py
===================================================================
--- utils/UpdateTestChecks/common.py
+++ utils/UpdateTestChecks/common.py
@@ -155,12 +155,13 @@
   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
@@ -200,13 +201,15 @@
 
         # 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D44400.138077.patch
Type: text/x-patch
Size: 2660 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180312/fae24277/attachment.bin>