Fix check for instr-ref enabled, update test to check disabled case

Author: SLTozer

llvm/lib/CodeGen/RemoveLoadsIntoFakeUses.cpp

@@ -79,7 +79,7 @@ INITIALIZE_PASS_END(RemoveLoadsIntoFakeUses, DEBUG_TYPE,
 bool RemoveLoadsIntoFakeUses::runOnMachineFunction(MachineFunction &MF) {
   // Skip this pass if we would use VarLoc-based LDV, as there may be DBG_VALUE
   // instructions of the restored values that would become invalid.
-  if (debuginfoShouldUseDebugInstrRef(MF.getTarget().getTargetTriple()))
+  if (!MF.shouldUseDebugInstrRef())
     return false;
   // Only run this for functions that have fake uses.
   if (!MF.hasFakeUses() || skipFunction(MF.getFunction()))

llvm/test/CodeGen/X86/fake-use-remove-loads.mir

@@ -1,7 +1,8 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
 # Ensure that loads into FAKE_USEs are correctly removed by the
 # remove-loads-into-fake-uses pass.
-# RUN: llc -run-pass remove-loads-into-fake-uses -mtriple=x86_64-unknown-linux -debug-only=remove-loads-into-fake-uses 2>&1 -o - %s | FileCheck %s
+# RUN: llc -run-pass remove-loads-into-fake-uses -mtriple=x86_64-unknown-linux -debug-only=remove-loads-into-fake-uses 2>&1 -o - %s | FileCheck %s --check-prefix=ENABLED
+# RUN: llc -run-pass remove-loads-into-fake-uses -mtriple=x86_64-unknown-linux -debug-only=remove-loads-into-fake-uses -experimental-debug-variable-locations=false 2>&1 -o - %s | FileCheck %s --check-prefixes=DISABLED
 # REQUIRES: asserts
 #
 ## We verify that:
@@ -39,35 +40,66 @@ body:             |
   bb.0:
     liveins: $esi, $rdi, $rdx, $r15, $r14, $r13, $r12, $r11, $rbx
 
-    ; CHECK-LABEL: name: _ZN1g1jEv
-    ; CHECK: liveins: $esi, $rdi, $rdx, $r15, $r14, $r13, $r12, $r11, $rbx
-    ; CHECK-NEXT: {{  $}}
-    ; CHECK-NEXT: $rbx = MOV64rr $rdx
-    ; CHECK-NEXT: $r14d = MOV32rr $esi
-    ; CHECK-NEXT: $r15 = MOV64rr $rdi
-    ; CHECK-NEXT: renamable $r12d = XOR32rr undef $r12d, undef $r12d, implicit-def dead $eflags, implicit-def $r12
-    ; CHECK-NEXT: renamable $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, implicit-def $rax
+
+
+
+
+    ; ENABLED-LABEL: name: _ZN1g1jEv
+    ; ENABLED: liveins: $esi, $rdi, $rdx, $r15, $r14, $r13, $r12, $r11, $rbx
+    ; ENABLED-NEXT: {{  $}}
+    ; ENABLED-NEXT: $rbx = MOV64rr $rdx
+    ; ENABLED-NEXT: $r14d = MOV32rr $esi
+    ; ENABLED-NEXT: $r15 = MOV64rr $rdi
+    ; ENABLED-NEXT: renamable $r12d = XOR32rr undef $r12d, undef $r12d, implicit-def dead $eflags, implicit-def $r12
+    ; ENABLED-NEXT: renamable $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, implicit-def $rax
 
     ;; The store to the stack slot is still present.
-    ; CHECK-NEXT: MOV64mr $rbp, 1, $noreg, -48, $noreg, killed renamable $rax :: (store (s64) into %stack.0)
-  
-    ; CHECK-NEXT: MOV64mr $rbp, 1, $noreg, -40, $noreg, killed renamable $r11 :: (store (s64) into %stack.1)
-    ; CHECK-NEXT: renamable $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
-    ; CHECK-NEXT: $r13d = MOV32rr killed $eax
-    ; CHECK-NEXT: $rdi = MOV64rr $r15
-    ; CHECK-NEXT: CALL64r renamable $r12, csr_64, implicit $rsp, implicit $ssp, implicit $rdi, implicit-def $rsp, implicit-def $ssp
-    ; CHECK-NEXT: dead renamable $eax = MOV32rm renamable $rbx, 1, $noreg, 0, $noreg
-    ; CHECK-NEXT: renamable $eax = MOV32ri 1
-    ; CHECK-NEXT: TEST8ri renamable $r14b, 1, implicit-def $eflags
+    ; ENABLED-NEXT: MOV64mr $rbp, 1, $noreg, -48, $noreg, killed renamable $rax :: (store (s64) into %stack.0)
+
+    ; ENABLED-NEXT: MOV64mr $rbp, 1, $noreg, -40, $noreg, killed renamable $r11 :: (store (s64) into %stack.1)
+    ; ENABLED-NEXT: renamable $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
+    ; ENABLED-NEXT: $r13d = MOV32rr killed $eax
+    ; ENABLED-NEXT: $rdi = MOV64rr $r15
+    ; ENABLED-NEXT: CALL64r renamable $r12, csr_64, implicit $rsp, implicit $ssp, implicit $rdi, implicit-def $rsp, implicit-def $ssp
+    ; ENABLED-NEXT: dead renamable $eax = MOV32rm renamable $rbx, 1, $noreg, 0, $noreg
+    ; ENABLED-NEXT: renamable $eax = MOV32ri 1
+    ; ENABLED-NEXT: TEST8ri renamable $r14b, 1, implicit-def $eflags
     
     ;; First FAKE_USE and its corresponding load are removed; second FAKE_USE of
     ;; a restored value that is also used is preserved.
-    ; CHECK-NEXT: renamable $r11 = MOV64rm $rbp, 1, $noreg, -40, $noreg :: (load (s64) from %stack.1)
-    ; CHECK-NEXT: renamable $r12d = XOR32rr $r12d, $r11d, implicit-def dead $eflags
-    ; CHECK-NEXT: FAKE_USE killed renamable $r11d
+    ; ENABLED-NEXT: renamable $r11 = MOV64rm $rbp, 1, $noreg, -40, $noreg :: (load (s64) from %stack.1)
+    ; ENABLED-NEXT: renamable $r12d = XOR32rr $r12d, $r11d, implicit-def dead $eflags
+    ; ENABLED-NEXT: FAKE_USE killed renamable $r11d
+
+    ; ENABLED-NEXT: TEST32rr killed renamable $r13d, renamable $r13d, implicit-def $eflags
+    ; ENABLED-NEXT: RET64
+    ;
+    ; DISABLED-LABEL: name: _ZN1g1jEv
+    ; DISABLED: liveins: $esi, $rdi, $rdx, $r15, $r14, $r13, $r12, $r11, $rbx
+    ; DISABLED-NEXT: {{  $}}
+    ; DISABLED-NEXT: $rbx = MOV64rr $rdx
+    ; DISABLED-NEXT: $r14d = MOV32rr $esi
+    ; DISABLED-NEXT: $r15 = MOV64rr $rdi
+    ; DISABLED-NEXT: renamable $r12d = XOR32rr undef $r12d, undef $r12d, implicit-def dead $eflags, implicit-def $r12
+    ; DISABLED-NEXT: renamable $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags, implicit-def $rax
+    ; DISABLED-NEXT: MOV64mr $rbp, 1, $noreg, -48, $noreg, killed renamable $rax :: (store (s64) into %stack.0)
+    ; DISABLED-NEXT: MOV64mr $rbp, 1, $noreg, -40, $noreg, killed renamable $r11 :: (store (s64) into %stack.1)
+    ; DISABLED-NEXT: renamable $eax = XOR32rr undef $eax, undef $eax, implicit-def dead $eflags
+    ; DISABLED-NEXT: $r13d = MOV32rr killed $eax
+    ; DISABLED-NEXT: $rdi = MOV64rr $r15
+    ; DISABLED-NEXT: CALL64r renamable $r12, csr_64, implicit $rsp, implicit $ssp, implicit $rdi, implicit-def $rsp, implicit-def $ssp
+    ; DISABLED-NEXT: dead renamable $eax = MOV32rm renamable $rbx, 1, $noreg, 0, $noreg
+    ; DISABLED-NEXT: renamable $eax = MOV32ri 1
+    ; DISABLED-NEXT: TEST8ri renamable $r14b, 1, implicit-def $eflags
 
-    ; CHECK-NEXT: TEST32rr killed renamable $r13d, renamable $r13d, implicit-def $eflags
-    ; CHECK-NEXT: RET64
+    ;; Verify that when instr-ref is disabled, we do not remove fake uses.
+    ; DISABLED-NEXT: renamable $rax = MOV64rm $rbp, 1, $noreg, -48, $noreg :: (load (s64) from %stack.0)
+    ; DISABLED-NEXT: FAKE_USE renamable $eax, implicit killed $rax
+    ; DISABLED-NEXT: renamable $r11 = MOV64rm $rbp, 1, $noreg, -40, $noreg :: (load (s64) from %stack.1)
+    ; DISABLED-NEXT: renamable $r12d = XOR32rr $r12d, $r11d, implicit-def dead $eflags
+    ; DISABLED-NEXT: FAKE_USE killed renamable $r11d
+    ; DISABLED-NEXT: TEST32rr killed renamable $r13d, renamable $r13d, implicit-def $eflags
+    ; DISABLED-NEXT: RET64
     $rbx = MOV64rr $rdx
     $r14d = MOV32rr $esi
     $r15 = MOV64rr $rdi