Fix checks to accommodate register wraparounds in multi-reg ops (dotn…

…et#101430) Fixes issue dotnet#101070
michaelgsharp · May 8, 2024 · 46843b6 · 46843b6
1 parent fffd059
commit 46843b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/coreclr/jit/codegen.h b/src/coreclr/jit/codegen.h
@@ -101,6 +101,16 @@ class CodeGen final : public CodeGenInterface
         }
     }
 
+#if defined(TARGET_ARM64)
+    regNumber getNextSIMDRegWithWraparound(regNumber reg)
+    {
+        regNumber nextReg = REG_NEXT(reg);
+
+        // Wraparound if necessary, REG_V0 comes next after REG_V31.
+        return (nextReg > REG_V31) ? REG_V0 : nextReg;
+    }
+#endif // defined(TARGET_ARM64)
+
     static GenTreeIndir    indirForm(var_types type, GenTree* base);
     static GenTreeStoreInd storeIndirForm(var_types type, GenTree* base, GenTree* data);
 

diff --git a/src/coreclr/jit/hwintrinsiccodegenarm64.cpp b/src/coreclr/jit/hwintrinsiccodegenarm64.cpp
@@ -833,7 +833,7 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
 
                     GenTree* argNode = use.GetNode();
                     assert(argReg == argNode->GetRegNum());
-                    argReg = REG_NEXT(argReg);
+                    argReg = getNextSIMDRegWithWraparound(argReg);
                 }
                 assert((ins == INS_st2 && regCount == 2) || (ins == INS_st3 && regCount == 3) ||
                        (ins == INS_st4 && regCount == 4));
@@ -883,7 +883,7 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
 
                     GenTree* argNode = use.GetNode();
                     assert(argReg == argNode->GetRegNum());
-                    argReg = REG_NEXT(argReg);
+                    argReg = getNextSIMDRegWithWraparound(argReg);
                 }
                 assert((ins == INS_st1_2regs && regCount == 2) || (ins == INS_st2 && regCount == 2) ||
                        (ins == INS_st1_3regs && regCount == 3) || (ins == INS_st3 && regCount == 3) ||
@@ -1186,7 +1186,7 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
 
                         GenTree* argNode = use.GetNode();
                         assert(argReg == argNode->GetRegNum());
-                        argReg = REG_NEXT(argReg);
+                        argReg = getNextSIMDRegWithWraparound(argReg);
 #endif
                     }
                 }
@@ -1241,7 +1241,7 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
                         assert(argReg == argNode->GetRegNum());
                         // and they should not interfere with targetReg
                         assert(targetReg != argReg);
-                        argReg = REG_NEXT(argReg);
+                        argReg = getNextSIMDRegWithWraparound(argReg);
 #endif
                     }
                 }