[llvm] 1a70feb - [X86] Set Int_MemBarrier as a meta-instruction

[Shengchen Kan via llvm-commits]

Author: Shengchen Kan
Date: 2022-03-18T13:12:28+08:00
New Revision: 1a70febf825f19fdbba755a2e6f77e514e3c7fc2

URL: https://github.com/llvm/llvm-project/commit/1a70febf825f19fdbba755a2e6f77e514e3c7fc2
DIFF: https://github.com/llvm/llvm-project/commit/1a70febf825f19fdbba755a2e6f77e514e3c7fc2.diff

LOG: [X86] Set Int_MemBarrier as a meta-instruction

Compiler only emits a comment for `Int_MemBarrier`, so it should
be marked as a meta-instruction, which can help improve accuracy
of debug location.

Reviewed By: pengfei

Differential Revision: https://reviews.llvm.org/D121879

Added: 
    llvm/test/DebugInfo/X86/dwarf-mem-barrier.ll

Modified: 
    llvm/lib/Target/X86/X86InstrCompiler.td
    llvm/unittests/MIR/MachineMetadata.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/X86/X86InstrCompiler.td b/llvm/lib/Target/X86/X86InstrCompiler.td
index abad628bebd5c..6d9ccebf962ae 100644
--- a/llvm/lib/Target/X86/X86InstrCompiler.td
+++ b/llvm/lib/Target/X86/X86InstrCompiler.td
@@ -670,7 +670,7 @@ def OR32mi8Locked  : Ii8<0x83, MRM1m, (outs), (ins i32mem:$dst, i32i8imm:$zero),
                          Requires<[Not64BitMode]>, OpSize32, LOCK,
                          Sched<[WriteALURMW]>;
 
-let hasSideEffects = 1 in
+let hasSideEffects = 1, isMeta = 1 in
 def Int_MemBarrier : I<0, Pseudo, (outs), (ins),
                      "#MEMBARRIER",
                      [(X86MemBarrier)]>, Sched<[WriteLoad]>;

diff  --git a/llvm/test/DebugInfo/X86/dwarf-mem-barrier.ll b/llvm/test/DebugInfo/X86/dwarf-mem-barrier.ll
new file mode 100644
index 0000000000000..5c24925083872
--- /dev/null
+++ b/llvm/test/DebugInfo/X86/dwarf-mem-barrier.ll
@@ -0,0 +1,31 @@
+; Check .loc directive is emitted at correct position
+; RUN: llc -O0 -mtriple x86_64-linux-gnu <%s | FileCheck %s
+
+; CHECK:	#MEMBARRIER
+; CHECK:	#MEMBARRIER
+; CHECK:	movl	$0, -4(%rsp)
+; CHECK:	.loc	1 1 14 prologue_end             # none.c:1:14
+
+define dso_local i32 @main() !dbg !7 {
+entry:
+  fence acquire, !dbg !9
+  fence release, !dbg !9
+  %retval = alloca i32, align 4
+  store i32 0, i32* %retval, align 4
+  ret i32 0, !dbg !9
+}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: DebugDirectivesOnly, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "none.c", directory: "/temp")
+!2 = !{}
+!3 = !{i32 2, !"Tracing", i32 1}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 11.0.0"}
+!7 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !8, scopeLine: 1, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!8 = !DISubroutineType(types: !2)
+!9 = !DILocation(line: 1, column: 14, scope: !7)

diff  --git a/llvm/unittests/MIR/MachineMetadata.cpp b/llvm/unittests/MIR/MachineMetadata.cpp
index ddeb11ed0e9ea..95f42b4d16782 100644
--- a/llvm/unittests/MIR/MachineMetadata.cpp
+++ b/llvm/unittests/MIR/MachineMetadata.cpp
@@ -332,6 +332,7 @@ body:             |
   LIFETIME_END 0
   PSEUDO_PROBE 6699318081062747564, 1, 0, 0
   $xmm0 = ARITH_FENCE $xmm0
+  Int_MemBarrier
 ...
 )MIR";