This is an automated email from the ASF dual-hosted git repository.
mehrdadh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new 698e7adb4a [microTVM][RVM] Reuse QEMU installation config and fix bug
in RVM testing (#11808)
698e7adb4a is described below
commit 698e7adb4a27ca38d51fc63f8734ab3f4f4c9a3c
Author: Mehrdad Hessar <[email protected]>
AuthorDate: Wed Jun 22 10:47:08 2022 -0700
[microTVM][RVM] Reuse QEMU installation config and fix bug in RVM testing
(#11808)
* refactor
* add llvm installation
* fix testing
---
apps/microtvm/reference-vm/base-box-tool.py | 4 ++++
apps/microtvm/reference-vm/base_box_setup_common.sh | 4 ++--
apps/microtvm/reference-vm/rebuild-tvm.sh | 6 ++----
tests/scripts/task_config_build_qemu.sh | 1 +
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/apps/microtvm/reference-vm/base-box-tool.py
b/apps/microtvm/reference-vm/base-box-tool.py
index 81408e2fbb..4a1b5aea3f 100755
--- a/apps/microtvm/reference-vm/base-box-tool.py
+++ b/apps/microtvm/reference-vm/base-box-tool.py
@@ -57,6 +57,7 @@ COMMON_SCRIPTS = [
"docker/install/ubuntu_install_core.sh",
"docker/install/ubuntu_install_python.sh",
"docker/utils/apt-install-and-clear.sh",
+ "docker/install/ubuntu1804_install_llvm.sh",
]
EXTRA_SCRIPTS = {
@@ -360,6 +361,9 @@ def do_build_release_test_vm(
found_box_line = False
with open(release_test_vagrantfile, "w") as f:
for line in lines:
+ # Skip setting version
+ if "config.vm.box_version" in line:
+ continue
m = VM_BOX_RE.match(line)
if not m:
f.write(line)
diff --git a/apps/microtvm/reference-vm/base_box_setup_common.sh
b/apps/microtvm/reference-vm/base_box_setup_common.sh
index 0d159324e2..f0c1d2c6be 100755
--- a/apps/microtvm/reference-vm/base_box_setup_common.sh
+++ b/apps/microtvm/reference-vm/base_box_setup_common.sh
@@ -53,8 +53,8 @@ rm -f ~/ubuntu_install_python.sh
sudo apt-install-and-clear -y python3-venv
# TVM deps
-# TODO(mehrdadh): replace with ubuntu_install_llvm.sh
-sudo apt-install-and-clear -y llvm
+sudo ~/ubuntu1804_install_llvm.sh
+rm -rf ~/ubuntu1804_install_llvm.sh
# ONNX deps
sudo apt-install-and-clear -y protobuf-compiler libprotoc-dev
diff --git a/apps/microtvm/reference-vm/rebuild-tvm.sh
b/apps/microtvm/reference-vm/rebuild-tvm.sh
index aca138d877..ae58cb004c 100755
--- a/apps/microtvm/reference-vm/rebuild-tvm.sh
+++ b/apps/microtvm/reference-vm/rebuild-tvm.sh
@@ -44,11 +44,9 @@ BUILD_DIR="build-microtvm-${platform}"
if [ ! -e "${BUILD_DIR}" ]; then
mkdir "${BUILD_DIR}"
fi
-cp cmake/config.cmake "${BUILD_DIR}"
+
+./tests/scripts/task_config_build_qemu.sh "${BUILD_DIR}"
cd "${BUILD_DIR}"
-sed -i 's/USE_MICRO OFF/USE_MICRO ON/' config.cmake
-sed -i 's/USE_GRAPH_EXECUTOR_DEBUG OFF/USE_GRAPH_EXECUTOR_DEBUG ON/'
config.cmake
-sed -i 's/USE_LLVM OFF/USE_LLVM ON/' config.cmake
cmake ..
rm -rf standalone_crt host_standalone_crt # remove stale generated files
make -j${num_cores}
diff --git a/tests/scripts/task_config_build_qemu.sh
b/tests/scripts/task_config_build_qemu.sh
index a2c708c6d1..29869983b8 100755
--- a/tests/scripts/task_config_build_qemu.sh
+++ b/tests/scripts/task_config_build_qemu.sh
@@ -27,6 +27,7 @@ echo set\(USE_SORT ON\) >> config.cmake
echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_CMSISNN ON\) >> config.cmake
echo set\(USE_ETHOSU ON\) >> config.cmake
+echo set\(USE_PROFILER ON\) >> config.cmake
echo set\(USE_LLVM llvm-config-10\) >> config.cmake
echo set\(CMAKE_CXX_FLAGS -Werror\) >> config.cmake
echo set\(HIDE_PRIVATE_SYMBOLS ON\) >> config.cmake
