[llvm] ea9139f - [Xcore] Set Int_MemBarrier as a meta-instruction

[Shengchen Kan via llvm-commits]

Author: Shengchen Kan
Date: 2022-03-19T17:52:37+08:00
New Revision: ea9139fe166679baf09939e7efac0864cad7b65d

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

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

Reviewed By: nigelp-xmos

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

Added: 
    llvm/test/DebugInfo/XCore/dwarf-mem-barrier.ll
    llvm/test/DebugInfo/XCore/lit.local.cfg

Modified: 
    llvm/lib/Target/XCore/XCoreInstrInfo.td

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/XCore/XCoreInstrInfo.td b/llvm/lib/Target/XCore/XCoreInstrInfo.td
index aa3739d0335ec..23f80b126404c 100644
--- a/llvm/lib/Target/XCore/XCoreInstrInfo.td
+++ b/llvm/lib/Target/XCore/XCoreInstrInfo.td
@@ -363,7 +363,7 @@ let usesCustomInserter = 1 in {
                                  (select GRRegs:$cond, GRRegs:$T, GRRegs:$F))]>;
 }
 
-let hasSideEffects = 1 in
+let hasSideEffects = 1, isMeta = 1 in
 def Int_MemBarrier : PseudoInstXCore<(outs), (ins), "#MEMBARRIER",
                                      [(XCoreMemBarrier)]>;
 

diff  --git a/llvm/test/DebugInfo/XCore/dwarf-mem-barrier.ll b/llvm/test/DebugInfo/XCore/dwarf-mem-barrier.ll
new file mode 100644
index 0000000000000..2089e0dc26e44
--- /dev/null
+++ b/llvm/test/DebugInfo/XCore/dwarf-mem-barrier.ll
@@ -0,0 +1,32 @@
+; Check .loc directive is emitted at correct position
+; RUN: llc -O0 -mtriple xcore-linux-gnu <%s | FileCheck %s
+
+; CHECK:	#MEMBARRIER
+; CHECK:	#MEMBARRIER
+; CHECK:	ldc r0, 0
+; CHECK:	stw r0, sp[0]
+; 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/test/DebugInfo/XCore/lit.local.cfg b/llvm/test/DebugInfo/XCore/lit.local.cfg
new file mode 100644
index 0000000000000..bb48713fe33e2
--- /dev/null
+++ b/llvm/test/DebugInfo/XCore/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'XCore' in config.root.targets:
+    config.unsupported = True