Changeset 4480

Timestamp:

Feb 8, 2015, 1:22:56 PM (4 years ago)

Author:

nmedfort

Message:

modified CMakeLists.txt to allow for user specification of simd operations.

Location:

icGREP/icgrep-devel

Files:

• README-icgrep-0.98.txt (modified) (1 diff)
• icgrep/CMakeLists.txt (modified) (6 diffs)

icGREP/icgrep-devel/README-icgrep-0.98.txt

@@ -45 +45 @@
 system generator.
 (IC1)  open a terminal window and cd to the icgrep-build directory
-(IC2)  enter the following command to build the makefiles
+(IC2.1)  enter the following command to build the makefiles
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/clang++ -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/clang ../icgrep
+(IC2.2)  to specify the type of supported SIMD operations rather than relying on auto detection
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER:FILEPATH=/usr/bin/clang++ -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/clang -DSIMD_SUPPORT=XXX ../icgrep
+     Where XXX can be SSE2, SSE3, SSE4_1, SSE4_2, AVX1 or AVX2.
 (IC3) Enter the command "make"
 

icGREP/icgrep-devel/icgrep/CMakeLists.txt

@@ -43 +43 @@
 # Let's suppose we want to build a JIT compiler with support for
 # binary code (no interpreter):
-llvm_map_components_to_libraries(REQ_LLVM_LIBRARIES mcjit native)
+llvm_map_components_to_libnames(REQ_LLVM_LIBRARIES mcjit native)
 
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
@@ -169 +169 @@
 }")
 
-set(AVX_1_CODE "
+set(AVX1_CODE "
 #include <immintrin.h>
 int main()
@@ -180 +180 @@
 }")
 
-set(AVX_2_CODE "
+set(AVX2_CODE "
 #include <immintrin.h>
 int main()
@@ -197 +197 @@
   SET(ENABLE_SSE4_1 "/arch:SSE4")
   SET(ENABLE_SSE4_2 "/arch:SSE4")
-  SET(ENABLE_AVX_1 "/arch:AVX1")
-  SET(ENABLE_AVX_2 "/arch:AVX2")
+  SET(ENABLE_AVX1 "/arch:AVX1")
+  SET(ENABLE_AVX2 "/arch:AVX2")
 ELSE() # using Clang, GCC, Intel C++, etc  
   SET(ENABLE_SSE1 "-msse")
@@ -206 +206 @@
   SET(ENABLE_SSE4_2 "-msse4.2")
   IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    SET(ENABLE_AVX_1 "-mavx -fabi-version=6")
-    SET(ENABLE_AVX_2 "-mavx2 -fabi-version=6")  
+    SET(ENABLE_AVX1 "-mavx -fabi-version=6")
+    SET(ENABLE_AVX2 "-mavx2 -fabi-version=6")  
   ELSE()
-    SET(ENABLE_AVX_1 "-mavx")
-    SET(ENABLE_AVX_2 "-mavx2")
+    SET(ENABLE_AVX1 "-mavx")
+    SET(ENABLE_AVX2 "-mavx2")
   ENDIF()
 ENDIF()
 
-set(CMAKE_REQUIRED_FLAGS)
-set(SIMD_SUPPORT_FOUND)
-set(SIMD_MAX_BLOCK_SIZE)
-
-MACRO(CHECK_SIMD_SUPPORT type maxBlockSize)
-  IF(NOT SIMD_SUPPORT_FOUND)  
-    set(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
-    set(CMAKE_REQUIRED_FLAGS ${ENABLE_${type}})
-    check_cxx_source_runs("${${type}_CODE}" ${type})    
-    IF(${type})
-      SET(SIMD_SUPPORT_FOUND ${CMAKE_REQUIRED_FLAGS})
-      SET(SIMD_MAX_BLOCK_SIZE ${maxBlockSize})
+SET(CMAKE_REQUIRED_FLAGS)
+
+MACRO(CHECK_SIMD_SUPPORT SIMD_TYPE RESULT)
+  IF(NOT RESULT)  
+    SET(CMAKE_REQUIRED_FLAGS_SAVE ${CMAKE_REQUIRED_FLAGS})
+    SET(CMAKE_REQUIRED_FLAGS ${ENABLE_${SIMD_TYPE}})
+    SET(SUCCESS "${SIMD_TYPE}")
+    check_cxx_source_runs("${${SIMD_TYPE}_CODE}" ${SUCCESS})    
+    IF(${SUCCESS})
+      SET(${RESULT} "${SIMD_TYPE}")
     ENDIF()
     SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
@@ -231 +229 @@
 ENDMACRO()
 
-CHECK_SIMD_SUPPORT("AVX_2" 256)
-CHECK_SIMD_SUPPORT("AVX_1" 128)
-CHECK_SIMD_SUPPORT("SSE4_2" 128)
-CHECK_SIMD_SUPPORT("SSE4_1" 128)
-CHECK_SIMD_SUPPORT("SSE3" 128)
-CHECK_SIMD_SUPPORT("SSE2" 128)
-CHECK_SIMD_SUPPORT("SSE1" 128)
-
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SIMD_SUPPORT_FOUND}")
+IF(NOT SIMD_SUPPORT)
+SET(RESULT)
+CHECK_SIMD_SUPPORT("AVX2" RESULT)
+CHECK_SIMD_SUPPORT("AVX1" RESULT)
+CHECK_SIMD_SUPPORT("SSE4_2" RESULT)
+CHECK_SIMD_SUPPORT("SSE4_1" RESULT)
+CHECK_SIMD_SUPPORT("SSE3" RESULT)
+CHECK_SIMD_SUPPORT("SSE2" RESULT)
+CHECK_SIMD_SUPPORT("SSE1" RESULT)
+SET(SIMD_SUPPORT ${RESULT} CACHE STRING "SSE2")
+ENDIF()
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ENABLE_${SIMD_SUPPORT}}")
 
 # detect LLVM version and add compiler flags.
 if (${LLVM_PACKAGE_VERSION} MATCHES "3.4")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LLVM_3_4")
-elseif (${LLVM_PACKAGE_VERSION} MATCHES "3.5")
+ELSEIF (${LLVM_PACKAGE_VERSION} MATCHES "3.5")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LLVM_3_5")
-endif(${LLVM_PACKAGE_VERSION} MATCHES "3.4")
+ENDIF()
 
 IF (BLOCK_SIZE_256)
-  IF(${SIMD_MAX_BLOCK_SIZE} GREATER 128)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_S2P_AVX2 -DBLOCK_SIZE=256 -march=core-avx2 -m64")
-  ELSE()
-    MESSAGE(FATAL_ERROR "AVX2 or better is required for BLOCK_SIZE=256")
-  ENDIF()
 ENDIF()