[DebugInfo][InstrRef] "final final" test cleanups for x86 tests

Two "totally definitely the last ones" instruction referencing test
updates:

 * fp-stack.ll: this test targets i686, and so it won't be getting
   instruction referencing, or at least not right now,
 * X86/live-debug-values.ll: instruction referencing will produce entry
   values in this test, add check lines to account for this. It's not clear
   what the test is supposed to be testing anyway, but the entry values
   appear to be correct.

Differential Revision: https://reviews.llvm.org/D114626
diff --git a/llvm/test/DebugInfo/COFF/fp-stack.ll b/llvm/test/DebugInfo/COFF/fp-stack.ll
index 1fb3b3c..7587b89 100644
--- a/llvm/test/DebugInfo/COFF/fp-stack.ll
+++ b/llvm/test/DebugInfo/COFF/fp-stack.ll
@@ -1,5 +1,5 @@
-; RUN: llc -mtriple=i686-windows-msvc < %s -experimental-debug-variable-locations=false | FileCheck %s --check-prefix=ASM
-; RUN: llc -mtriple=i686-windows-msvc < %s -filetype=obj -experimental-debug-variable-locations=false | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ
+; RUN: llc -mtriple=i686-windows-msvc < %s | FileCheck %s --check-prefix=ASM
+; RUN: llc -mtriple=i686-windows-msvc < %s -filetype=obj | llvm-readobj --codeview - | FileCheck %s --check-prefix=OBJ
 target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32"
 target triple = "i686-pc-windows-msvc18.0.0"
 
diff --git a/llvm/test/DebugInfo/X86/live-debug-values.ll b/llvm/test/DebugInfo/X86/live-debug-values.ll
index f99ce56..4b8c9b6 100644
--- a/llvm/test/DebugInfo/X86/live-debug-values.ll
+++ b/llvm/test/DebugInfo/X86/live-debug-values.ll
@@ -1,4 +1,5 @@
 ; RUN: llc -filetype=asm %s -o - -experimental-debug-variable-locations=false | FileCheck %s
+; RUN: llc -filetype=asm %s -o - -experimental-debug-variable-locations=true | FileCheck %s --check-prefixes=CHECK,INSTRREF
 
 ; Test the extension of debug ranges from predecessors.
 ; Generated from the source file LiveDebugValues.c:
@@ -29,8 +30,10 @@
 
 ; DBG_VALUE for variable "n" is extended into %bb.5 from its predecessors %bb.3
 ; and %bb.4.
-; CHECK:       .LBB0_5:
-; CHECK-NEXT:  #DEBUG_VALUE: main:n <- $ebx
+; CHECK:         .LBB0_5:
+; INSTRREF-NEXT: #DEBUG_VALUE: main:argc <- [DW_OP_LLVM_entry_value 1] $edi
+; INSTRREF-NEXT: #DEBUG_VALUE: main:argv <- [DW_OP_LLVM_entry_value 1] $rsi
+; CHECK-NEXT:    #DEBUG_VALUE: main:n <- $ebx
 ;   Other register values have been clobbered.
 ; CHECK-NOT:   #DEBUG_VALUE:
 ; CHECK:         movl    %e{{..}}, m(%rip)