mehrdadh commented on a change in pull request #9631:
URL: https://github.com/apache/tvm/pull/9631#discussion_r763508983
##########
File path: cmake/modules/Hexagon.cmake
##########
@@ -202,6 +200,108 @@ if(USE_HEXAGON_PROXY_RPC STREQUAL "ON")
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"${RPC_BINARY_DIR}")
endif()
+if(USE_HEXAGON_RPC)
+ if(DEFINED USE_ANDROID_TOOLCHAIN)
+ if(NOT DEFINED ANDROID_PLATFORM)
+ message(SEND_ERROR "Please set ANDROID_PLATFORM "
+ "when providing an Android cmake toolchain.")
+ endif()
+ if(NOT DEFINED ANDROID_ABI)
+ message(SEND_ERROR "Please set ANDROID_ABI "
+ "when providing an Android cmake toolchain.")
+ endif()
+ else()
+ message(SEND_ERROR "Please set USE_ANDROID_TOOLCHAIN to build the android "
+ "RPC server for Hexagon.")
+ endif()
+
+ if(NOT DEFINED USE_HEXAGON_SDK)
+ message(SEND_ERROR "Please set USE_HEXAGON_SDK to build the android "
+ "RPC server for Hexagon RPC.")
+ endif()
+ if(NOT DEFINED USE_HEXAGON_ARCH)
+ message(SEND_ERROR "Please set USE_HEXAGON_ARCH to build the android "
+ "RPC server for Hexagon RPC.")
+ endif()
+ find_hexagon_sdk_root("${USE_HEXAGON_SDK}" "${USE_HEXAGON_ARCH}")
+
+ set(HEXAGON_RPC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/hexagon_rpc")
+ file(MAKE_DIRECTORY ${HEXAGON_RPC_OUTPUT})
+
+ # Android Part
+ ExternalProject_Add(android_runtime_rpc
+ SOURCE_DIR "${CMAKE_SOURCE_DIR}"
+ BUILD_COMMAND $(MAKE) runtime tvm_rpc
+ CMAKE_ARGS
+ "-DCMAKE_TOOLCHAIN_FILE=${USE_ANDROID_TOOLCHAIN}"
+ "-DUSE_ANDROID_TOOLCHAIN=${USE_ANDROID_TOOLCHAIN}"
+ "-DANDROID_PLATFORM=${ANDROID_PLATFORM}"
+ "-DANDROID_ABI=${ANDROID_ABI}"
+ "-DCMAKE_CXX_STANDARD=14"
+ "-DUSE_LIBBACKTRACE=OFF"
+ "-DUSE_LLVM=OFF"
+ "-DUSE_RPC=ON"
+ "-DUSE_CPP_RPC=ON"
+ "-DUSE_HEXAGON_SDK=${USE_HEXAGON_SDK}"
+ "-DUSE_HEXAGON_ARCH=${USE_HEXAGON_ARCH}"
+ "-DCMAKE_VERBOSE_MAKEFILE=ON"
+ INSTALL_COMMAND ""
+ BUILD_ALWAYS ON
+ )
+ ExternalProject_Get_Property(android_runtime_rpc BINARY_DIR)
+ ExternalProject_Add_Step(android_runtime_rpc copy_binary_runtime
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${BINARY_DIR}/libtvm_runtime.so
+ ${HEXAGON_RPC_OUTPUT}/libtvm_runtime_android.so
+ DEPENDEES install
+ )
+ ExternalProject_Add_Step(android_runtime_rpc copy_binary_rpc
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${BINARY_DIR}/tvm_rpc
+ ${HEXAGON_RPC_OUTPUT}/tvm_rpc_android
+ DEPENDEES install
+ )
+
+ if("${USE_HEXAGON_TOOLCHAIN}" STREQUAL "")
+ message(SEND_ERROR "Please set USE_HEXAGON_TOOLCHAIN to build the hexagon "
+ "RPC SKEL.")
+ endif()
+ find_hexagon_toolchain()
+ message(STATUS "HEXAGON_TOOLCHAIN: ${HEXAGON_TOOLCHAIN}")
+
+ # Hexagon Part
+ ExternalProject_Add(hexagon_rpc_skel
+ SOURCE_DIR "${CMAKE_SOURCE_DIR}/cmake/libs/hexagon_rpc_skel"
+ INSTALL_DIR "${LAUNCHER_BINARY_DIR}"
+ CMAKE_ARGS
+ "-DCMAKE_C_COMPILER=${HEXAGON_TOOLCHAIN}/bin/hexagon-clang"
+ "-DCMAKE_CXX_COMPILER=${HEXAGON_TOOLCHAIN}/bin/hexagon-clang++"
+ "-DFASTRPC_LIBS=SKEL"
+ "-DUSE_HEXAGON_ARCH=${USE_HEXAGON_ARCH}"
+ "-DUSE_HEXAGON_SDK=${USE_HEXAGON_SDK}"
+ INSTALL_COMMAND ""
+ BUILD_ALWAYS ON
+ )
+ ExternalProject_Get_Property(hexagon_rpc_skel BINARY_DIR)
+ ExternalProject_Add_Step(hexagon_rpc_skel copy_hexagon_skel
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${BINARY_DIR}/libhexagon_rpc_skel.so
+ ${HEXAGON_RPC_OUTPUT}/libhexagon_rpc_skel.so
+ DEPENDEES install
+ )
+
+ # copy android_bash template file
+
configure_file("${CMAKE_SOURCE_DIR}/src/runtime/hexagon/rpc/android_bash.sh.template"
+ ${HEXAGON_RPC_OUTPUT} COPYONLY)
+endif()
Review comment:
done here:
https://github.com/apache/tvm/pull/9631/commits/28db608e66b16ffb8159113d2edd4408a90caa89
##########
File path: cmake/modules/Hexagon.cmake
##########
@@ -217,16 +317,20 @@ if(USE_HEXAGON_DEVICE STREQUAL "${PICK_SIM}")
"-DHEXAGON_ARCH=${USE_HEXAGON_ARCH}"
INSTALL_COMMAND "true"
)
-elseif(USE_HEXAGON_DEVICE STREQUAL "${PICK_HW}")
+elseif((USE_HEXAGON_DEVICE STREQUAL "${PICK_HW}") OR (USE_HEXAGON_RPC AND
BUILD_FOR_ANDROID))
Review comment:
done:
https://github.com/apache/tvm/pull/9631/commits/28db608e66b16ffb8159113d2edd4408a90caa89
##########
File path: cmake/modules/Hexagon.cmake
##########
@@ -240,11 +344,36 @@ if (USE_HEXAGON_DEVICE STREQUAL "${PICK_NONE}")
file(GLOB RUNTIME_HEXAGON_SRCS src/runtime/hexagon/hexagon/*.cc)
elseif(BUILD_FOR_ANDROID AND HEXAGON_SDK_PATH_DEFINED)
list(APPEND RUNTIME_HEXAGON_SRCS
src/runtime/hexagon/proxy_rpc/device_api.cc)
- else()
+ elseif(USE_HEXAGON_RPC)
Review comment:
done:
https://github.com/apache/tvm/pull/9631/commits/28db608e66b16ffb8159113d2edd4408a90caa89
--
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]
