From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Tue, 19 Nov 2019 11:29:39 +0000 (+0000)
Subject: arch-arm: Unify VLdmStm behaviour when reg out of index
X-Git-Tag: v19.0.0.0~213
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f191901bd8def842b4f8c9d06f4adc0f47ae4918;p=gem5.git

arch-arm: Unify VLdmStm behaviour when reg out of index

The generic VLdmStm class (modelling A32 VLDM/VSTM) is handling a wrong
register list in a inconsistent way. Some instructions are opting
for being decoded as Unknown, while others handle it inside the
macro instruction constructor by manually adjusting the reglist.

Those are two valid implementation of the CONSTRAINT UNPREDICTABLE
behaviour (1 and 3):

"If regs > 16 || (d+regs) > 32 , then one of the following behaviors must
occur:
1) The instruction is UNDEFINED .
2) The instruction executes as NOP .
3)  One or more of the SIMD and floating-point registers are UNKNOWN . If
the instruction specifies writeback, the base register becomes UNKNOWN .
This behavior does not affect any general-purpose registers."

This patch unfies the behaviour by always opting for option 1) over 3)

Change-Id: I4f98409243d5a2ec64113fe9c87e961a391abe94
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23106
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/arch/arm/insts/macromem.cc b/src/arch/arm/insts/macromem.cc
index 7ed62f283..e6de8321d 100644
--- a/src/arch/arm/insts/macromem.cc
+++ b/src/arch/arm/insts/macromem.cc
@@ -1446,15 +1446,6 @@ MacroVFPMemOp::MacroVFPMemOp(const char *mnem, ExtMachInst machInst,
     // to be functionally identical except that fldmx is deprecated. For now
     // we'll assume they're otherwise interchangable.
     int count = (single ? offset : (offset / 2));
-    if (count == 0 || count > NumFloatV7ArchRegs)
-        warn_once("Bad offset field for VFP load/store multiple.\n");
-    if (count == 0) {
-        // Force there to be at least one microop so the macroop makes sense.
-        writeback = true;
-    }
-    if (count > NumFloatV7ArchRegs)
-        count = NumFloatV7ArchRegs;
-
     numMicroops = count * (single ? 1 : 2) + (writeback ? 1 : 0);
     microOps = new StaticInstPtr[numMicroops];
 
diff --git a/src/arch/arm/isa/formats/fp.isa b/src/arch/arm/isa/formats/fp.isa
index a87988f14..133f918d9 100644
--- a/src/arch/arm/isa/formats/fp.isa
+++ b/src/arch/arm/isa/formats/fp.isa
@@ -1873,10 +1873,29 @@ def format ThumbNeonData() {{
 
 let {{
     header_output = '''
+    bool
+    wrongVLdmStmRegs(IntRegIndex start_reg, uint8_t count, bool single);
+
     StaticInstPtr
     decodeExtensionRegLoadStore(ExtMachInst machInst);
     '''
     decoder_output = '''
+    bool
+    wrongVLdmStmRegs(RegIndex start_reg, uint8_t count, bool single)
+    {
+        if (single) {
+            const auto regs = count;
+            if (regs == 0 || start_reg + regs > NumFloatV7ArchRegs)
+                return true;
+        } else {
+            const auto regs = count/2;
+            if (regs == 0 || start_reg + regs > NumFloatV7ArchRegs ||
+                regs > 16)
+                return true;
+        }
+        return false;
+    }
+
     StaticInstPtr
     decodeExtensionRegLoadStore(ExtMachInst machInst)
     {
@@ -1923,7 +1942,7 @@ let {{
             break;
           case 0x1:
             {
-                if (offset == 0 || vd + offset/2 > NumFloatV7ArchRegs) {
+                if (wrongVLdmStmRegs(vd, offset, single)) {
                     break;
                 }
                 switch (bits(opcode, 1, 0)) {
@@ -1946,12 +1965,20 @@ let {{
             }
           case 0x2:
             if (bits(opcode, 1, 0) == 0x2) {
-                // If rn == sp, then this is called vpush.
-                return new VLdmStm(machInst, rn, vd, single,
-                                   false, true, false, offset);
+                if (wrongVLdmStmRegs(vd, offset, single)) {
+                    break;
+                } else {
+                    // If rn == sp, then this is called vpush.
+                    return new VLdmStm(machInst, rn, vd, single,
+                                       false, true, false, offset);
+                }
             } else if (bits(opcode, 1, 0) == 0x3) {
-                return new VLdmStm(machInst, rn, vd, single,
-                                   false, true, true, offset);
+                if (wrongVLdmStmRegs(vd, offset, single)) {
+                    break;
+                } else {
+                    return new VLdmStm(machInst, rn, vd, single,
+                                       false, true, true, offset);
+                }
             }
             M5_FALLTHROUGH;
           case 0x3: