Include highway/x86-simd-sort at compile time

numpy · seiko2plus · Dec 4, 2023 · Oct 13, 2023 · Oct 17, 2023 · Oct 17, 2023
commit a3ca84b0575f46845a566567bf01cdc08fbb2e49
diff --git a/numpy/_core/src/npysort/highway_qsort.dispatch.cpp b/numpy/_core/src/npysort/highway_qsort.dispatch.cpp
@@ -2,7 +2,7 @@
  * $maxopt $keep_baseline
  * asimd
  */
-// policy $keep_baseline is used to avoid skip building avx512_skx
+// policy $keep_baseline is used to avoid skip building asimd
 // when its part of baseline features (--cpu-baseline), since
 // 'baseline' option isn't specified within targets.
 
@@ -43,6 +43,6 @@ template<> void NPY_CPU_DISPATCH_CURFX(QSort)(double *arr, intptr_t size)
 }
 #endif // NPY_HAVE_ASIMD
 
-}} // namespace np::simd
+}} // namespace np::qsort_simd
 
 #endif // __CYGWIN__
diff --git a/numpy/_core/src/npysort/quicksort.cpp b/numpy/_core/src/npysort/quicksort.cpp
@@ -87,16 +87,13 @@ inline bool quicksort_dispatch(T *start, npy_intp num)
     }
     else if (sizeof(T) == sizeof(uint32_t) || sizeof(T) == sizeof(uint64_t)) {
         #ifndef NPY_DISABLE_OPTIMIZATION
-            #include "x86_simd_qsort.dispatch.h"
-        #endif
-        NPY_CPU_DISPATCH_CALL_XB(dispfunc = np::qsort_simd::template QSort, <TF>);
-        // If not dispatched for avx-512 or avx2:
-        if (dispfunc == nullptr) {
-            #ifndef NPY_DISABLE_OPTIMIZATION
+            #if defined(NPY_CPU_AMD64) || defined(NPY_CPU_X86) // x86 32-bit and 64-bit
+                #include "x86_simd_qsort.dispatch.h"
+            #else
                 #include "highway_qsort.dispatch.h"
             #endif
-            NPY_CPU_DISPATCH_CALL_XB(dispfunc = np::qsort_simd::template QSort, <TF>);
-        }
+        #endif
+        NPY_CPU_DISPATCH_CALL_XB(dispfunc = np::qsort_simd::template QSort, <TF>);
     }
     if (dispfunc) {
         (*dispfunc)(reinterpret_cast<TF*>(start), static_cast<intptr_t>(num));

diff --git a/numpy/_core/src/npysort/x86_simd_qsort.dispatch.cpp b/numpy/_core/src/npysort/x86_simd_qsort.dispatch.cpp
@@ -119,6 +119,6 @@ template<> void NPY_CPU_DISPATCH_CURFX(QSort)(double *arr, npy_intp num)
 }
 #endif // NPY_HAVE_AVX512_SKX || NPY_HAVE_AVX2
 
-}} // namespace np::simd
+}} // namespace np::qsort_simd
 
 #endif // __CYGWIN__