[llvm] [ARM][MC] Reject unaligned Thumb2 LDRD/STRD post-index immediates (PR #193531)

[via llvm-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-backend-arm

Author: Mark Murray (MarkMurrayARM)

<details>
<summary>Changes</summary>

Also regenerate tests that get tripped by this.

---
Full diff: https://github.com/llvm/llvm-project/pull/193531.diff


3 Files Affected:

- (modified) llvm/lib/Target/ARM/ARMInstrThumb2.td (+1) 
- (modified) llvm/test/MC/ARM/thumb-diagnostics.s (+16-4) 
- (added) llvm/test/MC/ARM/thumb2-ldrd-strd-post-unaligned-diag.s (+34) 


``````````diff
diff --git a/llvm/lib/Target/ARM/ARMInstrThumb2.td b/llvm/lib/Target/ARM/ARMInstrThumb2.td
index 4f0cea8b00aac..36f87a9ea3a37 100644
--- a/llvm/lib/Target/ARM/ARMInstrThumb2.td
+++ b/llvm/lib/Target/ARM/ARMInstrThumb2.td
@@ -295,6 +295,7 @@ def t2addrmode_imm8s4_pre : T2AddrMode_Imm8s4 {
 def t2am_imm8s4_offset_asmoperand : AsmOperandClass { let Name = "Imm8s4"; }
 def t2am_imm8s4_offset : MemOperand {
   let PrintMethod = "printT2AddrModeImm8s4OffsetOperand";
+  let ParserMatchClass = t2am_imm8s4_offset_asmoperand;
   let EncoderMethod = "getT2ScaledImmOpValue<8,2>";
   let DecoderMethod = "DecodeT2Imm8S4";
 }
diff --git a/llvm/test/MC/ARM/thumb-diagnostics.s b/llvm/test/MC/ARM/thumb-diagnostics.s
index 171d60ac13f9a..3e9aba2c245d4 100644
--- a/llvm/test/MC/ARM/thumb-diagnostics.s
+++ b/llvm/test/MC/ARM/thumb-diagnostics.s
@@ -458,9 +458,21 @@
 @ CHECK-ERRORS-V8: error: source register and base register can't be identical
 @ CHECK-ERRORS-V8: strb r0, [r0], #1
 @ CHECK-ERRORS-V8:          ^
-@ CHECK-ERRORS-V8: error: source register and base register can't be identical
+@ CHECK-ERRORS-V8: error: invalid instruction, any one of the following would fix this:
 @ CHECK-ERRORS-V8: strd r0, r1, [r0], #1
-@ CHECK-ERRORS-V8:              ^
-@ CHECK-ERRORS-V8: error: source register and base register can't be identical
+@ CHECK-ERRORS-V8: ^
+@ CHECK-ERRORS-V8: note: instruction requires: arm-mode
+@ CHECK-ERRORS-V8: strd r0, r1, [r0], #1
+@ CHECK-ERRORS-V8: ^
+@ CHECK-ERRORS-V8: note: invalid operand for instruction
+@ CHECK-ERRORS-V8: strd r0, r1, [r0], #1
+@ CHECK-ERRORS-V8:                    ^
+@ CHECK-ERRORS-V8: error: invalid instruction, any one of the following would fix this:
+@ CHECK-ERRORS-V8: strd r1, r0, [r0], #1
+@ CHECK-ERRORS-V8: ^
+@ CHECK-ERRORS-V8: note: instruction requires: arm-mode
+@ CHECK-ERRORS-V8: strd r1, r0, [r0], #1
+@ CHECK-ERRORS-V8: ^
+@ CHECK-ERRORS-V8: note: invalid operand for instruction
 @ CHECK-ERRORS-V8: strd r1, r0, [r0], #1
-@ CHECK-ERRORS-V8:              ^
+@ CHECK-ERRORS-V8:                    ^
diff --git a/llvm/test/MC/ARM/thumb2-ldrd-strd-post-unaligned-diag.s b/llvm/test/MC/ARM/thumb2-ldrd-strd-post-unaligned-diag.s
new file mode 100644
index 0000000000000..caad9cdee883e
--- /dev/null
+++ b/llvm/test/MC/ARM/thumb2-ldrd-strd-post-unaligned-diag.s
@@ -0,0 +1,34 @@
+@ RUN: not llvm-mc -triple=thumbv7-linux-gnueabi -mattr=+thumb2 %s -o /dev/null 2>&1 | FileCheck %s
+
+.text
+.thumb
+
+ldrd r0, r1, [r2], #2
+strd r0, r1, [r2], #-6
+
+@ CHECK: note: invalid operand for instruction
+@ CHECK-NEXT: ldrd r0, r1, [r2], #2
+@ CHECK-NEXT:                    ^
+@ CHECK: note: invalid operand for instruction
+@ CHECK-NEXT: strd r0, r1, [r2], #-6
+@ CHECK-NEXT:                    ^
+
+ldrd r0, r1, [r2], #-1
+strd r0, r1, [r2], #5
+
+@ CHECK: note: invalid operand for instruction
+@ CHECK-NEXT: ldrd r0, r1, [r2], #-1
+@ CHECK-NEXT:                    ^
+@ CHECK: note: invalid operand for instruction
+@ CHECK-NEXT: strd r0, r1, [r2], #5
+@ CHECK-NEXT:                    ^
+
+ldrd r0, r1, [r2], #-15
+strd r0, r1, [r2], #30
+
+@ CHECK: note: invalid operand for instruction
+@ CHECK-NEXT: ldrd r0, r1, [r2], #-15
+@ CHECK-NEXT:                    ^
+@ CHECK: note: invalid operand for instruction
+@ CHECK-NEXT: strd r0, r1, [r2], #30
+@ CHECK-NEXT:                    ^

``````````

</details>


https://github.com/llvm/llvm-project/pull/193531