floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add commonobjs

This commit is contained in:
Isuru Fernando 2017-08-07 23:08:44 +05:30
parent 6f83004252
commit d3b677fe87
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/utils.cmake
View File

@ -202,8 +202,8 @@ function(GenerateNamedObjects sources_in)
if (use_cblas) if (use_cblas)
set(obj_name "cblas_${obj_name}") set(obj_name "cblas_${obj_name}")
list(APPEND obj_defines "CBLAS") list(APPEND obj_defines "CBLAS")
elseif (NOT "${obj_name}" MATCHES "${TSUFFIX}") elseif (NOT "${obj_name}" MATCHES "${ARCH_SUFFIX}")
set(obj_name "${obj_name}${TSUFFIX}") set(obj_name "${obj_name}${ARCH_SUFFIX}")
endif () endif ()
list(APPEND obj_defines "ASMNAME=${FU}${obj_name};ASMFNAME=${FU}${obj_name}${BU};NAME=${obj_name}${BU};CNAME=${obj_name};CHAR_NAME=\"${obj_name}${BU}\";CHAR_CNAME=\"${obj_name}\"") list(APPEND obj_defines "ASMNAME=${FU}${obj_name};ASMFNAME=${FU}${obj_name}${BU};NAME=${obj_name}${BU};CNAME=${obj_name};CHAR_NAME=\"${obj_name}${BU}\";CHAR_CNAME=\"${obj_name}\"")

30
kernel/CMakeLists.txt
View File

@ -4,6 +4,7 @@ include_directories(${PROJECT_SOURCE_DIR})
# Makefile # Makefile
function (build_core TARGET_CORE KDIR TSUFFIX KERNEL_DEFINITIONS) function (build_core TARGET_CORE KDIR TSUFFIX KERNEL_DEFINITIONS)
set (OPENBLAS_SRC "") set (OPENBLAS_SRC "")
set (ARCH_SUFFIX "")
include("${PROJECT_SOURCE_DIR}/cmake/kernel.cmake") include("${PROJECT_SOURCE_DIR}/cmake/kernel.cmake")
if (${DYNAMIC_ARCH}) if (${DYNAMIC_ARCH})
include("${PROJECT_SOURCE_DIR}/cmake/system.cmake") include("${PROJECT_SOURCE_DIR}/cmake/system.cmake")
@ -19,19 +20,23 @@ function (build_core TARGET_CORE KDIR TSUFFIX KERNEL_DEFINITIONS)
set(KERNEL_INTERFACE ${KERNEL_INTERFACE} common_lapack.h) set(KERNEL_INTERFACE ${KERNEL_INTERFACE} common_lapack.h)
endif () endif ()
if (${ARCH} STREQUAL "x86") if (${ADD_COMMONOBJS})
if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") if (${ARCH} STREQUAL "x86")
GenerateNamedObjects("${KERNELDIR}/cpuid.S" "" "" false "" "" true) if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
else() GenerateNamedObjects("${KERNELDIR}/cpuid.S" "" "" false "" "" true)
GenerateNamedObjects("${KERNELDIR}/cpuid_win.c" "" "" false "" "" true) else()
endif() GenerateNamedObjects("${KERNELDIR}/cpuid_win.c" "" "" false "" "" true)
endif()
endif ()
# don't use float type name mangling here
GenerateNamedObjects("${KERNELDIR}/${LSAME_KERNEL}" "F_INTERFACE" "lsame" false "" "" true "")
GenerateNamedObjects("${KERNELDIR}/${SCABS_KERNEL}" "COMPLEX;F_INTERFACE" "scabs1" false "" "" true "")
GenerateNamedObjects("${KERNELDIR}/${DCABS_KERNEL}" "DOUBLE;COMPLEX;F_INTERFACE" "dcabs1" false "" "" true "")
endif () endif ()
# don't use float type name mangling here # Run with no ARCH_SUFFIX for above
GenerateNamedObjects("${KERNELDIR}/${LSAME_KERNEL}" "F_INTERFACE" "lsame" false "" "" true) set (ARCH_SUFFIX "${TSUFFIX}")
GenerateNamedObjects("${KERNELDIR}/${SCABS_KERNEL}" "COMPLEX;F_INTERFACE" "scabs1" false "" "" true)
GenerateNamedObjects("${KERNELDIR}/${DCABS_KERNEL}" "DOUBLE;COMPLEX;F_INTERFACE" "dcabs1" false "" "" true)
# Makefile.L1 # Makefile.L1
foreach (float_type ${FLOAT_TYPES}) foreach (float_type ${FLOAT_TYPES})
# a bit of metaprogramming here to pull out the appropriate KERNEL var # a bit of metaprogramming here to pull out the appropriate KERNEL var
@ -489,7 +494,7 @@ function (build_core TARGET_CORE KDIR TSUFFIX KERNEL_DEFINITIONS)
endfunction () endfunction ()
set(ADD_COMMONOBJS 1)
if (${DYNAMIC_ARCH}) if (${DYNAMIC_ARCH})
foreach(TARGET_CORE ${DYNAMIC_CORE}) foreach(TARGET_CORE ${DYNAMIC_CORE})
set(BUILD_KERNEL 1) set(BUILD_KERNEL 1)
@ -497,6 +502,7 @@ if (${DYNAMIC_ARCH})
set(TSUFFIX "_${TARGET_CORE}") set(TSUFFIX "_${TARGET_CORE}")
set(KERNEL_DEFINITIONS "-DBUILD_KERNEL -DTABLE_NAME=gotoblas_${TARGET_CORE} -DTS=${TSUFFIX}") set(KERNEL_DEFINITIONS "-DBUILD_KERNEL -DTABLE_NAME=gotoblas_${TARGET_CORE} -DTS=${TSUFFIX}")
build_core("${TARGET_CORE}" "${KDIR}" "${TSUFFIX}" "${KERNEL_DEFINITIONS}") build_core("${TARGET_CORE}" "${KDIR}" "${TSUFFIX}" "${KERNEL_DEFINITIONS}")
set(ADD_COMMONOBJS 0)
endforeach() endforeach()
else () else ()
set(TARGET_CONF_DIR ${PROJECT_BINARY_DIR}) set(TARGET_CONF_DIR ${PROJECT_BINARY_DIR})