Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a CMake generator for target 'alias', removing a binary #251

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add a CMake generator for target 'alias', removing a binary #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3696985
Add a CMake generator for target 'alias', removing a binary
Mar 14, 2019
548d755
Add support for vectorcc
Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ set(TARGET_MKRENAME_GNUABI "mkrename_gnuabi")
set(TARGET_MKMASKED_GNUABI "mkmasked_gnuabi")
# Generates the helper executable file mkdisp needed to write the sleef header
set(TARGET_MKDISP "mkdisp")
set(TARGET_MKALIAS "mkalias")
# Generates static library common
# Defined in src/common/CMakeLists.txt via command add_library
set(TARGET_LIBCOMMON_OBJ "common")
Expand Down
58 changes: 26 additions & 32 deletions src/libm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,7 @@ add_custom_target(${TARGET_HEADERS} ALL
# --------------------------------------------------------------------
# TARGET_MKALIAS
# --------------------------------------------------------------------
add_host_executable(${TARGET_MKALIAS} mkalias.c)
if(FORCE_AAVPCS)
host_target_AAVPCS_definitions(${TARGET_MKALIAS})
endif()
include("generate.cmake")

# --------------------------------------------------------------------
# TARGET_MKDISP
Expand All @@ -151,7 +148,7 @@ add_host_executable(${TARGET_MKDISP} mkdisp.c)
# Set C standard requirement (-std=gnu99 for gcc)
set_target_properties(
${TARGET_MKRENAME} ${TARGET_MKRENAME_GNUABI} ${TARGET_MKDISP}
${TARGET_MKALIAS} ${TARGET_MKMASKED_GNUABI}
${TARGET_MKMASKED_GNUABI}
PROPERTIES C_STANDARD 99
)

Expand Down Expand Up @@ -226,45 +223,42 @@ foreach(SIMD ${SLEEF_SUPPORTED_EXTENSIONS})

if (INDEX_ALIAS EQUAL -1)
target_compile_definitions(${OBJECT_${SIMD}} PRIVATE
ENABLE_${SIMD}=1
DORENAME=1
${COMMON_TARGET_DEFINITIONS}
)
ENABLE_${SIMD}=1
DORENAME=1
${COMMON_TARGET_DEFINITIONS}
)
target_compile_definitions(${OBJECTDET_${SIMD}} PRIVATE
ENABLE_${SIMD}=1
DORENAME=1
${COMMON_TARGET_DEFINITIONS}
)
else()
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/alias_${SIMDLC}.h
COMMENT "Generating alias_${SIMDLC}.h"
COMMAND $<TARGET_FILE:${TARGET_MKALIAS}> ${ALIAS_PARAMS_${SIMD}_SP} > ${CMAKE_CURRENT_BINARY_DIR}/include/alias_${SIMDLC}.h
COMMAND $<TARGET_FILE:${TARGET_MKALIAS}> ${ALIAS_PARAMS_${SIMD}_DP} >> ${CMAKE_CURRENT_BINARY_DIR}/include/alias_${SIMDLC}.h
DEPENDS ${TARGET_MKALIAS}
)
ENABLE_${SIMD}=1
DORENAME=1
${COMMON_TARGET_DEFINITIONS}
)
else()
file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/include/alias_${SIMDLC}.h)
SLEEF_MKALIAS(${CMAKE_CURRENT_BINARY_DIR}/include/alias_${SIMDLC}.h ${ALIAS_PARAMS_${SIMD}_SP})
SLEEF_MKALIAS(${CMAKE_CURRENT_BINARY_DIR}/include/alias_${SIMDLC}.h ${ALIAS_PARAMS_${SIMD}_DP})
# TODO: Dependency for generated?
add_custom_target(alias_${SIMDLC}.h_generated SOURCES ${CMAKE_CURRENT_BINARY_DIR}/include/alias_${SIMDLC}.h)
add_dependencies(${OBJECT_${SIMD}} alias_${SIMDLC}.h_generated)
add_dependencies(${OBJECTDET_${SIMD}} alias_${SIMDLC}.h_generated)
target_compile_definitions(${OBJECT_${SIMD}} PRIVATE
ENABLE_${SIMD}=1
DORENAME=1
${COMMON_TARGET_DEFINITIONS}
ALIAS_NO_EXT_SUFFIX=\"alias_${SIMDLC}.h\"
)
ENABLE_${SIMD}=1
DORENAME=1
${COMMON_TARGET_DEFINITIONS}
ALIAS_NO_EXT_SUFFIX=\"alias_${SIMDLC}.h\"
)
target_compile_definitions(${OBJECTDET_${SIMD}} PRIVATE
ENABLE_${SIMD}=1
DORENAME=1
${COMMON_TARGET_DEFINITIONS}
ALIAS_NO_EXT_SUFFIX=\"alias_${SIMDLC}.h\"
)
ENABLE_${SIMD}=1
DORENAME=1
${COMMON_TARGET_DEFINITIONS}
ALIAS_NO_EXT_SUFFIX=\"alias_${SIMDLC}.h\"
)
endif()

# Enable Vector PCS for Advanced SIMD (if supported)
if(FORCE_AAVPCS AND ${SIMD} STREQUAL "ADVSIMD")
target_compile_definitions(${OBJECT_${SIMD}} PRIVATE
ENABLE_AAVPCS=1
)
)
endif()

add_dependencies(${OBJECT_${SIMD}} rename${SIMD}.h_generated)
Expand Down
184 changes: 184 additions & 0 deletions src/libm/generate.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
# This file is designed to replace the custom binaries used to generate header files

# This func list is used for all generation
set(FUNCLIST
"sin\;35\;0\;0\;0"
"cos\;35\;0\;0\;0"
"sincos\;35\;0\;2\;0"
"tan\;35\;0\;0\;0"
"asin\;35\;0\;0\;0"
"acos\;35\;0\;0\;0"
"atan\;35\;0\;0\;0"
"atan2\;35\;0\;1\;0"
"log\;35\;0\;0\;0"
"cbrt\;35\;0\;0\;0"
"sin\;10\;1\;0\;0"
"cos\;10\;1\;0\;0"
"sincos\;10\;1\;2\;0"
"tan\;10\;1\;0\;0"
"asin\;10\;1\;0\;0"
"acos\;10\;1\;0\;0"
"atan\;10\;1\;0\;0"
"atan2\;10\;1\;1\;0"
"log\;10\;1\;0\;0"
"cbrt\;10\;1\;0\;0"
"exp\;10\;0\;0\;0"
"pow\;10\;0\;1\;0"
"sinh\;10\;0\;0\;0"
"cosh\;10\;0\;0\;0"
"tanh\;10\;0\;0\;0"
"sinh\;35\;3\;0\;0"
"cosh\;35\;3\;0\;0"
"tanh\;35\;3\;0\;0"

"asinh\;10\;0\;0\;0"
"acosh\;10\;0\;0\;0"
"atanh\;10\;0\;0\;0"
"exp2\;10\;0\;0\;0"
"exp10\;10\;0\;0\;0"
"expm1\;10\;0\;0\;0"
"log10\;10\;0\;0\;0"
"log2\;10\;0\;0\;0"
"log1p\;10\;0\;0\;0"
"sincospi\;5\;2\;2\;0"
"sincospi\;35\;3\;2\;0"
"sinpi\;5\;2\;0\;0"
"cospi\;5\;2\;0\;0"
"ldexp\;-1\;0\;3\;0"
"ilogb\;-1\;0\;4\;0"

"fma\;-1\;0\;5\;0"
"sqrt\;-1\;0\;0\;0"
"sqrt\;5\;2\;0\;1"
"sqrt\;35\;3\;0\;0"
"hypot\;5\;2\;1\;0"
"hypot\;35\;3\;1\;0"
"fabs\;-1\;0\;0\;0"
"copysign\;-1\;0\;1\;0"
"fmax\;-1\;0\;1\;0"
"fmin\;-1\;0\;1\;0"
"fdim\;-1\;0\;1\;0"
"trunc\;-1\;0\;0\;0"
"floor\;-1\;0\;0\;0"
"ceil\;-1\;0\;0\;0"
"round\;-1\;0\;0\;0"
"rint\;-1\;0\;0\;0"
"nextafter\;-1\;0\;1\;0"
"frfrexp\;-1\;0\;0\;0"
"expfrexp\;-1\;0\;4\;0"
"fmod\;-1\;0\;1\;0"
"modf\;-1\;0\;6\;0"

"lgamma\;10\;1\;0\;0"
"tgamma\;10\;1\;0\;0"
"erf\;10\;1\;0\;0"
"erfc\;15\;4\;0\;0"

"getInt\;-1\;0\;7\;1"
"getPtr\;-1\;0\;8\;1"
)

MACRO(SLEEF_MKALIAS FILENAME FORCE_AAVPCS VEC_WIDTH_QUOTES VEC_FP_TYPE_QUOTES VEC_INT_TYPE_QUOTES MANGLED_ISA)
# Names come in with extra quotes from list
string(REPLACE "\"" "" VEC_WIDTH ${VEC_WIDTH_QUOTES})
string(REPLACE "\"" "" VEC_FP_TYPE ${VEC_FP_TYPE_QUOTES})
string(REPLACE "\"" "" VEC_INT_TYPE ${VEC_INT_TYPE_QUOTES})
# Get length of ARGN which always seems to exist
string(LENGTH "${ARGN}" ARGCOUNT)
if (ARGCOUNT)
string(REPLACE "\"" "" EXTENTION ${ARGN})
endif()

# Determine type and write header
if (${VEC_WIDTH} LESS 0)
set(FPTYPE 1)
set(TYPESPEC "f")
# Drop the leading character, which is a negative sign
string(SUBSTRING "${VEC_WIDTH}" 1 -1 width)
set(STR "#ifdef __SLEEFSIMDSP_C__\n")
else()
set(FPTYPE 0)
set(TYPESPEC "d")
set(width "${VEC_WIDTH}")
set(STR "#ifdef __SLEEFSIMDDP_C__\n")
endif()

# This is the current condition on which AAVPCS is set
if (FORCE_AAVPCS AND NOT CMAKE_CROSSCOMPILING)
if ("${EXTENTION}" STREQUAL "advsimd")
set(VECTORCC " __attribute__((aarch64_vector_pcs))")
endif()
endif()

if(FPTYPE)
set(RETURNTYPES ${VEC_FP_TYPE} ${VEC_FP_TYPE} "vfloat2" ${VEC_FP_TYPE} ${VEC_INT_TYPE} ${VEC_FP_TYPE} "vfloat2" "int" "void *")
else()
set(RETURNTYPES ${VEC_FP_TYPE} ${VEC_FP_TYPE} "vdouble2" ${VEC_FP_TYPE} ${VEC_INT_TYPE} ${VEC_FP_TYPE} "vdouble2" "int" "void *")
endif()

set(ARGTYPEZERO ${VEC_FP_TYPE} "${VEC_FP_TYPE}, ${VEC_FP_TYPE}" ${VEC_FP_TYPE} "${VEC_FP_TYPE}, ${VEC_INT_TYPE}" ${VEC_FP_TYPE} "${VEC_FP_TYPE}, ${VEC_FP_TYPE}, ${VEC_FP_TYPE}" ${VEC_FP_TYPE} "int" "int")
set(ARGTYPEONE "${VEC_FP_TYPE} a0" "${VEC_FP_TYPE} a0, ${VEC_FP_TYPE} a1" "${VEC_FP_TYPE} a0" "${VEC_FP_TYPE} a0, ${VEC_INT_TYPE} a1" "${VEC_FP_TYPE} a0" "${VEC_FP_TYPE} a0, ${VEC_FP_TYPE} a1, ${VEC_FP_TYPE} a2" "${VEC_FP_TYPE} a0" "int a0" "int a0")
set(ARGTYPETWO "a0" "a0, a1" "a0" "a0, a1" "a0" "a0, a1, a2" "a0" "a0" "a0")


string(APPEND STR "#ifdef ENABLE_ALIAS\n")


if (EXTENTION)
foreach(funcresult ${FUNCLIST})
list(GET funcresult 0 name)
list(GET funcresult 1 ulp)
list(GET funcresult 3 funcType)
list(GET RETURNTYPES ${funcType} returnstring)
list(GET ARGTYPEZERO ${funcType} firstarg)
# This section is quite complex
set(ULPVAL "")
set(ULPVALUNDER "")
if (${ulp} GREATER 0) # CMake 3.7 required for GREATER_EQUAL
string(LENGTH ${ulp} ULPLEN)
if (${ULPLEN} LESS 2)
set(ulp "0${ulp}")
endif()
set(ULPVAL "u${ulp}")
set(ULPVALUNDER "_${ULPVAL}")
endif()
string(APPEND STR "EXPORT CONST ${returnstring} Sleef_${name}${TYPESPEC}${width}${ULPVALUNDER}(${firstarg}) __attribute__((alias(\"Sleef_${name}${TYPESPEC}${width}_${ULPVAL}${EXTENTION}\"))) ${VECTORCC}\;\n")
endforeach()
string(APPEND STR "\n")
endif()
string(APPEND STR "#else // #ifdef ENABLE_ALIAS\n")

if (EXTENTION)
foreach(funcresult ${FUNCLIST})
list(GET funcresult 0 name)
list(GET funcresult 1 ulp)
list(GET funcresult 3 funcType)
list(GET RETURNTYPES ${funcType} returnstring)
list(GET ARGTYPEONE ${funcType} secondarg)
list(GET ARGTYPETWO ${funcType} thirdarg)
# This section is quite complex
set(ULPVAL "")
set(ULPVALUNDER "")
if (${ulp} GREATER 0) # CMake 3.7 required for GREATER_EQUAL
string(LENGTH ${ulp} ULPLEN)
if (${ULPLEN} LESS 2)
set(ulp "0${ulp}")
endif()
set(ULPVAL "u${ulp}")
set(ULPVALUNDER "_${ULPVAL}")
endif()
string(APPEND STR "EXPORT CONST ${returnstring} ${VECTORCC} Sleef_${name}${TYPESPEC}${width}${ULPVALUNDER}(${secondarg}) { return Sleef_${name}${TYPESPEC}${width}_${ULPVAL}${EXTENTION}(${thirdarg})\; }\n")
endforeach()
string(APPEND STR "\n")
endif()

# Write footer
string(APPEND STR "#endif // #ifdef ENABLE_ALIAS\n")
if (FPTYPE)
string(APPEND STR "#endif // #ifdef __SLEEFSIMDSP_C__\n")
else()
string(APPEND STR "#endif // #ifdef __SLEEFSIMDDP_C__\n")
endif()

file(APPEND ${FILENAME} ${STR})
ENDMACRO(SLEEF_MKALIAS)