ggml-hexagon: simplify hexagon-kernel build logic in CMakeLists.txt

Author: zhouwg

ggml/src/ggml-qnn/CMakeLists.txt

@@ -1,4 +1,5 @@
-message(STATUS "Using QNN backend")
+project(ggml-qnn)
+message(STATUS "Using HEXAGON backend")
 message("CMAKE_SYSTEM_NAME : ${CMAKE_SYSTEM_NAME}")
 
 if(NOT DEFINED QNN_SDK_PATH)
@@ -9,8 +10,9 @@ if(NOT DEFINED HEXAGON_SDK_PATH)
     message(FATAL_ERROR "HEXAGON_SDK_PATH not defined")
 endif()
 
-message("QNN_SDK_PATH:     ${QNN_SDK_PATH}")
+message("QNN_SDK_PATH    : ${QNN_SDK_PATH}")
 message("HEXAGON_SDK_PATH: ${HEXAGON_SDK_PATH}")
+message("HTP_ARCH_VERSION: ${HTP_ARCH_VERSION}")
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Android")
     find_library(LOG_LIB log)
@@ -37,7 +39,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
     include_directories(${HEXAGON_SDK_PATH}/libs/atomic/android_Debug_aarch64/ship)
     include_directories(${CMAKE_SOURCE_DIR}/ggml/src/ggml-qnn/)
     include_directories(${CMAKE_SOURCE_DIR}/ggml/src/ggml-qnn/kernels/)
-
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(QNN_DEFAULT_LIB_SEARCH_PATH "C:\\" CACHE STRING "customized library search path for QNN backend")
 else()
@@ -55,3 +56,20 @@ target_link_libraries(ggml-qnn PRIVATE ${QNN_LINK_LIBRARIES})
 
 string(REGEX REPLACE "/$" "" QNN_DEFAULT_LIB_SEARCH_PATH "${QNN_DEFAULT_LIB_SEARCH_PATH}")
 target_compile_definitions(ggml-qnn PRIVATE QNN_DEFAULT_LIB_SEARCH_PATH="${QNN_DEFAULT_LIB_SEARCH_PATH}/")
+
+function(ggml_hexagon_build_kernel KNAME)
+    message(STATUS "ggml_hexagon: build kernel ${KNAME}")
+
+    add_custom_command(
+        TARGET ${PROJECT_NAME}
+        POST_BUILD
+        COMMAND echo "current working path:`pwd`\n"
+        COMMAND echo "${CMAKE_CURRENT_LIST_DIR}/kernels"
+        COMMAND make -C ${CMAKE_CURRENT_LIST_DIR}/kernels/ clean
+        COMMAND make -C ${CMAKE_CURRENT_LIST_DIR}/kernels/ HEXAGON_SDK_PATH=${HEXAGON_SDK_PATH} HTP_ARCH_VERSION=${HTP_ARCH_VERSION}
+        COMMAND echo "`pwd`"
+        COMMENT "build hexagon-kernel"
+    )
+endfunction()
+
+ggml_hexagon_build_kernel("cdsp")

ggml/src/ggml-qnn/kernels/Makefile

@@ -1,12 +1,13 @@
-HEXAGON_SDK_PATH=/opt/qcom/Hexagon_SDK/6.2.0.1
+TARGET=libggmlop_skel${HTP_ARCH_VERSION}.so
 
-TARGET=libggmlop_skel.so
+$(info HEXAGON_SDK_PATH:${HEXAGON_SDK_PATH})
+$(info HTP_ARCH_VERSION:${HTP_ARCH_VERSION})
 
 INCS=-I${HEXAGON_SDK_PATH}/incs -I${HEXAGON_SDK_PATH}/libs/qprintf/inc -I${HEXAGON_SDK_PATH}/incs/stddef -I${HEXAGON_SDK_PATH}/ipc/fastrpc/incs -I${HEXAGON_SDK_PATH}/ipc/fastrpc/rpcmem/inc -I${HEXAGON_SDK_PATH}/utils/examples -I${HEXAGON_SDK_PATH}/ipc/fastrpc/rtld/ship/inc -I${HEXAGON_SDK_PATH}/libs/atomic/inc -I${HEXAGON_SDK_PATH}/utils/sim_utils/inc
 
-CFLAGS=-mv75 -c -Ofast -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fdata-sections -fpic -D__V_DYNAMIC__ -mhvx -mhvx-length=128B ${INCS}
+CFLAGS=-m${HTP_ARCH_VERSION} -c -Ofast -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fdata-sections -fpic -D__V_DYNAMIC__ -mhvx -mhvx-length=128B ${INCS}
 
-LDFLAGS=-mv75 -Wl,--defsym=ISDB_TRUSTED_FLAG=2 -Wl,--defsym=ISDB_SECURE_FLAG=2 -Wl,--no-threads -fpic -shared -Wl,-Bsymbolic -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=realloc -Wl,--wrap=memalign -lc -Wl,-soname=${TARGET}
+LDFLAGS=-m${HTP_ARCH_VERSION} -Wl,--defsym=ISDB_TRUSTED_FLAG=2 -Wl,--defsym=ISDB_SECURE_FLAG=2 -Wl,--no-threads -fpic -shared -Wl,-Bsymbolic -Wl,--wrap=malloc -Wl,--wrap=calloc -Wl,--wrap=free -Wl,--wrap=realloc -Wl,--wrap=memalign -lc -Wl,-soname=${TARGET}
 
 SRCS = ggmlop_cdsp.c  ggmlop_cdsp_skel.c
 OBJS = $(patsubst %.c, %.o, $(SRCS))

scripts/build-run-android.sh

@@ -16,7 +16,15 @@ QNN_SDK_URL=https://www.qualcomm.com/developer/software/qualcomm-ai-engine-direc
 QNN_SDK_INSTALL_PATH=/opt/qcom/aistack/qairt/
 QNN_SDK_VERSION=2.32.0.250228
 QNN_SDK_PATH=${QNN_SDK_INSTALL_PATH}/${QNN_SDK_VERSION}
+
 HEXAGON_SDK_PATH=/opt/qcom/Hexagon_SDK/6.2.0.1
+#available htp arch version:
+#v68 --- Snapdragon 888
+#v69 --- Snapdragon 8 Gen1
+#v73 --- Snapdragon 8 Gen2
+#v75 --- Snapdragon 8 Gen3
+#v79 --- Snapdragon 8 Elite(aka Gen4)
+HTP_ARCH_VERSION=v75
 
 qnnparams=" -mg 2 -ngl 99 "
 
@@ -107,26 +115,14 @@ function check_and_download_ndk()
 }
 
 
-function build_dsp
-{
-    cd ggml/src/ggml-qnn/kernels/
-    show_pwd
-    make clean
-    make
-    cd -
-}
-
-
 function build_arm64
 {
-    cmake -H. -B./out/android -DCMAKE_BUILD_TYPE=Release -DGGML_OPENMP=OFF -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=latest -DCMAKE_C_FLAGS=-march=armv8.7-a -DGGML_QNN=ON -DQNN_SDK_PATH=${QNN_SDK_PATH} -DHEXAGON_SDK_PATH=${HEXAGON_SDK_PATH}
+    cmake -H. -B./out/android -DCMAKE_BUILD_TYPE=Release -DGGML_OPENMP=OFF -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=latest -DCMAKE_C_FLAGS=-march=armv8.7-a -DGGML_QNN=ON -DQNN_SDK_PATH=${QNN_SDK_PATH} -DHEXAGON_SDK_PATH=${HEXAGON_SDK_PATH} -DHTP_ARCH_VERSION=${HTP_ARCH_VERSION}
     cd out/android
     make -j16
     show_pwd
 
     cd -
-
-    build_dsp
 }
 
 
@@ -201,7 +197,7 @@ function prepare_run_on_phone()
     fi
     adb push ./out/android/bin/${program} ${REMOTE_PATH}/
     adb shell chmod +x ${REMOTE_PATH}/${program}
-    adb push ggml/src/ggml-qnn/kernels/libggmlop_skel.so  ${REMOTE_PATH}/
+    adb push ggml/src/ggml-qnn/kernels/libggmlop_skel${HTP_ARCH_VERSION}.so  ${REMOTE_PATH}/libggmlop_skel.so
 }
 
 function run_llamacli()