finish

mlc-ai · Jan 24, 2025 · b702170 · b702170
1 parent 933f6f5
commit b702170
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/cpp/support/dynamic_bitset.h b/cpp/support/dynamic_bitset.h
@@ -10,6 +10,11 @@
 #include <cstring>
 #include <vector>
 
+// For __popcnt
+#ifdef _MSC_VER
+#include <intrin.h>
+#endif
+
 #include "logging.h"
 
 namespace xgrammar {
@@ -177,8 +182,10 @@ class DynamicBitset {
   }
 
   static int PopCount(uint32_t value) {
-#if defined(__GNUC__) || defined(_MSC_VER)
+#ifdef __GNUC__
     return __builtin_popcount(value);
+#elif defined(_MSC_VER)
+    return __popcnt(value);
 #else
     XGRAMMAR_LOG(FATAL) << "PopCount is not supported on this platform";
 #endif

diff --git a/cpp/support/utils.h b/cpp/support/utils.h
@@ -10,12 +10,6 @@
 #include <functional>
 #include <tuple>
 
-// Define __builtin_popcount for MSVC
-#ifdef _MSC_VER
-#include <intrin.h>
-#define __builtin_popcount __popcnt
-#endif
-
 namespace xgrammar {
 
 /*!