Rename option to check-inst-comments

Author: Camsyn

llvm/utils/UpdateTestChecks/common.py

@@ -2090,7 +2090,7 @@ def add_checks(
     global_tbaa_records_for_prefixes={},
     preserve_names=False,
     original_check_lines: Mapping[str, List[str]] = {},
-    check_comments=True,
+    check_inst_comments=True,
 ):
     # prefix_exclusions are prefixes we cannot use to print the function because it doesn't exist in run lines that use these prefixes as well.
     prefix_exclusions = set()
@@ -2288,8 +2288,8 @@ def add_checks(
                     global_tbaa_records,
                     preserve_names,
                     original_check_lines=original_check_lines.get(checkprefix),
-                    # IR output might require comments checks, e.g., predicate info, memssa
-                    ignore_all_comments=not check_comments,
+                    # IR output might require comments checks, e.g., print-predicate-info, print<memssa>
+                    ignore_all_comments=not check_inst_comments,
                 )
 
                 # This could be selectively enabled with an optional invocation argument.
@@ -2309,7 +2309,7 @@ def add_checks(
                     if func_line.strip() == "":
                         is_blank_line = True
                         continue
-                    if not check_comments:
+                    if not check_inst_comments:
                         # Do not waste time checking IR comments unless necessary.
                         func_line = SCRUB_IR_COMMENT_RE.sub(r"", func_line)
 
@@ -2353,7 +2353,7 @@ def add_ir_checks(
     global_vars_seen_dict,
     global_tbaa_records_for_prefixes,
     is_filtered,
-    check_comments=False,
+    check_inst_comments=False,
     original_check_lines={},
 ):
     assert ginfo.is_ir()
@@ -2380,7 +2380,7 @@ def add_ir_checks(
         global_tbaa_records_for_prefixes,
         preserve_names,
         original_check_lines=original_check_lines,
-        check_comments=check_comments,
+        check_inst_comments=check_inst_comments,
     )
 
 

llvm/utils/update_test_checks.py

@@ -197,7 +197,7 @@ def update_test(ti: common.TestInfo):
                     global_tbaa_records_for_prefixes,
                     is_filtered=builder.is_filtered(),
                     original_check_lines=original_check_lines.get(func, {}),
-                    check_comments=args.check_comments,
+                    check_inst_comments=args.check_inst_comments,
                 ),
             )
         )
@@ -231,7 +231,7 @@ def update_test(ti: common.TestInfo):
                         global_tbaa_records_for_prefixes,
                         is_filtered=builder.is_filtered(),
                         original_check_lines=original_check_lines.get(func_name, {}),
-                        check_comments=args.check_comments,
+                        check_inst_comments=args.check_inst_comments,
                     )
                 )
                 is_in_function_start = False
@@ -365,10 +365,10 @@ def main():
         help="Check global entries (global variables, metadata, attribute sets, ...) for functions",
     )
     parser.add_argument(
-        "--check-comments",
+        "--check-inst_comments",
         action="store_true",
         default=False,
-        help="Check the generated comments (e.g., PredicateInfo/MemSSA) for functions",
+        help="Check the generated comments describing instructions (e.g., -print-predicate-info/print<memssa>)",
     )
     parser.add_argument(
         "--reset-variable-names",