Changeset 36232 in vbox for trunk/include/iprt

Timestamp:

Mar 9, 2011 4:41:09 PM (14 years ago)

Author:

vboxsync

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

70453

Message:

RTCPUSET, SUPDrv: Preparation for supporting 256 CPUs/cores/threads.

Location:

trunk/include/iprt

Files:

• cpuset.h (modified) (9 diffs)
• types.h (modified) (1 diff)

trunk/include/iprt/cpuset.h

@@ -42 +42 @@
  * The maximum number of CPUs a set can contain and IPRT is able
  * to reference.
+ *
+ * @remarks Must match the size of RTCPUSET.
  * @remarks This is the maximum value of the supported platforms.
  */
-#define RTCPUSET_MAX_CPUS       64
+#ifdef RT_WITH_LOTS_OF_CPUS
+# define RTCPUSET_MAX_CPUS      256
+#else
+# define RTCPUSET_MAX_CPUS      64
+#endif
 
 /**
@@ -54 +60 @@
 DECLINLINE(PRTCPUSET) RTCpuSetEmpty(PRTCPUSET pSet)
 {
+#ifdef RTCPUSET_IS_BITMAP
+    unsigned i;
+    for (i = 0; i < RT_ELEMENTS(pSet->bmSet); i++)
+        pSet->bmSet[i] = 0;
+#else
     *pSet = 0;
+#endif
     return pSet;
 }
@@ -67 +79 @@
 DECLINLINE(PRTCPUSET) RTCpuSetFill(PRTCPUSET pSet)
 {
+#ifdef RTCPUSET_IS_BITMAP
+    unsigned i;
+    for (i = 0; i < RT_ELEMENTS(pSet->bmSet); i++)
+        pSet->bmSet[i] = UINT64_MAX;
+#else
     *pSet = UINT64_MAX;
+#endif
     return pSet;
 }
@@ -167 +185 @@
 DECLINLINE(bool) RTCpuSetIsEqual(PCRTCPUSET pSet1, PCRTCPUSET pSet2)
 {
+#ifdef RTCPUSET_IS_BITMAP
+    unsigned i;
+    for (i = 0; i < RT_ELEMENTS(pSet1->bmSet); i++)
+        if (pSet1->bmSet[i] != pSet1->bmSet[i])
+            return false;
+    return true;
+#else
     return *pSet1 == *pSet2 ? true : false;
+#endif
 }
 
@@ -176 +202 @@
  * @returns The mask.
  * @param   pSet    Pointer to the set.
+ * @remarks Use with extreme care as it may lose information!
  */
 DECLINLINE(uint64_t) RTCpuSetToU64(PCRTCPUSET pSet)
 {
+#ifdef RTCPUSET_IS_BITMAP
+    return pSet->bmSet[0];
+#else
     return *pSet;
+#endif
 }
 
@@ -191 +222 @@
 DECLINLINE(PRTCPUSET) RTCpuSetFromU64(PRTCPUSET pSet, uint64_t fMask)
 {
+#ifdef RTCPUSET_IS_BITMAP
+    unsigned i;
+
+    pSet->bmSet[0] = fMask;
+    for (i = 1; i < RT_ELEMENTS(pSet->bmSet); i++)
+        pSet->bmSet[i] = 0;
+#else
     *pSet = fMask;
+#endif
     return pSet;
 }
@@ -204 +243 @@
 DECLINLINE(int) RTCpuSetCount(PCRTCPUSET pSet)
 {
-    int     cCpus = 0;
-    RTCPUID iCpu = 64;
+    int         cCpus = 0;
+#ifdef RTCPUSET_IS_BITMAP
+    unsigned    i;
+
+    for (i = 0; i < RT_ELEMENTS(pSet->bmSet); i++)
+    {
+        uint64_t u64 = pSet->bmSet[i];
+        if (u64 != 0)
+        {
+            unsigned iCpu = 64;
+            while (iCpu-- > 0)
+            {
+                if (u64 & 1)
+                    cCpus++;
+                u64 >>= 1;
+            }
+        }
+    }
+
+#else
+    unsigned    iCpu = 64;
     while (iCpu-- > 0)
         if (*pSet & RT_BIT_64(iCpu))
             cCpus++;
+#endif
     return cCpus;
 }
@@ -221 +280 @@
 DECLINLINE(int) RTCpuLastIndex(PCRTCPUSET pSet)
 {
+#ifdef RTCPUSET_IS_BITMAP
+    unsigned i = RT_ELEMENTS(pSet->bmSet);
+    while (i-- > 0)
+    {
+        uint64_t u64 = pSet->bmSet[i];
+        if (u64)
+        {
+            /* There are more efficient ways to do this in asm.h... */
+            unsigned iBit;
+            for (iBit = 63; iBit > 0; iBit--)
+            {
+                if (u64 & RT_BIT_64(63))
+                    break;
+                u64 <<= 1;
+            }
+            return i * 64 + iBit;
+        }
+    }
+    return 0;
+
+#else
     /* There are more efficient ways to do this in asm.h... */
     int iCpu = RTCPUSET_MAX_CPUS;
@@ -227 +307 @@
             return iCpu;
     return iCpu;
+#endif
 }
 

trunk/include/iprt/types.h

@@ -1672 +1672 @@
  * Treat this as an opaque type and always use RTCpuSet* for manupulating it.
  * @remarks Subject to change. */
+#ifdef RT_WITH_LOTS_OF_CPUS /** @todo RT_WITH_LOTS_OF_CPUS is just a temporary placeholder. */
+typedef struct RTCPUSET
+{
+    /** The bitmap.
+     * @remarks Must be large enough to hold RTCPUSET_MAX_CPUS bits, see
+     *          iprt/cpuset.h. */
+    uint64_t bmSet[256 / 64];
+} RTCPUSET;
+/** Indicates that RTCPUSET is a bitmap and not a 64-bit integer. */
+# define RTCPUSET_IS_BITMAP                         1
+#else
 typedef uint64_t                                    RTCPUSET;
+#endif
 /** Pointer to a CPU set. */
 typedef RTCPUSET                                   *PRTCPUSET;