mehrdadh commented on a change in pull request #9631:
URL: https://github.com/apache/tvm/pull/9631#discussion_r770075334
##########
File path: cmake/modules/Hexagon.cmake
##########
@@ -241,10 +340,39 @@ if (USE_HEXAGON_DEVICE STREQUAL "${PICK_NONE}")
elseif(BUILD_FOR_ANDROID AND HEXAGON_SDK_PATH_DEFINED)
list(APPEND RUNTIME_HEXAGON_SRCS
src/runtime/hexagon/proxy_rpc/device_api.cc)
else()
- file(GLOB RUNTIME_HEXAGON_SRCS src/runtime/hexagon/host/*.cc)
+ file(GLOB RUNTIME_HEXAGON_SRCS src/runtime/hexagon/host/*.cc)
endif()
else()
file(GLOB RUNTIME_HEXAGON_SRCS src/runtime/hexagon/android/*.cc)
endif()
+
+if(USE_HEXAGON_RPC)
+ file(GLOB RUNTIME_HEXAGON_SRCS src/runtime/hexagon/host/*.cc)
+endif()
+
+if(USE_HEXAGON_SDK AND BUILD_FOR_ANDROID)
+ find_hexagon_sdk_root("${USE_HEXAGON_SDK}" "${USE_HEXAGON_ARCH}")
+ include_directories(SYSTEM ${HEXAGON_SDK_INCLUDES} ${HEXAGON_REMOTE_ROOT})
+
+ set(QAIC_EXE "${HEXAGON_QAIC_EXE}")
+ foreach(INCDIR IN LISTS HEXAGON_SDK_INCLUDES HEXAGON_REMOTE_ROOT)
+ list(APPEND QAIC_FLAGS "-I${INCDIR}")
+ endforeach()
+
+ set(HEXAGON_RPC_DIR "${CMAKE_SOURCE_DIR}/src/runtime/hexagon/rpc")
+ set(RPC_IDL "hexagon_rpc.idl")
+ set(RPC_H "hexagon_rpc.h")
+ set(RPC_STUB_C "hexagon_rpc_stub.c")
+
+ add_custom_command(
+ OUTPUT "${HEXAGON_RPC_DIR}/${RPC_STUB_C}" "${HEXAGON_RPC_DIR}/${RPC_H}"
+ COMMAND ${QAIC_EXE} ${QAIC_FLAGS} "${HEXAGON_RPC_DIR}/${RPC_IDL}" -o
${HEXAGON_RPC_DIR}
+ MAIN_DEPENDENCY "${HEXAGON_RPC_DIR}/${RPC_IDL}"
+ )
+ file(GLOB HEXAGON_RPC_CPP "${HEXAGON_RPC_DIR}/android/*.cc")
Review comment:
@kparzysz-quic thanks for pointing out. This could break if
`USE_HEXAGON_SDK` and `BUILD_FOR_ANDROID` are enabled and `USE_HEXAGON_RPC` not
enabled. So we should fix this. I suggest that we fix this with a cleanup of
Hexagon.cmake once we agreed on using hexagon RPC and decided to deprecate
`hexagon proxy rpc` and `apps/hexagon_launcher`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
