| @@ -16,8 +16,6 @@ | |||||
| # HAVE_SSE2 | # HAVE_SSE2 | ||||
| # HAVE_SSE3 | # HAVE_SSE3 | ||||
| # MAKE | # MAKE | ||||
| # SHGEMM_UNROLL_M | |||||
| # SHGEMM_UNROLL_N | |||||
| # SGEMM_UNROLL_M | # SGEMM_UNROLL_M | ||||
| # SGEMM_UNROLL_N | # SGEMM_UNROLL_N | ||||
| # DGEMM_UNROLL_M | # DGEMM_UNROLL_M | ||||
| @@ -439,8 +437,6 @@ if (DEFINED CORE AND CMAKE_CROSSCOMPILING AND NOT (${HOST_OS} STREQUAL "WINDOWSS | |||||
| set(ZGEMM_UNROLL_N 2) | set(ZGEMM_UNROLL_N 2) | ||||
| set(SYMV_P 8) | set(SYMV_P 8) | ||||
| endif() | endif() | ||||
| set(SHGEMM_UNROLL_M 8) | |||||
| set(SHGEMM_UNROLL_N 4) | |||||
| # Or should this actually be NUM_CORES? | # Or should this actually be NUM_CORES? | ||||
| if (${NUM_THREADS} GREATER 0) | if (${NUM_THREADS} GREATER 0) | ||||
| @@ -492,7 +488,7 @@ else(NOT CMAKE_CROSSCOMPILING) | |||||
| if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") | if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") | ||||
| try_compile(GETARCH_RESULT ${GETARCH_DIR} | try_compile(GETARCH_RESULT ${GETARCH_DIR} | ||||
| SOURCES ${GETARCH_SRC} | SOURCES ${GETARCH_SRC} | ||||
| COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I${GETARCH_DIR} -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" | |||||
| COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" | |||||
| OUTPUT_VARIABLE GETARCH_LOG | OUTPUT_VARIABLE GETARCH_LOG | ||||
| COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} | COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} | ||||
| ) | ) | ||||
| @@ -520,7 +516,7 @@ execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE | |||||
| if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") | if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") | ||||
| try_compile(GETARCH2_RESULT ${GETARCH2_DIR} | try_compile(GETARCH2_RESULT ${GETARCH2_DIR} | ||||
| SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c | SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c | ||||
| COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I${GETARCH2_DIR} -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" | |||||
| COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${GETARCH2_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" | |||||
| OUTPUT_VARIABLE GETARCH2_LOG | OUTPUT_VARIABLE GETARCH2_LOG | ||||
| COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} | COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} | ||||
| ) | ) | ||||