Support DYNAMIC_ARCH with cmake

Author: isuruf

CMakeLists.txt

@@ -209,13 +209,21 @@ set_target_properties(${OpenBLAS_LIBNAME} PROPERTIES
 #	@echo "#define EXPRECISION">> config_last.h
 #endif
 ###
+
 #ifeq ($(DYNAMIC_ARCH), 1)
 #	@$(MAKE) -C kernel commonlibs || exit 1
 #	@for d in $(DYNAMIC_CORE) ; \
 #	do  $(MAKE) GOTOBLAS_MAKEFILE= -C kernel TARGET_CORE=$$d kernel || exit 1 ;\
 #	done
 #	@echo DYNAMIC_ARCH=1 >> Makefile.conf_last
 #endif
+if (${DYNAMIC_ARCH})
+  add_subdirectory(kernel)
+  foreach(TARGET_CORE ${DYNAMIC_CORE})
+    list(APPEND TARGET_OBJS "$<TARGET_OBJECTS:kernel_${DYNAMIC_CORE}>")
+  endforeach()
+endif ()
+
 #ifdef USE_THREAD
 #	@echo USE_THREAD=$(USE_THREAD) >>  Makefile.conf_last
 #endif

cmake/arch.cmake

@@ -64,16 +64,16 @@ endif ()
 
 if (DYNAMIC_ARCH)
   if (${ARCH} STREQUAL "x86")
-    set(DYNAMIC_CORE "KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS CORE2 PENRYN DUNNINGTON NEHALEM ATHLON OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO")
+    set(DYNAMIC_CORE KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS CORE2 PENRYN DUNNINGTON NEHALEM ATHLON OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO)
   endif ()
 
   if (${ARCH} STREQUAL "x86_64")
-    set(DYNAMIC_CORE "PRESCOTT CORE2 PENRYN DUNNINGTON NEHALEM OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO")
+    set(DYNAMIC_CORE PRESCOTT CORE2 PENRYN DUNNINGTON NEHALEM OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO)
     if (NOT NO_AVX)
-      set(DYNAMIC_CORE "${DYNAMIC_CORE} SANDYBRIDGE BULLDOZER PILEDRIVER STEAMROLLER")
+      set(DYNAMIC_CORE ${DYNAMIC_CORE} SANDYBRIDGE BULLDOZER PILEDRIVER STEAMROLLER)
     endif ()
     if (NOT NO_AVX2)
-      set(DYNAMIC_CORE "${DYNAMIC_CORE} HASWELL ZEN")
+      set(DYNAMIC_CORE ${DYNAMIC_CORE} HASWELL ZEN)
     endif ()
   endif ()
 

cmake/prebuild.cmake

@@ -46,9 +46,11 @@ if (DEFINED TARGET_CORE)
   set(GETARCH2_FLAGS "-DBUILD_KERNEL")
   set(TARGET_MAKE "Makefile_kernel.conf")
   set(TARGET_CONF "config_kernel.h")
+  set(TARGET_CONF_DIR ${PROJECT_BINARY_DIR}/kernel_config/${TARGET_CORE})
 else()
   set(TARGET_MAKE "Makefile.conf")
   set(TARGET_CONF "config.h")
+  set(TARGET_CONF_DIR ${PROJECT_BINARY_DIR})
 endif ()
 
 set(TARGET_CONF_TEMP "${PROJECT_BINARY_DIR}/${TARGET_CONF}.tmp")
@@ -129,7 +131,13 @@ execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE
 
 # append config data from getarch_2nd to the TARGET file and read in CMake vars
 file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT})
-configure_file(${TARGET_CONF_TEMP} ${PROJECT_BINARY_DIR}/${TARGET_CONF} COPYONLY)
+
+if (${BUILD_KERNEL})
+    configure_file(${TARGET_CONF_TEMP} ${PROJECT_BINARY_DIR}/kernel_config/${TARGET_CORE}/${TARGET_CONF} COPYONLY)
+else ()
+    configure_file(${TARGET_CONF_TEMP} ${PROJECT_BINARY_DIR}/${TARGET_CONF} COPYONLY)
+endif ()
+
 ParseGetArchVars(${GETARCH2_MAKE_OUT})
 
 # compile get_config_h

cmake/system.cmake

@@ -2,7 +2,6 @@
 ## Author: Hank Anderson <hank@statease.com>
 ## Description: Ported from OpenBLAS/Makefile.system
 ##
-
 set(NETLIB_LAPACK_DIR "${PROJECT_SOURCE_DIR}/lapack-netlib")
 
 # TODO: Makefile.system detects Darwin (mac) and switches to clang here -hpa

cmake/utils.cmake

@@ -225,7 +225,7 @@ function(GenerateNamedObjects sources_in)
 
       # create a copy of the source to avoid duplicate obj filename problem with ar.exe
       get_filename_component(source_extension ${source_file} EXT)
-      set(new_source_file "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${obj_name}${source_extension}")
+      set(new_source_file "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${obj_name}${TSUFFIX}${source_extension}")
       if (IS_ABSOLUTE ${source_file})
         set(old_source_file ${source_file})
       else ()