Changeset 105093 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Jul 2, 2024 9:02:55 AM (7 months ago)

Author:

vboxsync

Message:

ValidationKit/bootsectors: bugref:10658 SIMD FP testcase: Remove fSseInstr and fAvxInstr from BS3CPUINSTR4_TEST1_CTX_T.

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-4.c32 (modified) (8 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-instr-4.c32

@@ -493 +493 @@
 
 
+DECL_FORCE_INLINE(bool) bs3CpuInstr4IsSse(uint8_t enmType)
+{
+    return enmType >= T_SSE && enmType < T_AVX_128;
+}
+
+
+DECL_FORCE_INLINE(bool) bs3CpuInstr4IsAvx(uint8_t enmType)
+{
+    return enmType >= T_AVX_128;
+}
+
+
+DECL_FORCE_INLINE(uint8_t) bs3CpuInstr4GetOperandSize(uint8_t enmType)
+{
+    return enmType < T_128BITS ?  64/8
+         : enmType < T_256BITS ? 128/8 : 256/8;
+}
+
+
 /**
  * Gets the names of floating-point exception flags that are set for a given MXCSR.
@@ -1062 +1081 @@
     uint8_t                              cbInstr;      /**< Size of the instruction opcode. */
     uint8_t                              bXcptExpect;  /**< The expected exception while/after executing the instruction. */
-    bool                                 fSseInstr;    /**< Whether this is an SSE instruction. */
-    bool                                 fAvxInstr;    /**< Whether this is an AVX instruction. */
     uint16_t                             idTestStep;   /**< The test iteration step. */
 } BS3CPUINSTR4_TEST1_CTX_T;
@@ -1093 +1110 @@
     bool const       fFpFlagsExpect      = RT_BOOL(  (fExpectedMxCsrFlags
                                                    & (~pValues->fMxCsrMask >> X86_MXCSR_XCPT_MASK_SHIFT)) & X86_MXCSR_XCPT_FLAGS);
+    bool const       fSseInstr           = bs3CpuInstr4IsSse(pTest->enmType);
     uint32_t         uMxCsr;
     X86YMMREG        MemOpExpect;
@@ -1118 +1136 @@
         Bs3MemCpy(puMemOpAlias, &pValues->uSrc1, cbMemOp);
         if (pTest->iRegDst == UINT8_MAX)
-            BS3_ASSERT(pTestCtx->fSseInstr);
+            BS3_ASSERT(fSseInstr);
         else
             MemOpExpect.ymm = pValues->uSrc1.ymm;
     }
-    else if (pTestCtx->fSseInstr)
+    else if (fSseInstr)
         Bs3ExtCtxSetXmm(pExtCtx, pTest->iRegSrc1, &pValues->uSrc1.ymm.DQWords.dqw0);
     else
@@ -1135 +1153 @@
         MemOpExpect.ymm = pValues->uSrc2.ymm;
     }
-    else if (pTestCtx->fSseInstr)
+    else if (fSseInstr)
         Bs3ExtCtxSetXmm(pExtCtx, pTest->iRegSrc2, &pValues->uSrc2.ymm.DQWords.dqw0);
     else
@@ -1181 +1199 @@
         && pTest->iRegDst != UINT8_MAX)
     {
-        if (pTestCtx->fSseInstr)
+        if (fSseInstr)
             Bs3ExtCtxSetXmm(pExtCtx, pTest->iRegDst, &pValues->uDstOut.ymm.DQWords.dqw0);
         else
@@ -1312 +1330 @@
                     BS3CPUINSTR4_TEST1_T const BS3_FAR *pTest = &paTests[iTest];
                     unsigned const    cValues       = pTest->cValues;
-                    bool const        fSseInstr     = pTest->enmType >= T_SSE && pTest->enmType < T_AVX_128;
-                    bool const        fAvxInstr     = pTest->enmType >= T_AVX_128;
-                    uint8_t const     cbOperand     = pTest->enmType < T_128BITS ? 64/8
-                                                    : pTest->enmType < T_256BITS ? 128/8 : 256/8;
+                    bool const        fSseInstr     = bs3CpuInstr4IsSse(pTest->enmType);
+                    bool const        fAvxInstr     = bs3CpuInstr4IsAvx(pTest->enmType);
+                    uint8_t const     cbOperand     = bs3CpuInstr4GetOperandSize(pTest->enmType);
                     uint8_t const     cbMemOp       = bs3CpuInstrXMemOpSize(cbOperand, pTest->enmRm);
                     uint8_t const     cbAlign       = cbMemOp;
@@ -1393 +1410 @@
                             TestCtx.cbOperand    = cbOperand;
                             TestCtx.bXcptExpect  = bXcptExpect;
-                            TestCtx.fSseInstr    = fSseInstr;
-                            TestCtx.fAvxInstr    = fAvxInstr;
                             TestCtx.idTestStep   = idTestStep;
                             cErrors = bs3CpuInstr4_WorkerTestType1_Inner(bMode, &TestCtx, &SavedCfg);