[llvm] 614a578 - [M68k] Add support for bitwise NOT instruction (#88049)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Apr 9 09:07:30 PDT 2024
Author: Peter Lafreniere
Date: 2024-04-09T09:07:26-07:00
New Revision: 614a5780347ff0c8f82b8867660ea7fb4d9fdccb
URL: https://github.com/llvm/llvm-project/commit/614a5780347ff0c8f82b8867660ea7fb4d9fdccb
DIFF: https://github.com/llvm/llvm-project/commit/614a5780347ff0c8f82b8867660ea7fb4d9fdccb.diff
LOG: [M68k] Add support for bitwise NOT instruction (#88049)
Currently the bitwise NOT instruction is not recognized. Add support for
using NOT on data registers. This is a partial implementation that puts
NOT at the same level of support as NEG currently enjoys.
Using not rather than eori cuts the length of the encoded instruction
in half or in thirds, leading to a reduction of 4-10 cycles per
instruction, on the original 68000.
This change includes tests for both bitwise and arithmetic negation.
Added:
llvm/test/CodeGen/M68k/Arith/unary.ll
llvm/test/MC/M68k/Arith/Classes/MxNOT.s
Modified:
llvm/lib/Target/M68k/M68kInstrArithmetic.td
llvm/test/CodeGen/M68k/Atomics/rmw.ll
llvm/test/MC/Disassembler/M68k/arithmetic.txt
Removed:
################################################################################
diff --git a/llvm/lib/Target/M68k/M68kInstrArithmetic.td b/llvm/lib/Target/M68k/M68kInstrArithmetic.td
index 3532e56e741705..e2d4e49ddf27b6 100644
--- a/llvm/lib/Target/M68k/M68kInstrArithmetic.td
+++ b/llvm/lib/Target/M68k/M68kInstrArithmetic.td
@@ -15,8 +15,8 @@
/// ADD [~] ADDA [~] ADDI [~] ADDQ [ ] ADDX [~]
/// CLR [ ] CMP [~] CMPA [~] CMPI [~] CMPM [ ]
/// CMP2 [ ] DIVS/DIVU [~] DIVSL/DIVUL [ ] EXT [~] EXTB [ ]
-/// MULS/MULU [~] NEG [~] NEGX [~] SUB [~] SUBA [~]
-/// SUBI [~] SUBQ [ ] SUBX [~]
+/// MULS/MULU [~] NEG [~] NEGX [~] NOT [~] SUB [~]
+/// SUBA [~] SUBI [~] SUBQ [ ] SUBX [~]
///
/// Map:
///
@@ -769,7 +769,7 @@ def : Pat<(mulhu i16:$dst, Mxi16immSExt16:$opd),
//===----------------------------------------------------------------------===//
-// NEG/NEGX
+// NEG/NEGX/NOT
//===----------------------------------------------------------------------===//
/// ------------+------------+------+---------+---------
@@ -809,12 +809,26 @@ class MxNegX_D<MxType TYPE>
}
}
+class MxNot_D<MxType TYPE>
+ : MxInst<(outs TYPE.ROp:$dst), (ins TYPE.ROp:$src),
+ "not."#TYPE.Prefix#"\t$dst",
+ [(set TYPE.VT:$dst, (not TYPE.VT:$src))]> {
+ let Inst = (descend 0b01000110,
+ /*SIZE*/!cast<MxEncSize>("MxEncSize"#TYPE.Size).Value,
+ //MODE without last bit
+ 0b00,
+ //REGISTER prefixed by D/A bit
+ (operand "$dst", 4)
+ );
+}
+
} // let Constraints
} // let Defs = [CCR]
foreach S = [8, 16, 32] in {
def NEG#S#d : MxNeg_D<!cast<MxType>("MxType"#S#"d")>;
def NEGX#S#d : MxNegX_D<!cast<MxType>("MxType"#S#"d")>;
+ def NOT#S#d : MxNot_D<!cast<MxType>("MxType"#S#"d")>;
}
def : Pat<(MxSub 0, i8 :$src), (NEG8d MxDRD8 :$src)>;
diff --git a/llvm/test/CodeGen/M68k/Arith/unary.ll b/llvm/test/CodeGen/M68k/Arith/unary.ll
new file mode 100644
index 00000000000000..a28ac7328d2601
--- /dev/null
+++ b/llvm/test/CodeGen/M68k/Arith/unary.ll
@@ -0,0 +1,86 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --filter-out ";*\.cfi_*"
+; RUN: llc < %s -mtriple=m68k-linux -verify-machineinstrs | FileCheck %s
+
+define i64 @notll(i64 %x) {
+; CHECK-LABEL: notll:
+; CHECK: ; %bb.0:
+; CHECK: move.l (4,%sp), %d0
+; CHECK: not.l %d0
+; CHECK: move.l (8,%sp), %d1
+; CHECK: not.l %d1
+; CHECK: rts
+ %not = xor i64 %x, -1
+ ret i64 %not
+}
+
+define i32 @notl(i32 %x) {
+; CHECK-LABEL: notl:
+; CHECK: ; %bb.0:
+; CHECK: move.l (4,%sp), %d0
+; CHECK: not.l %d0
+; CHECK: rts
+ %not = xor i32 %x, -1
+ ret i32 %not
+}
+
+define i16 @nots(i16 %x) {
+; CHECK-LABEL: nots:
+; CHECK: ; %bb.0:
+; CHECK: move.w (6,%sp), %d0
+; CHECK: not.w %d0
+; CHECK: rts
+ %not = xor i16 %x, -1
+ ret i16 %not
+}
+
+define i8 @notb(i8 %x) {
+; CHECK-LABEL: notb:
+; CHECK: ; %bb.0:
+; CHECK: move.b (7,%sp), %d0
+; CHECK: not.b %d0
+; CHECK: rts
+ %not = xor i8 %x, -1
+ ret i8 %not
+}
+
+define i64 @negll(i64 %x) {
+; CHECK-LABEL: negll:
+; CHECK: ; %bb.0:
+; CHECK: move.l (4,%sp), %d0
+; CHECK: move.l (8,%sp), %d1
+; CHECK: neg.l %d1
+; CHECK: negx.l %d0
+; CHECK: rts
+ %neg = sub i64 0, %x
+ ret i64 %neg
+}
+
+define i32 @negl(i32 %x) {
+; CHECK-LABEL: negl:
+; CHECK: ; %bb.0:
+; CHECK: move.l (4,%sp), %d0
+; CHECK: neg.l %d0
+; CHECK: rts
+ %neg = sub i32 0, %x
+ ret i32 %neg
+}
+
+define i16 @negs(i16 %x) {
+; CHECK-LABEL: negs:
+; CHECK: ; %bb.0:
+; CHECK: move.w (6,%sp), %d0
+; CHECK: neg.w %d0
+; CHECK: rts
+ %neg = sub i16 0, %x
+ ret i16 %neg
+}
+
+define i8 @negb(i8 %x) {
+; CHECK-LABEL: negb:
+; CHECK: ; %bb.0:
+; CHECK: move.b (7,%sp), %d0
+; CHECK: neg.b %d0
+; CHECK: rts
+ %neg = sub i8 0, %x
+ ret i8 %neg
+}
diff --git a/llvm/test/CodeGen/M68k/Atomics/rmw.ll b/llvm/test/CodeGen/M68k/Atomics/rmw.ll
index b589e7751d80e7..1036a0a8ba3d25 100644
--- a/llvm/test/CodeGen/M68k/Atomics/rmw.ll
+++ b/llvm/test/CodeGen/M68k/Atomics/rmw.ll
@@ -237,7 +237,7 @@ define i16 @atmoicrmw_nand_i16(i16 %val, ptr %ptr) {
; ATOMIC-NEXT: ; =>This Inner Loop Header: Depth=1
; ATOMIC-NEXT: move.w %d2, %d3
; ATOMIC-NEXT: and.w %d0, %d3
-; ATOMIC-NEXT: eori.w #-1, %d3
+; ATOMIC-NEXT: not.w %d3
; ATOMIC-NEXT: cas.w %d1, %d3, (%a0)
; ATOMIC-NEXT: move.w %d1, %d3
; ATOMIC-NEXT: sub.w %d2, %d3
diff --git a/llvm/test/MC/Disassembler/M68k/arithmetic.txt b/llvm/test/MC/Disassembler/M68k/arithmetic.txt
index 007a789b3bf0c0..8142024940c69f 100644
--- a/llvm/test/MC/Disassembler/M68k/arithmetic.txt
+++ b/llvm/test/MC/Disassembler/M68k/arithmetic.txt
@@ -89,6 +89,12 @@
# CHECK: negx.l %a2
0x40 0x8a
+# CHECK: not.l %d5
+0x46 0x85
+
+# CHECK: not.b %d1
+0x46 0x01
+
# CHECK: or.w (18,%a4,%a0), %d3
0x86 0x74 0x88 0x12
diff --git a/llvm/test/MC/M68k/Arith/Classes/MxNOT.s b/llvm/test/MC/M68k/Arith/Classes/MxNOT.s
new file mode 100644
index 00000000000000..93b473334d7b19
--- /dev/null
+++ b/llvm/test/MC/M68k/Arith/Classes/MxNOT.s
@@ -0,0 +1,11 @@
+; RUN: llvm-mc -triple=m68k -show-encoding %s | FileCheck %s
+
+; CHECK: not.b %d0
+; CHECK-SAME: encoding: [0x46,0x00]
+not.b %d0
+; CHECK: not.w %d0
+; CHECK-SAME: encoding: [0x46,0x40]
+not.w %d0
+; CHECK: not.l %d0
+; CHECK-SAME: encoding: [0x46,0x80]
+not.l %d0
More information about the llvm-commits
mailing list