ARM NEON fix alignment encoding for VST2 w/ writeback.

Add tests for w/ writeback instruction parsing and encoding.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146594 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/ARMInstrNEON.td b/lib/Target/ARM/ARMInstrNEON.td
index ff647deaa490471c88b5b393cb810ef0a2f6afa1..1caadd694dafc4a554e2b5fe0fe52bd4b0d0caff 100644 (file)
--- a/lib/Target/ARM/ARMInstrNEON.td
+++ b/lib/Target/ARM/ARMInstrNEON.td
@@ -1530,7 +1530,7 @@ multiclass VST2DWB<bits<4> op11_8, bits<4> op7_4, string Dt,
                      "vst2", Dt, "$Vd, $Rn!",
                      "$Rn.addr = $wb", []> {
     let Rm = 0b1101; // NLdSt will assign to the right encoding bits.
-    let Inst{4} = Rn{4};
+    let Inst{5-4} = Rn{5-4};
     let DecoderMethod = "DecodeVSTInstruction";
     let AsmMatchConverter = "cvtVSTwbFixed";
   }
@@ -1538,7 +1538,7 @@ multiclass VST2DWB<bits<4> op11_8, bits<4> op7_4, string Dt,
                         (ins addrmode6:$Rn, rGPR:$Rm, VdTy:$Vd), IIC_VLD1u,
                         "vst2", Dt, "$Vd, $Rn, $Rm",
                         "$Rn.addr = $wb", []> {
-    let Inst{4} = Rn{4};
+    let Inst{5-4} = Rn{5-4};
     let DecoderMethod = "DecodeVSTInstruction";
     let AsmMatchConverter = "cvtVSTwbRegister";
   }
@@ -1549,7 +1549,7 @@ multiclass VST2QWB<bits<4> op7_4, string Dt> {
                      "vst2", Dt, "$Vd, $Rn!",
                      "$Rn.addr = $wb", []> {
     let Rm = 0b1101; // NLdSt will assign to the right encoding bits.
-    let Inst{4} = Rn{4};
+    let Inst{5-4} = Rn{5-4};
     let DecoderMethod = "DecodeVSTInstruction";
     let AsmMatchConverter = "cvtVSTwbFixed";
   }
@@ -1558,7 +1558,7 @@ multiclass VST2QWB<bits<4> op7_4, string Dt> {
                         IIC_VLD1u,
                         "vst2", Dt, "$Vd, $Rn, $Rm",
                         "$Rn.addr = $wb", []> {
-    let Inst{4} = Rn{4};
+    let Inst{5-4} = Rn{5-4};
     let DecoderMethod = "DecodeVSTInstruction";
     let AsmMatchConverter = "cvtVSTwbRegister";
   }

diff --git a/test/MC/ARM/neon-vst-encoding.s b/test/MC/ARM/neon-vst-encoding.s
index 69bdd242fe1de00ecfad57cbebe46a28f3b0f46f..a4c532a98b567047cb2cc0c368a875fa6834912a 100644 (file)
--- a/test/MC/ARM/neon-vst-encoding.s
+++ b/test/MC/ARM/neon-vst-encoding.s
@@ -37,6 +37,12 @@
        vst2.8  {d16, d17, d18, d19}, [r0, :64]
        vst2.16 {d16, d17, d18, d19}, [r0, :128]
        vst2.32 {d16, d17, d18, d19}, [r0, :256]
+       vst2.8  {d16, d17}, [r0, :64]!
+       vst2.16 {q15}, [r0, :128]!
+       vst2.32 {d14, d15}, [r0]!
+       vst2.8  {d16, d17, d18, d19}, [r0, :64]!
+       vst2.16 {d18-d21}, [r0, :128]!
+       vst2.32 {q4, q5}, [r0, :256]!
 
 @ CHECK: vst2.8        {d16, d17}, [r0, :64]   @ encoding: [0x1f,0x08,0x40,0xf4]
 @ CHECK: vst2.16 {d16, d17}, [r0, :128] @ encoding: [0x6f,0x08,0x40,0xf4]
@@ -44,6 +50,12 @@
 @ CHECK: vst2.8        {d16, d17, d18, d19}, [r0, :64] @ encoding: [0x1f,0x03,0x40,0xf4]
 @ CHECK: vst2.16 {d16, d17, d18, d19}, [r0, :128] @ encoding: [0x6f,0x03,0x40,0xf4]
 @ CHECK: vst2.32 {d16, d17, d18, d19}, [r0, :256] @ encoding: [0xbf,0x03,0x40,0xf4]
+@ CHECK: vst2.8        {d16, d17}, [r0, :64]!  @ encoding: [0x1d,0x08,0x40,0xf4]
+@ CHECK: vst2.16       {d30, d31}, [r0, :128]! @ encoding: [0x6d,0xe8,0x40,0xf4]
+@ CHECK: vst2.32       {d14, d15}, [r0]!       @ encoding: [0x8d,0xe8,0x00,0xf4]
+@ CHECK: vst2.8        {d16, d17, d18, d19}, [r0, :64]! @ encoding: [0x1d,0x03,0x40,0xf4]
+@ CHECK: vst2.16       {d18, d19, d20, d21}, [r0, :128]! @ encoding: [0x6d,0x23,0x40,0xf4]
+@ CHECK: vst2.32       {d8, d9, d10, d11}, [r0, :256]! @ encoding: [0xbd,0x83,0x00,0xf4]
 
 
 @      vst3.8  {d16, d17, d18}, [r0, :64]