Remove extra indentation from MIR check lines

Author: vpykhtin

llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/x86_asm_mir_mixed.ll.expected

@@ -8,14 +8,14 @@ define i64 @test1(i64 %i) nounwind readnone {
 ; ASM-NEXT:    movq %rdi, %rax
 ; ASM-NEXT:    addq -{{[0-9]+}}(%rsp), %rax
 ; ASM-NEXT:    retq
-  ; MIR-LABEL: name: test1
-  ; MIR: bb.0 (%ir-block.0):
-  ; MIR-NEXT:   liveins: $rdi
-  ; MIR-NEXT: {{  $}}
-  ; MIR-NEXT:   [[COPY:%[0-9]+]]:gr64 = COPY $rdi
-  ; MIR-NEXT:   [[ADD64rm:%[0-9]+]]:gr64 = ADD64rm [[COPY]], %stack.0.loc, 1, $noreg, 0, $noreg, implicit-def dead $eflags :: (dereferenceable load (s64) from %ir.loc)
-  ; MIR-NEXT:   $rax = COPY [[ADD64rm]]
-  ; MIR-NEXT:   RET 0, $rax
+; MIR-LABEL: name: test1
+; MIR: bb.0 (%ir-block.0):
+; MIR-NEXT:   liveins: $rdi
+; MIR-NEXT: {{  $}}
+; MIR-NEXT:   [[COPY:%[0-9]+]]:gr64 = COPY $rdi
+; MIR-NEXT:   [[ADD64rm:%[0-9]+]]:gr64 = ADD64rm [[COPY]], %stack.0.loc, 1, $noreg, 0, $noreg, implicit-def dead $eflags :: (dereferenceable load (s64) from %ir.loc)
+; MIR-NEXT:   $rax = COPY [[ADD64rm]]
+; MIR-NEXT:   RET 0, $rax
   %loc = alloca i64
   %j = load i64, i64 * %loc
   %r = add i64 %i, %j
@@ -28,15 +28,15 @@ define i64 @test2(i32 %i) nounwind readnone {
 ; ASM-NEXT:    movl %edi, %eax
 ; ASM-NEXT:    addl -{{[0-9]+}}(%rsp), %eax
 ; ASM-NEXT:    retq
-  ; MIR-LABEL: name: test2
-  ; MIR: bb.0 (%ir-block.0):
-  ; MIR-NEXT:   liveins: $edi
-  ; MIR-NEXT: {{  $}}
-  ; MIR-NEXT:   [[COPY:%[0-9]+]]:gr32 = COPY $edi
-  ; MIR-NEXT:   [[ADD32rm:%[0-9]+]]:gr32 = ADD32rm [[COPY]], %stack.0.loc, 1, $noreg, 0, $noreg, implicit-def dead $eflags :: (dereferenceable load (s32) from %ir.loc)
-  ; MIR-NEXT:   [[SUBREG_TO_REG:%[0-9]+]]:gr64 = SUBREG_TO_REG 0, killed [[ADD32rm]], %subreg.sub_32bit
-  ; MIR-NEXT:   $rax = COPY [[SUBREG_TO_REG]]
-  ; MIR-NEXT:   RET 0, $rax
+; MIR-LABEL: name: test2
+; MIR: bb.0 (%ir-block.0):
+; MIR-NEXT:   liveins: $edi
+; MIR-NEXT: {{  $}}
+; MIR-NEXT:   [[COPY:%[0-9]+]]:gr32 = COPY $edi
+; MIR-NEXT:   [[ADD32rm:%[0-9]+]]:gr32 = ADD32rm [[COPY]], %stack.0.loc, 1, $noreg, 0, $noreg, implicit-def dead $eflags :: (dereferenceable load (s32) from %ir.loc)
+; MIR-NEXT:   [[SUBREG_TO_REG:%[0-9]+]]:gr64 = SUBREG_TO_REG 0, killed [[ADD32rm]], %subreg.sub_32bit
+; MIR-NEXT:   $rax = COPY [[SUBREG_TO_REG]]
+; MIR-NEXT:   RET 0, $rax
   %loc = alloca i32
   %j = load i32, i32 * %loc
   %r = add i32 %i, %j

llvm/utils/UpdateTestChecks/common.py

@@ -2549,6 +2549,7 @@ def add_mir_checks_for_function(
     print_fixed_stack,
     first_check_is_next,
     at_the_function_name,
+    check_indent=None,
 ):
     printed_prefixes = set()
     for run in run_list:
@@ -2571,6 +2572,7 @@ def add_mir_checks_for_function(
                 func_dict[prefix][func_name],
                 print_fixed_stack,
                 first_check_is_next,
+                check_indent,
             )
             break
         else:
@@ -2590,6 +2592,7 @@ def add_mir_check_lines(
     func_info,
     print_fixed_stack,
     first_check_is_next,
+    check_indent=None,
 ):
     func_body = str(func_info).splitlines()
     if single_bb:
@@ -2606,7 +2609,11 @@ def add_mir_check_lines(
     first_line = func_body[0]
     indent = len(first_line) - len(first_line.lstrip(" "))
     # A check comment, indented the appropriate amount
-    check = "{:>{}}; {}".format("", indent, prefix)
+    # If check_indent is provided, use it; otherwise, auto-detect from MIR body
+    if check_indent is not None:
+        check = "{}; {}".format(check_indent, prefix)
+    else:
+        check = "{:>{}}; {}".format("", indent, prefix)
 
     output_lines.append("{}-LABEL: name: {}".format(check, func_name))
 

llvm/utils/update_llc_test_checks.py

@@ -261,6 +261,7 @@ def update_test(ti: common.TestInfo):
                         print_fixed_stack=False,  # Don't print fixed stack (ASM tests don't need it).
                         first_check_is_next=False,  # First check is LABEL, not NEXT.
                         at_the_function_name=False,  # Use "name:" not "@name".
+                        check_indent="",  # No indentation for IR files (not MIR files).
                     )
 
                 is_in_function_start = False