Add AVX for windows

PointCloudLibrary · Feb 7, 2021 · 9a477f3 · 9a477f3
1 parent b980822
commit 9a477f3
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,6 +90,12 @@ if(PCL_ENABLE_SSE AND "${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}"
   PCL_CHECK_FOR_SSE()
 endif()
 
+# check for AVX flags for windows
+if(PCL_ENABLE_AVX AND "${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}")
+  include("${PCL_SOURCE_DIR}/cmake/pcl_find_avx.cmake")
+  PCL_CHECK_FOR_AVX()
+endif()
+
 # ---[ Unix/Darwin/Windows specific flags
 if(CMAKE_COMPILER_IS_GNUCXX)
   if("${CMAKE_CXX_FLAGS}" STREQUAL "${CMAKE_CXX_FLAGS_DEFAULT}")
@@ -122,7 +128,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 if(CMAKE_COMPILER_IS_MSVC)
-  add_definitions("-DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES ${SSE_DEFINITIONS}")
+  add_definitions("-DBOOST_ALL_NO_LIB -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX -DPCL_ONLY_CORE_POINT_TYPES ${SSE_DEFINITIONS} ${AVX_DEFINITIONS}")
 
   add_compile_options(/bigobj)
 

diff --git a/cmake/pcl_find_avx.cmake b/cmake/pcl_find_avx.cmake
@@ -0,0 +1,40 @@
+###############################################################################
+# Check for the presence of AVX and figure out the flags to use for it.
+macro(PCL_CHECK_FOR_AVX)
+    set(AVX_FLAGS)
+    set(AVX_DEFINITIONS)
+
+    include(CheckCXXSourceRuns)
+
+    check_cxx_source_runs("
+        #include <immintrin.h>
+		int main()
+		{
+		     __m256 a;
+		     a = _mm256_set1_ps(0);
+		     return 0;
+		}"
+        HAVE_AVX)
+
+    check_cxx_source_runs("	
+  		#include <immintrin.h>
+		int main()
+		{
+		    __m256i a = {0};
+		    a = _mm256_abs_epi16(a);
+		    return 0;
+		}"
+		HAVE_AVX2)
+
+    if(MSVC)
+        if(HAVE_AVX)
+            set(AVX_DEFINITIONS "${AVX_DEFINITIONS} -D__AVX__")
+			add_definitions(/arch:AVX)
+        endif()
+        if(HAVE_AVX2)
+            set(AVX_DEFINITIONS "${AVX_DEFINITIONS} -D__AVX2__")
+			add_definitions(/arch:AVX2)
+        endif()
+	endif()
+
+endmacro()
diff --git a/cmake/pcl_options.cmake b/cmake/pcl_options.cmake
@@ -42,6 +42,12 @@ mark_as_advanced(PCL_NO_PRECOMPILE)
 option(PCL_ENABLE_SSE "Enable or Disable SSE optimizations." ON)
 mark_as_advanced(PCL_ENABLE_SSE)
 
+if(WIN32)
+  # Enable or Disable the check for AVX optimizations
+  option(PCL_ENABLE_AVX "Enable or Disable AVX optimizations." ON)
+  mark_as_advanced(PCL_ENABLE_AVX)
+endif()
+
 # Allow the user to enable compiler cache
 option(PCL_ENABLE_CCACHE "Enable using compiler cache for compilation" OFF)
 mark_as_advanced(PCL_ENABLE_CCACHE)