added compile definitions for simd sort

Signed-off-by: Hari Hara Naveen S <harihara.sn@gmail.com>

CMakeLists.txt

@@ -545,38 +545,30 @@ hpx_option(
 )
 
 hpx_option(
-  HPX_WITH_FETCH_SIMD_SORT
+  HPX_WITH_SIMD_SORT
   BOOL
   "Use FetchContent to fetch x86-simd-sort. By default an installed x86-simd-sort will be used. (default: On). It has support only for AVX-512 registers. If the architecture has no AVX-512 registers, simd-sort won't be used"
   ON
   CATEGORY "Build Targets"
   ADVANCED
 )
 hpx_option(
-  HPX_WITH_SIMD_SORT_TAG STRING "x86-simd-sort repository tag or branch" "v2.0"
+  HPX_WITH_SIMD_SORT_TAG STRING "x86-simd-sort repository tag or branch"
+  "1b396372e2bc10fd883d49e28dfc2a5ea5d2e194"
   CATEGORY "Build Targets"
   ADVANCED
 )
 
-add_compile_options(-march=native)
+hpx_check_for_32bit_simd_sort(DEFINITIONS HPX_HAVE_AVX512F)
 
-# simd sort supports only avx-512 registers
-# if(__AVX512F__)
-  set(HPX_WITH_SIMD_SORT ON)
-  if(HPX_WITH_FETCH_SIMD_SORT)
-    include(HPX_SetupSimdSort)
-  else()
-    find_package(SimdSort)
-  endif()
-
-# else()
-  # set(HPX_WITH_SIMD_SORT OFF)
-  # set(HPX_WITH_FETCH_SIMD_SORT OFF)
-# endif()
+if(NOT (HPX_WITH_AVX512F))
+  set(HPX_WITH_SIMD_SORT Off)
+endif()
 
-# debug message to be removed before merge
-message(WARNING "HPX_WITH_SIMD_SORT : ${HPX_WITH_SIMD_SORT}")
-message(WARNING "HPX_WITH_FETCH_SIMD_SORT : ${HPX_WITH_FETCH_SIMD_SORT}")
+if(HPX_WITH_SIMD_SORT)
+  hpx_add_config_define(HPX_HAVE_SIMD_SORT)
+  include(HPX_SetupSimdSort)
+endif()
 
 # ##############################################################################
 # HPX CUDA configuration

cmake/FindSimdSort.cmake

@@ -31,9 +31,9 @@ if(NOT TARGET SimdSort::simdsort)
     VERSION_VAR SIMD_SORT_VERSION_STRING
   )
 
-  add_library(SimdSort::simdsort INTERFACE IMPORTED)
+  add_library(SimdSort::simdsort PRIVATE IMPORTED)
   target_include_directories(
-    SimdSort::simdsort SYSTEM INTERFACE ${SIMD_SORT_INCLUDE_DIR}
+    SimdSort::simdsort SYSTEM PRIVATE ${SIMD_SORT_INCLUDE_DIR}
   )
 
   mark_as_advanced(

cmake/HPX_AddConfigTest.cmake

@@ -713,3 +713,12 @@ function(hpx_check_for_stable_inplace_merge)
     FILE ${ARGN}
   )
 endfunction()
+
+# ##############################################################################
+function(hpx_check_avx512f)
+  add_hpx_config_test(
+    HPX_WITH_AVX512F
+    SOURCE cmake/tests/avx512f.cpp
+    FILE ${ARGN} CXXFLAGS -mavx512f 
+  )
+endfunction()

libs/core/algorithms/include/hpx/parallel/algorithms/detail/simd_sort.hpp

@@ -6,13 +6,12 @@
 
 #pragma once
 
-// #include <avx512-16bit-qsort.hpp>
-// #include <avx512-32bit-qsort.hpp>
+#ifdef HPX_HAVE_SIMD_SORT
+#include <avx512-32bit-qsort.hpp>
 #include <avx512-64bit-qsort.hpp>
 
 #include <type_traits>
 
-
 namespace hpx::parallel::util {
     // TODO : add support for _Float16
     // need compile time test as _Float16 is not always supported
@@ -42,7 +41,7 @@ namespace hpx::parallel::util {
     constexpr bool is_simd_sortable_v = is_simd_sortable<T>::value;
 }    // namespace hpx::parallel::util
 
-#if (HPX_WITH_SIMD_SORT)
+// #if (HPX_WITH_SIMD_SORT)
 
 namespace hpx::parallel::util {
     template <typename T>