Changeset 54456 in vbox

Timestamp:

Feb 24, 2015 4:09:25 PM (10 years ago)

Author:

vboxsync

Message:

SUPDrvGip.cpp: Sync macro fix. Profiling in progress...

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp (modified) (14 diffs)

trunk/src/VBox/HostDrivers/Support/SUPDrvGip.cpp

@@ -2400 +2400 @@
 static DECLCALLBACK(void) supdrvGipSyncAndInvariantTimer(PRTTIMER pTimer, void *pvUser, uint64_t iTick)
 {
-    RTCCUINTREG        uFlags;
-    uint64_t           u64TSC;
-    uint64_t           u64NanoTS;
-    PSUPDRVDEVEXT      pDevExt = (PSUPDRVDEVEXT)pvUser;
-    PSUPGLOBALINFOPAGE pGip = pDevExt->pGip;
-
-    uFlags    = ASMIntDisableFlags(); /* No interruptions please (real problem on S10). */
-    u64TSC    = ASMReadTSC();
-    u64NanoTS = RTTimeSystemNanoTS();
+    PSUPDRVDEVEXT      pDevExt   = (PSUPDRVDEVEXT)pvUser;
+    PSUPGLOBALINFOPAGE pGip      = pDevExt->pGip;
+    RTCCUINTREG        fOldFlags = ASMIntDisableFlags(); /* No interruptions please (real problem on S10). */
+    uint64_t           u64TSC    = ASMReadTSC();
+    uint64_t           u64NanoTS = RTTimeSystemNanoTS();
 
     if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_PRACTICALLY_ZERO)
@@ -2440 +2436 @@
     supdrvGipUpdate(pDevExt, u64NanoTS, u64TSC, NIL_RTCPUID, iTick);
 
-    ASMSetFlags(uFlags);
+    ASMSetFlags(fOldFlags);
 }
 
@@ -2452 +2448 @@
 static DECLCALLBACK(void) supdrvGipAsyncTimer(PRTTIMER pTimer, void *pvUser, uint64_t iTick)
 {
+    PSUPDRVDEVEXT   pDevExt   = (PSUPDRVDEVEXT)pvUser;
     RTCCUINTREG     fOldFlags = ASMIntDisableFlags(); /* No interruptions please (real problem on S10). */
-    PSUPDRVDEVEXT   pDevExt   = (PSUPDRVDEVEXT)pvUser;
     RTCPUID         idCpu     = RTMpCpuId();
     uint64_t        u64TSC    = ASMReadTSC();
@@ -2514 +2510 @@
 {
     /** Padding to make sure the iCurSeqNo is in its own cache line. */
-    uint64_t                    au64CacheLinePaddingBefore[GIP_TSC_DELTA_CACHE_LINE_SIZE / sizeof(uint64_t) - 1];
+    uint64_t                    au64CacheLinePaddingBefore[GIP_TSC_DELTA_CACHE_LINE_SIZE / sizeof(uint64_t)];
     /** The current sequence number of this worker. */
     uint32_t volatile           iCurSeqNo;
@@ -2612 +2608 @@
     /** Padding to make sure the master variables live in its own cache lines. */
     uint64_t                    au64CacheLinePaddingBefore[GIP_TSC_DELTA_CACHE_LINE_SIZE / sizeof(uint64_t)];
+    /** The time the master spent in the MP worker.  */
+    uint64_t                    cElapsedMasterTscTicks;
     /** Pointer to the master's synchronization struct (on stack). */
     PSUPTSCDELTASYNC2 volatile  pSyncMaster;
@@ -2633 +2631 @@
     /** Pointer to the worker's synchronization struct (on stack). */
     PSUPTSCDELTASYNC2 volatile  pSyncWorker;
+    /** The time the worker spent in the MP worker.  */
+    uint64_t                    cElapsedWorkerTscTicks;
     /** Verification test TSC values for the worker. */
     uint64_t volatile           auVerifyWorkerTscs[32];
@@ -2829 +2829 @@
 
 #define TSCDELTA_MASTER_SYNC_BEFORE(a_pMySync, a_pOtherSync) \
-    do { \
+    if (true) { \
         if (RT_LIKELY(supdrvTscDeltaSync2_Before(a_pMySync, a_pOtherSync, true /*fMaster*/, &uFlags))) \
         { /*likely*/ } \
         else break; \
-    } while (0)
+    } else do {} while (0)
 #define TSCDELTA_OTHER_SYNC_BEFORE(a_pMySync, a_pOtherSync) \
-    do { \
+    if (true) { \
         if (RT_LIKELY(supdrvTscDeltaSync2_Before(a_pMySync, a_pOtherSync, false /*fMaster*/, &uFlags))) \
         { /*likely*/ } \
         else break; \
-    } while (0)
+    } else do {} while (0)
 
 
@@ -2868 +2868 @@
 
 #define TSCDELTA_MASTER_SYNC_AFTER(a_pMySync, a_pOtherSync) \
-    do { \
-        if (supdrvTscDeltaSync2_After(a_pMySync, a_pOtherSync, uFlags)) \
+    if (true) { \
+        if (RT_LIKELY(supdrvTscDeltaSync2_After(a_pMySync, a_pOtherSync, uFlags))) \
         { /* likely */ } \
         else break; \
-    } while (0)
+    } else do {} while (0)
 
 #define TSCDELTA_MASTER_KICK_OTHER_OUT_OF_AFTER(a_pMySync, a_pOtherSync) \
-    do {\
+    if (true) { \
         /* \
-         * Tell the woker that we're done processing the data and ready for the next round. \
+         * Tell the worker that we're done processing the data and ready for the next round. \
          */ \
-        if (!ASMAtomicCmpXchgU32(&(a_pOtherSync)->uSyncVar, GIP_TSC_DELTA_SYNC2_READY, GIP_TSC_DELTA_SYNC2_GO)) \
+        if (RT_LIKELY(ASMAtomicCmpXchgU32(&(a_pOtherSync)->uSyncVar, GIP_TSC_DELTA_SYNC2_READY, GIP_TSC_DELTA_SYNC2_GO))) \
+        { /* likely */ } \
+        else break; \
+    } else do {} while (0)
+
+#define TSCDELTA_OTHER_SYNC_AFTER(a_pMySync, a_pOtherSync) \
+    if (true) { \
+        /* \
+         * Tell the master that we're done collecting data and wait for the next round to start. \
+         */ \
+        if (RT_LIKELY(ASMAtomicCmpXchgU32(&(a_pOtherSync)->uSyncVar, GIP_TSC_DELTA_SYNC2_READY, GIP_TSC_DELTA_SYNC2_GO))) \
+        { /* likely */ } \
+        else \
         { \
             ASMSetFlags(uFlags); \
             break; \
         } \
-    } while (0)
-
-#define TSCDELTA_OTHER_SYNC_AFTER(a_pMySync, a_pOtherSync) \
-    do { \
-        /* \
-         * Tell the master that we're done collecting data and wait for the next round to start. \
-         */ \
-        if (!ASMAtomicCmpXchgU32(&(a_pOtherSync)->uSyncVar, GIP_TSC_DELTA_SYNC2_READY, GIP_TSC_DELTA_SYNC2_GO)) \
-        { \
-            ASMSetFlags(uFlags); \
-            break; \
-        } \
-        if (supdrvTscDeltaSync2_After(a_pMySync, a_pOtherSync, uFlags)) \
+        if (RT_LIKELY(supdrvTscDeltaSync2_After(a_pMySync, a_pOtherSync, uFlags))) \
         { /* likely */ } \
         else break; \
-    } while (0)
+    }  else do {} while (0)
 /** @} */
 
@@ -3119 +3119 @@
     pArgs->M2.cHits     += cHits;
 
+#if 1
     /*
      * Check and see if we can quit a little early.  If the result is already
@@ -3147 +3148 @@
         }
     }
+#endif
 }
 
@@ -3623 +3625 @@
      * This should normally be the case.
      */
+#if 1
     rc = supdrvTscDeltaVerify(pArgs, &MySync, pOtherSync, fIsMaster, GIP_TSC_DELTA_INITIAL_MASTER_VALUE);
+#else
+    rc = VERR_OUT_OF_RANGE;
+#endif
     if (RT_SUCCESS(rc))
     {
@@ -3666 +3672 @@
              * Success? If so, stop trying.
              */
+#if 1
             if (pGipCpuWorker->i64TSCDelta != INT64_MAX)
+#else
+            if (pGipCpuWorker->i64TSCDelta != INT64_MAX && iTry >= 11)
+#endif
             {
                 if (fIsMaster)
@@ -3701 +3711 @@
     }
 
+    /*
+     * Collect some runtime stats.
+     */
+    if (fIsMaster)
+        pArgs->cElapsedMasterTscTicks = ASMReadTSC() - MySync.uTscStart;
+    else
+        pArgs->cElapsedWorkerTscTicks = ASMReadTSC() - MySync.uTscStart;
     return 0;
 }
@@ -3848 +3865 @@
                 if (RT_SUCCESS(rc))
                 {
+#if 0
+                    SUPR0Printf("mponpair ticks: %9llu %9llu  max: %9llu\n", pArgs->cElapsedMasterTscTicks,
+                                pArgs->cElapsedWorkerTscTicks, pArgs->cMaxTscTicks);
+#endif
 #if 0
                     SUPR0Printf("rcVerify=%d iVerifyBadTscDiff=%lld cMinVerifyTscTicks=%lld cMaxVerifyTscTicks=%lld\n",