refactor optimization flags

alpaka-group · Oct 6, 2021 · 94946cf · 94946cf
1 parent 9e63caa
commit 94946cf
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 94 deletions.
diff --git a/examples/alpaka/nbody/CMakeLists.txt b/examples/alpaka/nbody/CMakeLists.txt
@@ -10,19 +10,8 @@ alpaka_add_executable(${PROJECT_NAME} nbody.cpp ../../common/Stopwatch.hpp)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
 target_link_libraries(${PROJECT_NAME} PRIVATE llama::llama alpaka::alpaka Vc::Vc)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		#-fno-math-errno # sqrt prevents vectorization otherwise
-		-march=native
-		-ffast-math
-	)
-elseif(MSVC)
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		/arch:AVX2
-		/fp:fast
-	)
+if (MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2 /fp:fast)
+else()
+	target_compile_options(${PROJECT_NAME} PRIVATE -march=native -ffast-math)
 endif()
diff --git a/examples/alpaka/pic/CMakeLists.txt b/examples/alpaka/pic/CMakeLists.txt
@@ -12,14 +12,7 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
 target_link_libraries(${PROJECT_NAME} PRIVATE llama::llama fmt::fmt alpaka::alpaka OpenMP::OpenMP_CXX)
 
 if (MSVC)
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		/arch:AVX2
-		/fp:fast
-	)
-elseif()
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		#-fno-math-errno # sqrt prevents vectorization otherwise
-		-march=native
-		-ffast-math
-	)
+	target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2 /fp:fast)
+else()
+	target_compile_options(${PROJECT_NAME} PRIVATE -march=native -ffast-math)
 endif()
diff --git a/examples/heatequation/CMakeLists.txt b/examples/heatequation/CMakeLists.txt
@@ -13,18 +13,8 @@ if (Vc_FOUND)
 	target_link_libraries(${PROJECT_NAME} PRIVATE Vc::Vc)
 endif()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		-march=native
-		-ffast-math
-	)
+if (MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2 /fp:fast)
 elseif(MSVC)
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		/arch:AVX2
-		/fp:fast
-	)
+	target_compile_options(${PROJECT_NAME} PRIVATE -march=native -ffast-math)
 endif()
diff --git a/examples/nbody/CMakeLists.txt b/examples/nbody/CMakeLists.txt
@@ -15,19 +15,8 @@ if (Vc_FOUND)
 	target_link_libraries(${PROJECT_NAME} PRIVATE Vc::Vc)
 endif()
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		#-fno-math-errno # sqrt prevents vectorization otherwise
-		-march=native
-		-ffast-math
-	)
-elseif(MSVC)
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		/arch:AVX2
-		/fp:fast
-	)
+if (MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2 /fp:fast)
+else()
+	target_compile_options(${PROJECT_NAME} PRIVATE -march=native -ffast-math)
 endif()
diff --git a/examples/nbody_benchmark/CMakeLists.txt b/examples/nbody_benchmark/CMakeLists.txt
@@ -9,20 +9,8 @@ add_executable(${PROJECT_NAME} nbody.cpp)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
 target_link_libraries(${PROJECT_NAME} PRIVATE llama::llama fmt::fmt)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		#-fno-math-errno # sqrt prevents vectorization otherwise
-		-march=native
-		-ffast-math
-	)
+if (MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2 /fp:fast /bigobj)
 elseif(MSVC)
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		/arch:AVX2
-		/fp:fast
-		/bigobj
-	)
+	target_compile_options(${PROJECT_NAME} PRIVATE -march=native -ffast-math)
 endif()
diff --git a/examples/raycast/CMakeLists.txt b/examples/raycast/CMakeLists.txt
@@ -9,3 +9,9 @@ add_executable(${PROJECT_NAME} raycast.cpp)
 target_include_directories(${PROJECT_NAME} PRIVATE ../../thirdparty/stb/include)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
 target_link_libraries(${PROJECT_NAME} PRIVATE tinyobjloader::tinyobjloader llama::llama)
+
+if (MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2 /fp:fast)
+else()
+	target_compile_options(${PROJECT_NAME} PRIVATE -march=native -ffast-math)
+endif()
diff --git a/examples/vectoradd/CMakeLists.txt b/examples/vectoradd/CMakeLists.txt
@@ -8,18 +8,8 @@ add_executable(${PROJECT_NAME} vectoradd.cpp ../common/Stopwatch.hpp)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
 target_link_libraries(${PROJECT_NAME} PRIVATE llama::llama)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		-march=native
-		-ffast-math
-	)
-elseif(MSVC)
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		/arch:AVX2
-		/fp:fast
-	)
+if (MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2 /fp:fast)
+else()
+	target_compile_options(${PROJECT_NAME} PRIVATE -march=native -ffast-math)
 endif()
diff --git a/examples/viewcopy/CMakeLists.txt b/examples/viewcopy/CMakeLists.txt
@@ -9,16 +9,8 @@ add_executable(${PROJECT_NAME} viewcopy.cpp ../common/Stopwatch.hpp)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_20)
 target_link_libraries(${PROJECT_NAME} PRIVATE llama::llama OpenMP::OpenMP_CXX)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR
-	CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		-march=native
-	)
-elseif(MSVC)
-	target_compile_options(${PROJECT_NAME} PRIVATE
-		/arch:AVX2
-	)
+if (MSVC)
+	target_compile_options(${PROJECT_NAME} PRIVATE /arch:AVX2)
+else()
+	target_compile_options(${PROJECT_NAME} PRIVATE -march=native)
 endif()