Allow build-time USE_SIMD=... to take comma-separated list of options.

This lets us make build-time mix-and-match of things like avx, f16c, fma, etc., rather than choosing just one level.
AcademySoftwareFoundation · Apr 10, 2015 · 2560058 · 2560058
1 parent 40b98e1
commit 2560058
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,11 +196,15 @@ if (NOT USE_SIMD STREQUAL "")
     if (USE_SIMD STREQUAL "0")
         add_definitions ("-DOIIO_NO_SSE=1")
     else ()
-        if (MSVC OR CMAKE_COMPILER_IS_INTEL)
-            add_definitions ("/arch:${USE_SIMD}")
-        else ()
-            add_definitions ("-m${USE_SIMD}")
-        endif ()
+        string (REPLACE "," ";" SIMD_FEATURE_LIST ${USE_SIMD})
+        foreach (feature ${SIMD_FEATURE_LIST})
+            message (STATUS "SIMD feature: ${feature}")
+            if (MSVC OR CMAKE_COMPILER_IS_INTEL)
+                add_definitions ("/arch:${feature}")
+            else ()
+                add_definitions ("-m${feature}")
+            endif ()
+        endforeach()
     endif ()
 endif ()
 

diff --git a/Makefile b/Makefile
@@ -395,6 +395,6 @@ help:
 	@echo "      OIIO_BUILD_TESTS=0       Skip building the unit tests"
 	@echo "      BUILD_OIIOUTIL_ONLY=1    Build *only* libOpenImageIO_Util"
 	@echo "      USE_SIMD=arch            Build with SIMD support (choices: 0, sse2, sse3,"
-	@echo "                                    ssse3, sse4.1, sse4.2)"
+	@echo "                                    ssse3, sse4.1, sse4.2, f16c, comma-separated ok)"
 	@echo ""