[DebugInfo][InstrRef] "Final" test cleanup switching x86 tests to instruction referencing

[jmorse]

Summary

These are some final test changes for using instruction referencing on X86:

• Most of these tests just have the flag switched so that they run with instr-ref, and just work: these tests were fixed by earlier patches.
• One or two have minor differences in how debug values are printed in textual output,
• A couple have different temporary labels in the text asm output, due to more MCSymbols being created in the output. The actual variable locations don't change.
• One test checking for "debug-location !1234" at the end of DBG_VALUEs is modified because InstrRefBasedLDV creates new DILocations for variable locations, they don't get assigned metadata node numbers, and are instead represented inline. This test isn't checking for line number information though, so it's not important.

[jmorse]

Fold in a change to 2010-05-26-DotDebugLoc.ll -- I wasn't sure why it needed a change, however it turns out to be spurious too. In DBG_VALUE mode, a DBG_VALUE is issued after a copy of the argument $rdi to $rbx, but in instr-ref mode that copy is deferred until after an instruction that clobbers $rdi. Hence, we expect the location-list MCSymbol to come after one additional copy.

[jmorse]

Remove live-debug-variables.ll from the test updates -- on closer inspection, this turns out to be exercising a specific part of LiveDebugVariables to endure that it does coalesce virtual registers together. That's not something instruction referencing has any part of, so w should leave it as explicitly testing DBG_VALUE mode.

[djtodoro]

llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll

62 ↗

(On Diff #389959)

why this? Is this a code change?

llvm/test/tools/llvm-locstats/locstats.ll

18

Cool :)

[jmorse]

llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll

62 ↗

(On Diff #389959)

It's not a code change, instead the position at which a variable location changes has moved. With DBG_VALUEs it's:

DBG_VALUE $rdi
....
$rbx = MOV64rr $rdi
DBG_VALUE $rbx, $noreg, !18, !DIExpression(), 
renamable $edi = MOV32rm $rdi, 1, $noreg, 0, $noreg, ...

But with instruction referencing it's:

DBG_VALUE $rdi
...
$rbx = MOV64rr $rdi
renamable $edi = MOV32rm $rdi, 1, $noreg, 0, $noreg, 
DBG_VALUE $rbx, $noreg, !18, !DIExpression(),

The reason why is that VarLocBasedLDV will follow the COPY from a volatile register to a non-volatile immediately, but InstrRefBasedLDV waits until $rdi is clobbered before moving the variable location. That moves the ".Ltmp" symbol for where the variable changes location to be one instruction later.

Looking at it again, it needs the comment above to be updated.

[djtodoro]

llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll

62 ↗

(On Diff #389959)

OK, got it. So the comment above should be updated.

[jmorse]

Update a comment in 2010-05-25-DotDebugLoc.ll to reflect the new layout of debug instructions.

[djtodoro]

Small nit. Otherwise lgtm.

llvm/test/CodeGen/X86/2010-05-26-DotDebugLoc.ll

60 ↗

(On Diff #389978)

llvm/test/CodeGen/MIR/X86/diexpr-win32.mir

-# RUN: llc -start-after=prologepilog -filetype=obj -O0 %s -o - -experimental-debug-variable-locations=false | llvm-readobj --codeview - | FileCheck %s
+# RUN: llc -start-after=prologepilog -filetype=obj -O0 %s -o - -experimental-debug-variable-locations=true | llvm-readobj --codeview - | FileCheck %s
 
 # Offsets are now CFA, or VFRAME, relative. Both the NRVO sret pointer and the
 # string* parameter are on the stack, NRVO at offset 4 (after RA), and Str at
 # offset 8 (next slot). The stack size is 4, so the DW_OP_plus_uconst math
 # works out.
 
 # (DW_OP_plus_uconst 12)
 # CHECK: LocalSym {

llvm/test/CodeGen/X86/fast-regalloc-live-out-debug-values.mir

 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
-# RUN: llc -O0 -mtriple=x86_64-unknown-linux-gnu -start-before=regallocfast -stop-after=livedebugvalues -verify-machineinstrs -o - %s -experimental-debug-variable-locations=false | FileCheck %s
+# RUN: llc -O0 -mtriple=x86_64-unknown-linux-gnu -start-before=regallocfast -stop-after=livedebugvalues -verify-machineinstrs -o - %s -experimental-debug-variable-locations=true | FileCheck %s
 # DBG_VALUEs for %0 should be present in the use blocks
 
 --- |
   define dso_local i32 @foo(i32 %a) #0 !dbg !6 {
   entry:
     %a.addr = alloca i32, align 4
     %saved_stack = alloca i8*, align 8
     %__vla_expr0 = alloca i64, align 8

llvm/test/DebugInfo/COFF/fpo-shrink-wrap.ll

-; RUN: llc -enable-shrink-wrap=true < %s -experimental-debug-variable-locations=false | FileCheck %s --check-prefix=ASM
-; RUN: llc -enable-shrink-wrap=true -filetype=obj < %s -experimental-debug-variable-locations=false | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ
+; RUN: llc -enable-shrink-wrap=true < %s -experimental-debug-variable-locations=true | FileCheck %s --check-prefix=ASM
+; RUN: llc -enable-shrink-wrap=true -filetype=obj < %s -experimental-debug-variable-locations=true | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ
 
 ; C source:
 ; int doSomething(int*);
 ; int __fastcall shrink_wrap_basic(int a, int b, int c, int d) {
 ;   if (a < b)
 ;     return a;
 ;   for (int i = c; i < d; ++i)
 ;     doSomething(&c);

 
 ; ASM:         calll   _doSomething
 
 ; ASM:         popl    %esi
 ; ASM:         popl    %edi
 ; ASM:         popl    %ebx
 ; ASM: [[EPILOGUE]]:                                 # %return
 ; ASM:         retl    $8
-; ASM: Ltmp11:
+; ASM: Ltmp12:
 ; ASM:         .cv_fpo_endproc
 
 ; Note how RvaStart advances 7 bytes to skip the shrink-wrapped portion.
 ; OBJ: SubSectionType: FrameData (0xF5)
 ; OBJ:    FrameData {
 ; OBJ:      RvaStart: 0x0
 ; OBJ:      CodeSize: 0x34
 ; OBJ:      PrologSize: 0x9

llvm/test/DebugInfo/COFF/fpo-stack-protect.ll

-; RUN: llc < %s -experimental-debug-variable-locations=false | FileCheck %s
+; RUN: llc < %s -experimental-debug-variable-locations=true | FileCheck %s
 
 ; C source:
 ; void escape(int *);
 ; int ssp(int a) {
 ;   int arr[4] = {a, a, a, a};
 ;   escape(&arr[0]);
 ;   return a;
 ; }

 
 ; CHECK:         calll   _escape
 ; CHECK:         calll   @__security_check_cookie@4
 
 ; CHECK:         movl    %esi, %eax
 ; CHECK:         addl    $20, %esp
 ; CHECK:         popl    %esi
 ; CHECK:         retl
-; CHECK: Ltmp3:
+; CHECK: Ltmp4:
 ; CHECK:         .cv_fpo_endproc
 
 ; ModuleID = 't.c'
 source_filename = "t.c"
 target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i386-pc-windows-msvc19.11.25508"
 
 ; Function Attrs: nounwind sspstrong

llvm/test/DebugInfo/COFF/types-array-advanced.ll

-; RUN: llc < %s -filetype=obj -experimental-debug-variable-locations=false | llvm-readobj - --codeview | FileCheck %s
-; RUN: llc < %s -experimental-debug-variable-locations=false | llvm-mc -filetype=obj --triple=i686-windows | llvm-readobj - --codeview | FileCheck %s
+; RUN: llc < %s -filetype=obj -experimental-debug-variable-locations=true | llvm-readobj - --codeview | FileCheck %s
+; RUN: llc < %s -experimental-debug-variable-locations=true | llvm-mc -filetype=obj --triple=i686-windows | llvm-readobj - --codeview | FileCheck %s
 
 ; C++ source to regenerate:
 ; $ cat t.cpp
 ; char multi_dim_arr[2][5][7];
 ;
 ; struct incomplete_struct(*p_incomplete_struct_arr)[3];
 ; struct incomplete_struct {
 ;   int s1;

llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir

 # RUN: llc -run-pass=livedebugvalues -march=x86-64 -o - %s  \
 # RUN:  -experimental-debug-variable-locations=false \
 # RUN: | FileCheck %s --check-prefixes=CHECK,VARLOCLDV
-# RUN: llc -force-instr-ref-livedebugvalues=1 -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s --check-prefixes=CHECK,INSTRREFLDV
+# RUN: llc -run-pass=livedebugvalues -march=x86-64 -o - %s \
+# RUN:  -experimental-debug-variable-locations=true \
+# RUN: | FileCheck %s --check-prefixes=CHECK,INSTRREFLDV
 #
 #extern void fn1 (int, int, int);
 #
 #__attribute__((noinline))
 #int
 #fn2 (int a, int b, int c) {
 #  int q = 2 + a;
 #

llvm/test/DebugInfo/MIR/X86/kill-entry-value-after-diamond-bbs.mir

 # RUN: llc -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s -experimental-debug-variable-locations=false | FileCheck %s --check-prefixes=CHECK,VARLOCLDV
-# RUN: llc -debug-entry-values -force-instr-ref-livedebugvalues=1 -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s --check-prefixes=CHECK,INSTRREFLDV
+# RUN: llc -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s -experimental-debug-variable-locations=true | FileCheck %s --check-prefixes=CHECK,INSTRREFLDV
 #
 # The test case was artificially adjusted, in order to make proper diamond basic
 # block structure relevant to the debug entry values clobbering.
 #
 # CHECK: ![[ARG_B:.*]] = !DILocalVariable(name: "b"
 # CHECK: bb.0.entry
 # CHECK: DBG_VALUE $esi, $noreg, ![[ARG_B]], !DIExpression()
 # CHECK: bb.1.if.then

llvm/test/DebugInfo/MIR/X86/live-debug-values-restore.mir

 # RUN: llc -run-pass livedebugvalues -march=x86-64 -o - %s \
-# RUN:  -experimental-debug-variable-locations=false | FileCheck %s
+# RUN:  -experimental-debug-variable-locations=true | FileCheck %s
 
 # Generated from the following source with:
 # clang -g -mllvm -stop-before=livedebugvalues -S -O2 test.c -o test.mir
 # Then more functions added to test for extra behaviours with complex
 # expressions:
 #   'g': test for a crash from PR42773
 #   'h': complex expressions should be restored
 #   'i': spills should be restored across block boundaries

llvm/test/DebugInfo/X86/dbg-addr-dse.ll

-; RUN: llc %s -o %t.s -experimental-debug-variable-locations=false
+; RUN: llc %s -o %t.s -experimental-debug-variable-locations=true
 ; RUN: llvm-mc %t.s -filetype=obj -triple=x86_64-windows-msvc -o %t.o
 ; RUN: FileCheck %s < %t.s --check-prefix=ASM
 ; RUN: llvm-dwarfdump %t.o | FileCheck %s --check-prefix=DWARF
 
 ; In this example, the variable lives mostly in memory, but at the point of the
 ; assignment to global, it lives nowhere, and is described as the constant
 ; value 1.
 

llvm/test/DebugInfo/X86/live-debug-variables.ll

-; RUN: llc -mtriple=x86_64-linux-gnu -filetype=obj -o - %s -experimental-debug-variable-locations=false | llvm-dwarfdump -name i4 - \
+; RUN: llc -mtriple=x86_64-linux-gnu -filetype=obj -o - %s -experimental-debug-variable-locations=true | llvm-dwarfdump -name i4 - \
 ; RUN:     | FileCheck %s
 
 ; The test inlines the function F four times, with each inlined variable for
 ; "i4" sharing the same virtual register. This means the live interval of the
 ; register spans all of the inlined callsites, extending beyond the lexical
 ; scope of each. Later during register allocation the live interval is split
 ; into multiple intervals. Check that this does not generate multiple entries
 ; within the debug location (see PR33730).

llvm/test/DebugInfo/X86/sdag-split-arg.ll

-; RUN: llc -O0 -filetype=asm %s -o - -experimental-debug-variable-locations=false | FileCheck %s
+; RUN: llc -O0 -filetype=asm %s -o - -experimental-debug-variable-locations=true | FileCheck %s
 ; Test large integral function arguments passed in multiple registers.
 ; CHECK: DEBUG_VALUE: foo:bar <- [DW_OP_LLVM_fragment 64 16] ${{([a-d]x)|(si)|(di)|(bp)|(r[0-9]+w)}}
 ; CHECK: DEBUG_VALUE: foo:bar <- [DW_OP_LLVM_fragment 48 16] ${{([a-d]x)|(si)|(di)|(bp)|(r[0-9]+w)}}
 ; CHECK: DEBUG_VALUE: foo:bar <- [DW_OP_LLVM_fragment 32 16] ${{([a-d]x)|(si)|(di)|(bp)|(r[0-9]+w)}}
 ; CHECK: DEBUG_VALUE: foo:bar <- [DW_OP_LLVM_fragment 16 16] ${{([a-d]x)|(si)|(di)|(bp)|(r[0-9]+w)}}
 ; CHECK: DEBUG_VALUE: foo:bar <- [DW_OP_LLVM_fragment 0 16]  ${{([a-d]x)|(si)|(di)|(bp)|(r[0-9]+w)}}
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"

llvm/test/DebugInfo/X86/sdagsplit-1.ll

-; RUN: llc %s -stop-after=livedebugvars -o %t -experimental-debug-variable-locations=false
+; RUN: llc %s -stop-after=livedebugvars -o %t -experimental-debug-variable-locations=true
 ; RUN: cat %t | FileCheck %s
 ;
 ; Test that we can emit debug info for large values that are split
 ; up across multiple registers by the SelectionDAG type legalizer.
 ;
 ;    // Compile with -O1 -m32.
 ;    long long foo (long long a, long long b)
 ;    {
 ;      long long res = b+1;
 ;      if ( a == b )
 ;        return res;
 ;      return 0;
 ;    }
 ;
-; CHECK-DAG: DBG_VALUE ${{[a-z]+}}, $noreg, !{{[0-9]+}}, !DIExpression(DW_OP_LLVM_fragment, 0, 32), debug-location !{{[0-9]+}}
-; CHECK-DAG: DBG_VALUE ${{[a-z]+}}, $noreg, !{{[0-9]+}}, !DIExpression(DW_OP_LLVM_fragment, 32, 32), debug-location !{{[0-9]+}}
+; CHECK-DAG: DBG_VALUE ${{[a-z]+}}, $noreg, !{{[0-9]+}}, !DIExpression(DW_OP_LLVM_fragment, 0, 32), debug-location
+; CHECK-DAG: DBG_VALUE ${{[a-z]+}}, $noreg, !{{[0-9]+}}, !DIExpression(DW_OP_LLVM_fragment, 32, 32), debug-location
 
 ; ModuleID = 'sdagsplit-1.c'
 target datalayout = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128"
 target triple = "i386"
 
 ; Function Attrs: nounwind readnone
 define i64 @foo(i64 %a, i64 %b) local_unnamed_addr #0 !dbg !8 {
 entry:

llvm/test/tools/llvm-locstats/locstats.ll

 ; UNSUPPORTED: system-windows
 ; REQUIRES: x86-registered-target
-; RUN: llc %s -o %t0.o -filetype=obj -experimental-debug-variable-locations=false
+; RUN: llc %s -o %t0.o -filetype=obj -experimental-debug-variable-locations=true
 ; RUN: %llvm-locstats %t0.o | FileCheck %s --check-prefix=LOCSTATS
 ;
 ; Test the llvm-locstats output.
 ; LOCSTATS: 0% 0 0%
 ; LOCSTATS: (0%,10%) 0 0%
 ; LOCSTATS: [10%,20%) 0 0%
 ; LOCSTATS: [20%,30%) 1 11%
 ; LOCSTATS: [30%,40%) 0 0%
 ; LOCSTATS: [40%,50%) 0 0%
 ; LOCSTATS: [50%,60%) 0 0%
-; LOCSTATS: [60%,70%) 3 33%
+; LOCSTATS: [60%,70%) 1 11%
 ; LOCSTATS: [70%,80%) 0 0%
 ; LOCSTATS: [80%,90%) 2 22%
 ; LOCSTATS: [90%,100%) 1 11%
-; LOCSTATS: 100% 2 22%
+; LOCSTATS: 100% 4 44%
 ;
 ; The source code of the test case:
 ;extern int fn2 (int);
 ;
 ;__attribute__((noinline))
 ;int
 ;fn1 (int *x, int *y)
 ;{