Merge pull request #35 from lemire/dlemire/add_windows_arm_checks

Adding ARM checks under Windows.
lemire · Jun 7, 2021 · 4d421be · 4d421be
2 parents 1a4ac1c + 890b60d
commit 4d421be
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/.github/workflows/vs16-arm-ci.yml b/.github/workflows/vs16-arm-ci.yml
@@ -0,0 +1,21 @@
+name: VS16-ARM-CI
+
+on: [push, pull_request]
+
+jobs:
+  ci:
+    name: windows-vs16
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {arch: ARM}
+          - {arch: ARM64}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: Use cmake
+        run: |
+          cmake -A ${{ matrix.arch }} -DCMAKE_CROSSCOMPILING=1 -DFASTFLOAT_TEST=ON -B build  &&
+          cmake --build build --verbose
diff --git a/include/ewah/ewahutil.h b/include/ewah/ewahutil.h
@@ -155,7 +155,7 @@ static inline uint32_t ctz16(uint16_t n) {
 inline uint32_t countOnes(uint32_t x) {
   return static_cast<uint32_t>(__builtin_popcount(x));
 }
-#elif defined(_MSC_VER) && _MSC_VER >= 1400
+#elif defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_M_ARM)&& !defined(_M_ARM64)
 inline uint32_t countOnes(uint32_t x) { return __popcnt(x); }
 #else
 inline uint32_t countOnes(uint32_t v) {
@@ -173,7 +173,7 @@ inline uint32_t countOnes(uint32_t v) {
 inline uint32_t countOnes(uint64_t x) {
   return static_cast<uint32_t>(__builtin_popcountll(x));
 }
-#elif defined(_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1400
+#elif defined(_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_M_ARM64)
 inline uint32_t countOnes(uint64_t x) {
   return static_cast<uint32_t>(__popcnt64(static_cast<__int64>(x)));
 }