Merge branch 'main' into pytest_avoid_cuda_postproc_cascading_failures_pr_15136

Author: Lunderberg

.github/workflows/main.yml

@@ -179,24 +179,3 @@ jobs:
         with:
           name: android_deploy-debug.apk
           path: ./apps/android_deploy/app/build/outputs/apk/debug/app-debug.apk
-      - name: Build android_camera
-        working-directory: apps/android_camera
-        run: |
-          export TVM_HOME=~/work/tvm/tvm
-          export PYTHONPATH=$TVM_HOME/python:${PYTHONPATH}
-          set -eux
-          mkdir -p app/src/main/assets/models/
-          export TVM_NDK_CC=${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android30-clang++
-          python3 ${TVM_HOME}/python/gen_requirements.py
-          pip3 install -r ${TVM_HOME}/python/requirements/core.txt
-          cd models
-          pip3 install -r requirements.txt
-          python3 prepare_model.py
-          cd ..
-          export PATH="${ANDROID_NDK_LATEST_HOME}:$PATH"
-          gradle clean build
-      - name: Upload android_camera APK
-        uses: actions/upload-artifact@v2
-        with:
-          name: android_camera-debug.apk
-          path: ./apps/android_camera/app/build/outputs/apk/debug/app-debug.apk

apps/android_rpc/app/src/main/jni/tvm_runtime.h

@@ -70,6 +70,7 @@
 #endif
 
 #ifdef TVM_VULKAN_RUNTIME
+#include "../src/runtime/vulkan/vulkan_amdrgp.cc"
 #include "../src/runtime/vulkan/vulkan_buffer.cc"
 #include "../src/runtime/vulkan/vulkan_common.cc"
 #include "../src/runtime/vulkan/vulkan_device.cc"

apps/microtvm/cmsisnn/requirements.txt

@@ -7,8 +7,8 @@ cloudpickle==2.0.0 \
 decorator==5.1.0 \
     --hash=sha256:7b12e7c3c6ab203a29e157335e9122cb03de9ab7264b137594103fd4a683b374 \
     --hash=sha256:e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7
-ethos-u-vela==3.7.0 \
-    --hash=sha256:314b761e171d19bf03e141684f9a371af7bf830f739b9b2f90b5f303a7fb1203
+ethos-u-vela==3.8.0 \
+    --hash=sha256:cb0b1f5b1f886242d67ff0072efb88ac90cc87574ebe92fc98db4609f7797acf
 flatbuffers==2.0.7 \
     --hash=sha256:0ae7d69c5b82bf41962ca5fde9cc43033bc9501311d975fd5a25e8a7d29c1245 \
     --hash=sha256:71e135d533be527192819aaab757c5e3d109cb10fbb01e687f6bdb7a61ad39d1

apps/microtvm/ethosu/requirements.txt

@@ -7,8 +7,8 @@ cloudpickle==2.0.0 \
 decorator==5.1.0 \
     --hash=sha256:7b12e7c3c6ab203a29e157335e9122cb03de9ab7264b137594103fd4a683b374 \
     --hash=sha256:e59913af105b9860aa2c8d3272d9de5a56a4e608db9a2f167a8480b323d529a7
-ethos-u-vela==3.7.0 \
-    --hash=sha256:314b761e171d19bf03e141684f9a371af7bf830f739b9b2f90b5f303a7fb1203
+ethos-u-vela==3.8.0 \
+    --hash=sha256:cb0b1f5b1f886242d67ff0072efb88ac90cc87574ebe92fc98db4609f7797acf
 flatbuffers==2.0.7 \
     --hash=sha256:0ae7d69c5b82bf41962ca5fde9cc43033bc9501311d975fd5a25e8a7d29c1245 \
     --hash=sha256:71e135d533be527192819aaab757c5e3d109cb10fbb01e687f6bdb7a61ad39d1

cmake/modules/LibInfo.cmake

@@ -70,6 +70,7 @@ function(add_lib_info src_file)
     TVM_INFO_USE_AMX="${USE_AMX}"
     TVM_INFO_USE_DNNL="${USE_DNNL}"
     TVM_INFO_USE_ETHOSN="${USE_ETHOSN}"
+    TVM_INFO_USE_ETHOSU="${USE_ETHOSU}"
     TVM_INFO_USE_FALLBACK_STL_MAP="${USE_FALLBACK_STL_MAP}"
     TVM_INFO_USE_GRAPH_EXECUTOR_CUDA_GRAPH="${USE_GRAPH_EXECUTOR_CUDA_GRAPH}"
     TVM_INFO_USE_GRAPH_EXECUTOR="${USE_GRAPH_EXECUTOR}"

cmake/utils/FindLLVM.cmake

@@ -110,6 +110,7 @@ macro(find_llvm use_llvm)
     if(NOT "${__llvm_exit_code}" STREQUAL "0")
       message(FATAL_ERROR "Fatal error executing: ${LLVM_CONFIG} --libdir")
     endif()
+    message(STATUS "LLVM libdir: ${__llvm_libdir}")
     # map prefix => $
     # to handle the case when the prefix contains space.
     string(REPLACE ${__llvm_prefix} "$" __llvm_cxxflags ${__llvm_cxxflags_space})
@@ -144,14 +145,33 @@ macro(find_llvm use_llvm)
     endforeach()
     separate_arguments(__llvm_system_libs)
     foreach(__flag IN ITEMS ${__llvm_system_libs})
-      # If the library file ends in .lib try to
-      # also search the llvm_libdir
-      if(__flag MATCHES ".lib$")
-        if(EXISTS "${__llvm_libdir}/${__flag}")
-          set(__flag "${__llvm_libdir}/${__flag}")
+      if("${__flag}" STREQUAL "-lm")
+        message(STATUS "LLVM links against math")
+        list(APPEND LLVM_LIBS "m")
+      elseif(("${__flag}" STREQUAL "-lz") OR ("${__flag}" STREQUAL "z.lib"))
+        message(STATUS "LLVM links against zlib")
+        find_package(ZLIB REQUIRED)
+        list(APPEND LLVM_LIBS "ZLIB::ZLIB")
+      elseif("${__flag}" STREQUAL "-lzstd" OR ("${__flag}" STREQUAL "zstd.dll.lib"))
+        find_package(zstd REQUIRED)
+        if (TARGET "zstd::libzstd_static")
+          message(STATUS "LLVM links against static zstd")
+          list(APPEND LLVM_LIBS "zstd::libzstd_static")
+        else()
+          message(STATUS "LLVM links against shared zstd")
+          list(APPEND LLVM_LIBS "zstd::libzstd_shared")
         endif()
+      elseif("${__flag}" STREQUAL "-lxml2")
+        message(STATUS "LLVM links against xml2")
+        list(APPEND LLVM_LIBS "-lxml2")
+      elseif((__flag MATCHES ".lib$") AND (EXISTS "${__llvm_libdir}/${__flag}"))
+        # If the library file ends in .lib try to also search the llvm_libdir
+        message(STATUS "LLVM linker flag under LLVM libdir: ${__llvm_libdir}/${__flag}")
+        list(APPEND LLVM_LIBS "${__llvm_libdir}/${__flag}")
+      else()
+        message(STATUS "LLVM linker flag: ${__flag}")
+        list(APPEND LLVM_LIBS "${__flag}")
       endif()
-      list(APPEND LLVM_LIBS "${__flag}")
     endforeach()
   endif()
   message(STATUS "Found LLVM_INCLUDE_DIRS=" "${LLVM_INCLUDE_DIRS}")

docker/build.sh

@@ -58,6 +58,8 @@
 #
 # COMMAND (optional): Command to be executed in the docker container
 #
+
+DOCKER_ENV=()
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # Get the command line arguments.
@@ -80,8 +82,8 @@ if [[ "$1" == "--dockerfile" ]]; then
 fi
 
 if [[ "$1" == "--env" ]]; then
-    ENVIRONMENT_VARIABLE="$2"
-    echo "Setting environment variable: $ENVIRONMENT_VARIABLE"
+    DOCKER_ENV+=( --env "$2" )
+    echo "Setting environment variable: $2"
     shift 2
 fi
 
@@ -249,6 +251,7 @@ if [[ -n ${COMMAND} ]]; then
         -e "CI_PYTEST_ADD_OPTIONS=$CI_PYTEST_ADD_OPTIONS" \
         -e "CI_IMAGE_NAME=${DOCKER_IMAGE_NAME}" \
         -e "PLATFORM=${PLATFORM}" \
+        ${DOCKER_ENV[@]+"${DOCKER_ENV[@]}"} \
         ${CUDA_ENV}\
         ${CI_DOCKER_EXTRA_PARAMS[@]} \
         ${DOCKER_IMG_SPEC} \

docker/install/ubuntu_install_ethosu_driver_stack.sh

@@ -23,7 +23,7 @@ set -o pipefail
 fvp_dir="/opt/arm/FVP_Corstone_SSE-300"
 cmake_dir="/opt/arm/cmake"
 ethosu_dir="/opt/arm/ethosu"
-ethosu_driver_ver="22.08"
+ethosu_driver_ver="23.05"
 
 mkdir -p /opt/arm
 

docker/install/ubuntu_install_vela.sh

@@ -20,4 +20,4 @@ set -e
 set -u
 set -o pipefail
 
-pip3 install ethos-u-vela==3.7.0 numpy==1.23.*
+pip3 install ethos-u-vela==3.8.0 numpy==1.23.*

docs/dev/how_to/how_to.rst

@@ -30,3 +30,4 @@ various areas of the TVM stack.
    relay_add_pass
    relay_bring_your_own_codegen
    pytest_target_parametrization
+   setup_rpc_system