[llvm] M68k ARII atomic load/store (PR #108982)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 17 07:38:49 PDT 2024
https://github.com/knickish created https://github.com/llvm/llvm-project/pull/108982
Only ARI was supported, this PR adds ARII support for the basic loads/stores along with a filecheck test
>From e504c85e226856d2c5f2f9768371081727efa7ad Mon Sep 17 00:00:00 2001
From: kirk <knickish at gmail.com>
Date: Mon, 16 Sep 2024 12:22:26 +0000
Subject: [PATCH 1/2] add m68k filecheck test showing iselect failure for
non-ARI atomic store
---
llvm/test/CodeGen/M68k/Atomics/non-ari.ll | 46 +++++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 llvm/test/CodeGen/M68k/Atomics/non-ari.ll
diff --git a/llvm/test/CodeGen/M68k/Atomics/non-ari.ll b/llvm/test/CodeGen/M68k/Atomics/non-ari.ll
new file mode 100644
index 00000000000000..1ae545ed87227e
--- /dev/null
+++ b/llvm/test/CodeGen/M68k/Atomics/non-ari.ll
@@ -0,0 +1,46 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5
+; RUN: llc %s -o - -mtriple=m68k -mcpu=M68000 | FileCheck %s --check-prefix=NO-ATOMIC
+; RUN: llc %s -o - -mtriple=m68k -mcpu=M68010 | FileCheck %s --check-prefix=NO-ATOMIC
+; RUN: llc %s -o - -mtriple=m68k -mcpu=M68020 | FileCheck %s --check-prefix=ATOMIC
+; RUN: llc %s -o - -mtriple=m68k -mcpu=M68030 | FileCheck %s --check-prefix=ATOMIC
+; RUN: llc %s -o - -mtriple=m68k -mcpu=M68040 | FileCheck %s --check-prefix=ATOMIC
+
+define void @atomic_store_i8_element_monotonic(i8 %val, ptr %base, i32 %offset) nounwind {
+; NO-ATOMIC-LABEL: atomic_store_i8_element_monotonic:
+; NO-ATOMIC: ; %bb.0:
+; NO-ATOMIC-NEXT: move.b (7,%sp), %d0
+; NO-ATOMIC-NEXT: move.l (12,%sp), %d1
+; NO-ATOMIC-NEXT: move.l (8,%sp), %a0
+; NO-ATOMIC-NEXT: move.b %d0, (0,%a0,%d1)
+; NO-ATOMIC-NEXT: rts
+;
+; ATOMIC-LABEL: atomic_store_i8_element_monotonic:
+; ATOMIC: ; %bb.0:
+; ATOMIC-NEXT: move.b (7,%sp), %d0
+; ATOMIC-NEXT: move.l (12,%sp), %d1
+; ATOMIC-NEXT: move.l (8,%sp), %a0
+; ATOMIC-NEXT: move.b %d0, (0,%a0,%d1)
+; ATOMIC-NEXT: rts
+ %store_pointer = getelementptr i8, ptr %base, i32 %offset
+ store atomic i8 %val, ptr %store_pointer monotonic, align 1
+ ret void
+}
+
+define i8 @atomic_load_i8_element_monotonic(ptr %base, i32 %offset) nounwind {
+; NO-ATOMIC-LABEL: atomic_load_i8_element_monotonic:
+; NO-ATOMIC: ; %bb.0:
+; NO-ATOMIC-NEXT: move.l (8,%sp), %d0
+; NO-ATOMIC-NEXT: move.l (4,%sp), %a0
+; NO-ATOMIC-NEXT: move.b (0,%a0,%d0), %d0
+; NO-ATOMIC-NEXT: rts
+;
+; ATOMIC-LABEL: atomic_load_i8_element_monotonic:
+; ATOMIC: ; %bb.0:
+; ATOMIC-NEXT: move.l (8,%sp), %d0
+; ATOMIC-NEXT: move.l (4,%sp), %a0
+; ATOMIC-NEXT: move.b (0,%a0,%d0), %d0
+; ATOMIC-NEXT: rts
+ %load_pointer = getelementptr i8, ptr %base, i32 %offset
+ %return_val = load atomic i8, ptr %load_pointer monotonic, align 1
+ ret i8 %return_val
+}
>From b677ecbf4bde13c8fb69c66afd9ee79b909d88db Mon Sep 17 00:00:00 2001
From: kirk <knickish at gmail.com>
Date: Mon, 16 Sep 2024 12:36:04 +0000
Subject: [PATCH 2/2] add m68k isel support for non-ARI atomic loads/stores
---
llvm/lib/Target/M68k/M68kISelDAGToDAG.cpp | 16 ++++++++++++++--
llvm/lib/Target/M68k/M68kInstrAtomics.td | 15 +++++++++++++++
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/llvm/lib/Target/M68k/M68kISelDAGToDAG.cpp b/llvm/lib/Target/M68k/M68kISelDAGToDAG.cpp
index dc89fec8108c2d..a6f393bcd8624b 100644
--- a/llvm/lib/Target/M68k/M68kISelDAGToDAG.cpp
+++ b/llvm/lib/Target/M68k/M68kISelDAGToDAG.cpp
@@ -772,6 +772,19 @@ static bool isAddressBase(const SDValue &N) {
}
}
+static bool AllowARIIWithZeroDisp(SDNode *Parent) {
+ if (!Parent) return false;
+ switch (Parent->getOpcode()) {
+ case ISD::LOAD:
+ case ISD::STORE:
+ case ISD::ATOMIC_LOAD:
+ case ISD::ATOMIC_STORE:
+ return true;
+ default:
+ return false;
+ }
+}
+
bool M68kDAGToDAGISel::SelectARII(SDNode *Parent, SDValue N, SDValue &Disp,
SDValue &Base, SDValue &Index) {
M68kISelAddressMode AM(M68kISelAddressMode::AddrType::ARII);
@@ -811,8 +824,7 @@ bool M68kDAGToDAGISel::SelectARII(SDNode *Parent, SDValue N, SDValue &Disp,
// The idea here is that we want to use AddrType::ARII without displacement
// only if necessary like memory operations, otherwise this must be lowered
// into addition
- if (AM.Disp == 0 && (!Parent || (Parent->getOpcode() != ISD::LOAD &&
- Parent->getOpcode() != ISD::STORE))) {
+ if (AM.Disp == 0 && !AllowARIIWithZeroDisp(Parent)) {
LLVM_DEBUG(dbgs() << "REJECT: Displacement is Zero\n");
return false;
}
diff --git a/llvm/lib/Target/M68k/M68kInstrAtomics.td b/llvm/lib/Target/M68k/M68kInstrAtomics.td
index 84a66253354229..b64118d323d1bb 100644
--- a/llvm/lib/Target/M68k/M68kInstrAtomics.td
+++ b/llvm/lib/Target/M68k/M68kInstrAtomics.td
@@ -10,9 +10,24 @@ foreach size = [8, 16, 32] in {
def : Pat<(!cast<SDPatternOperator>("atomic_load_"#size) MxCP_ARI:$ptr),
(!cast<MxInst>("MOV"#size#"dj") !cast<MxMemOp>("MxARI"#size):$ptr)>;
+ def : Pat<(!cast<SDPatternOperator>("atomic_load_"#size) MxCP_ARII:$ptr),
+ (!cast<MxInst>("MOV"#size#"df") !cast<MxMemOp>("MxARII"#size):$ptr)>;
+
+ def : Pat<(!cast<SDPatternOperator>("atomic_load_"#size) MxCP_ARID:$ptr),
+ (!cast<MxInst>("MOV"#size#"dp") !cast<MxMemOp>("MxARID"#size):$ptr)>;
+
def : Pat<(!cast<SDPatternOperator>("atomic_store_"#size) !cast<MxRegOp>("MxDRD"#size):$val, MxCP_ARI:$ptr),
(!cast<MxInst>("MOV"#size#"jd") !cast<MxMemOp>("MxARI"#size):$ptr,
!cast<MxRegOp>("MxDRD"#size):$val)>;
+
+ def : Pat<(!cast<SDPatternOperator>("atomic_store_"#size) !cast<MxRegOp>("MxDRD"#size):$val, MxCP_ARII:$ptr),
+ (!cast<MxInst>("MOV"#size#"fd") !cast<MxMemOp>("MxARII"#size):$ptr,
+ !cast<MxRegOp>("MxDRD"#size):$val)>;
+
+ def : Pat<(!cast<SDPatternOperator>("atomic_store_"#size) !cast<MxRegOp>("MxDRD"#size):$val, MxCP_ARID:$ptr),
+ (!cast<MxInst>("MOV"#size#"pd") !cast<MxMemOp>("MxARID"#size):$ptr,
+ !cast<MxRegOp>("MxDRD"#size):$val)>;
+
}
let Predicates = [AtLeastM68020] in {
More information about the llvm-commits
mailing list