Changeset 87634 in vbox for trunk/src/VBox/VMM

Timestamp:

Feb 5, 2021 9:52:24 PM (4 years ago)

Author:

vboxsync

Message:

VMM/TM,VMM/HMVMX: Try avoid calling TMCpuTickGetDeadlineAndTscOffset as it is expensive. Current approach is a bit erratic wrt CPUID benchmark results, but it's generally better than before. [build fix]

File:

• trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/TMAllCpu.cpp

@@ -234 +234 @@
 
 
-#ifdef VBOX_WITH_STATISTICS
+#ifdef IN_RING0 /* Only used in ring-0 at present (AMD-V and VT-x). */
+
+# ifdef VBOX_WITH_STATISTICS
 /**
  * Record why we refused to use offsetted TSC.
@@ -269 +271 @@
     }
 }
-#endif /* VBOX_WITH_STATISTICS */
-
-
-#ifdef IN_RING0 /* Only used in ring-0 at present (AMD-V and VT-x). */
+# endif /* VBOX_WITH_STATISTICS */
+
 /**
  * Checks if AMD-V / VT-x can use an offsetted hardware TSC or not.
@@ -355 +355 @@
     return false;
 }
-#endif /* IN_RING0 - at the moment */
+
 
 /**
@@ -371 +371 @@
 {
     AssertCompile(TMCLOCK_FREQ_VIRTUAL <= _4G);
-#ifdef IN_RING3
+# ifdef IN_RING3
     RT_NOREF_PV(pVCpu);
     uint64_t uCpuHz = SUPGetCpuHzFromGip(g_pSUPGlobalInfoPage);
-#else
+# else
     uint64_t uCpuHz = SUPGetCpuHzFromGipBySetIndex(g_pSUPGlobalInfoPage, pVCpu->iHostCpuSet);
-#endif
+# endif
     if (RT_UNLIKELY(cNsToDeadline >= TMCLOCK_FREQ_VIRTUAL))
         return uCpuHz;
@@ -389 +389 @@
 
 
-#ifdef IN_RING0 /* Only used in ring-0 from VT-x code at the moment. */
 /**
  * Gets the next deadline in host CPU clock ticks and the TSC offset if we can
@@ -466 +465 @@
     return tmCpuCalcTicksToDeadline(pVCpu, TMVirtualSyncGetNsToDeadline(pVM, puDeadlineVersion, puTscNow));
 }
+
 #endif /* IN_RING0 - at the moment */
-
 
 /**