Changeset 103752 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Mar 11, 2024 8:12:36 AM (13 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162121

Message:

VMM/CPUMR3CpuId: Enable XSAVE for IEM, it is fully supported, enables us to run bs3-cpu-instr-3 with IEM on arm64, bugref:10614

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (4 diffs)
• CPUMR3CpuId.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -2248 +2248 @@
     pVM->cpum.s.HostFeatures.fLahfSahf   = true;
     pVM->cpum.s.HostFeatures.fMovBe      = true;
+    pVM->cpum.s.HostFeatures.fXSaveRstor = true;
+    pVM->cpum.s.HostFeatures.fOpSysXSaveRstor = true;
+    /** @todo r=aeichner Keep AVX/AVX2 disabled for now, too many missing instruction emulations. */
+# if 1
+    pVM->cpum.s.HostFeatures.cbMaxExtendedState = RT_UOFFSETOF(X86XSAVEAREA, u.YmmHi);
+# else
+    pVM->cpum.s.HostFeatures.cbMaxExtendedState = RT_UOFFSETOF(X86XSAVEAREA, u.YmmHi) + sizeof(X86XSAVEYMMHI);
+    pVM->cpum.s.HostFeatures.fAvx               = false;
+    pVM->cpum.s.HostFeatures.fAvx2              = false;
+# endif
 #endif
 
@@ -2282 +2292 @@
                             ("%#llx\n", fXStateHostMask), fXStateHostMask = 0);
     }
+#elif defined(RT_ARCH_ARM64)
+    /** @todo r=aeichner Keep AVX/AVX2 disabled for now, too many missing instruction emulations. */
+    fXStateHostMask = XSAVE_C_X87 | XSAVE_C_SSE /*| XSAVE_C_YMM | XSAVE_C_OPMASK | XSAVE_C_ZMM_HI256 | XSAVE_C_ZMM_16HI*/;
 #endif
     pVM->cpum.s.fXStateHostMask = fXStateHostMask;
@@ -2290 +2303 @@
      * Initialize the host XSAVE/XRSTOR mask.
      */
-#if defined(RT_ARCH_X86) || defined(RT_ARCH_AMD64)
     uint32_t cbMaxXState = pVM->cpum.s.HostFeatures.cbMaxExtendedState;
     cbMaxXState = RT_ALIGN(cbMaxXState, 128);
@@ -2297 +2309 @@
                        && pVM->cpum.s.HostFeatures.cbMaxExtendedState <= sizeof(pVM->apCpusR3[0]->cpum.s.Guest.abXState)
                        , VERR_CPUM_IPE_2);
-#endif
 
     for (VMCPUID i = 0; i < pVM->cCpus; i++)

trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp

@@ -2891 +2891 @@
                                 ? NEMHCGetFeatures(pVM) & NEM_FEAT_F_XSAVE_XRSTOR
                                 : VM_IS_EXEC_ENGINE_IEM(pVM)
-                                ? false /** @todo IEM and XSAVE @bugref{9898} */
+                                ? true
                                 : fNestedPagingAndFullGuestExec);
     uint64_t const fXStateHostMask = pVM->cpum.s.fXStateHostMask;
@@ -2901 +2901 @@
      * host support at the moment.
      */
-    rc = cpumR3CpuIdReadIsaExtCfgEx(pVM, pIsaExts, "XSAVE", &pConfig->enmXSave, fNestedPagingAndFullGuestExec,
+    rc = cpumR3CpuIdReadIsaExtCfgEx(pVM, pIsaExts, "XSAVE", &pConfig->enmXSave, true,
                                     fMayHaveXSave /*fAllowed*/);
     AssertLogRelRCReturn(rc, rc);