Write TVM build options to file

apache · Aug 8, 2022 · db5d34d · db5d34d
1 parent 97b07ca
commit db5d34d
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 112 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -794,3 +794,5 @@ find_and_set_linker(${USE_ALTERNATIVE_LINKER})
 if(${SUMMARIZE})
   print_summary()
 endif()
+
+dump_options_to_file("${TVM_ALL_OPTIONS}")
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/ci/jenkins/Build.groovy.j2 b/ci/jenkins/Build.groovy.j2
@@ -33,14 +33,6 @@ def cpp_unittest(image) {
   )
 }
 
-def cpp_micro_unittest(image) {
-  sh (
-    script: "${docker_run} --env CI_NUM_EXECUTORS ${image} ./tests/scripts/task_cpp_unittest_micro.sh",
-    label: 'Build and run Micro C++ tests',
-  )
-}
-
-
 def add_microtvm_permissions() {
   {% for folder in microtvm_template_projects %}
   sh(
@@ -160,7 +152,6 @@ stage('Build') {
           )
           make(ci_wasm, 'build', '-j2')
           cpp_unittest(ci_wasm)
-          cpp_micro_unittest(ci_wasm)
           timeout(time: max_time, unit: 'MINUTES') {
             ci_setup(ci_wasm)
             sh (

diff --git a/ci/jenkins/Test.groovy.j2 b/ci/jenkins/Test.groovy.j2
@@ -16,12 +16,10 @@
   {% if shard_index == 1 %}
   {{ m.download_artifacts(tag='gpu2', filenames=tvm_multilib) }}
   cpp_unittest(ci_gpu)
-  cpp_micro_unittest(ci_gpu)
 
   {{ m.download_artifacts(tag='gpu', filenames=tvm_multilib) }}
   ci_setup(ci_gpu)
   cpp_unittest(ci_gpu)
-  cpp_micro_unittest(ci_gpu)
   {% else %}
   {{ m.download_artifacts(tag='gpu', filenames=tvm_multilib) }}
   ci_setup(ci_gpu)
@@ -70,7 +68,6 @@
   ci_setup(ci_i386)
   {% if shard_index == 1 %}
   cpp_unittest(ci_i386)
-  cpp_micro_unittest(ci_i386)
   {% endif %}
   python_unittest(ci_i386)
   sh (
@@ -95,7 +92,6 @@
   ci_setup(ci_hexagon)
   {% if shard_index == 1 %}
   cpp_unittest(ci_hexagon)
-  cpp_micro_unittest(ci_hexagon)
   {% endif %}
   sh (
     script: "${docker_run} ${ci_hexagon} ./tests/scripts/task_python_hexagon.sh",
@@ -164,7 +160,6 @@
   ci_setup(ci_arm)
   {% if shard_index == 1 %}
   cpp_unittest(ci_arm)
-  cpp_micro_unittest(ci_arm)
   {% endif %}
   sh (
     script: "${docker_run} ${ci_arm} ./tests/scripts/task_python_arm_compute_library.sh",
@@ -254,7 +249,6 @@ stage('Test') {
     {{ m.download_artifacts(tag='cpu', filenames=tvm_multilib_tsim) }}
     ci_setup(ci_cpu)
     cpp_unittest(ci_cpu)
-    cpp_micro_unittest(ci_cpu)
     python_unittest(ci_cpu)
     fsim_test(ci_cpu)
     sh (

diff --git a/cmake/utils/Summary.cmake b/cmake/utils/Summary.cmake
@@ -67,3 +67,10 @@ macro(print_summary)
         message(STATUS ${OUT} " : " ${OPTION_VALUE})
     endforeach()
 endmacro()
+
+function(dump_options_to_file tvm_options)
+    file(REMOVE ${CMAKE_BINARY_DIR}/TVMBuildOptions.txt)
+    foreach(option ${tvm_options})
+        file(APPEND ${CMAKE_BINARY_DIR}/TVMBuildOptions.txt "${option} ${${option}} \n")
+    endforeach()
+endfunction()
diff --git a/tests/python/unittest/test_meta_schedule_task_scheduler.py b/tests/python/unittest/test_meta_schedule_task_scheduler.py
@@ -338,18 +338,6 @@ def test_meta_schedule_task_scheduler_override_next_task_id_only():  # pylint: d
         )
 
 
-def should_skip_oob_test():
-    flags = libinfo()
-    # TODO(gigiblender) This combination of flags should be enabled only in the ci_minimal CI configuration.
-    #  Remove this once the OOB test is fixed.
-    return (
-        flags["USE_RELAY_DEBUG"] == "ON"
-        and flags["USE_LLVM"] == "llvm-config"
-        and flags["USE_MICRO"] != "ON"
-    )
-
-
-@pytest.mark.skipif(should_skip_oob_test(), reason="Does array access OOB. Remove once fixed.")
 def test_meta_schedule_task_scheduler_multiple_gradient_based():
     num_trials_per_iter = 6
     max_trials_per_task = 101

diff --git a/tests/scripts/ci.py b/tests/scripts/ci.py
@@ -556,18 +556,13 @@ def add_subparser(
 
 
 CPP_UNITTEST = ("run c++ unitests", ["./tests/scripts/task_cpp_unittest.sh {build_dir}"])
-CPP_MICRO_UNITTEST = (
-    "run micro c++ unitests",
-    ["./tests/scripts/task_cpp_unittest_micro.sh {build_dir}"],
-)
 
 generated = [
     generate_command(
         name="gpu",
         help="Run GPU build and test(s)",
         options={
             "cpp": CPP_UNITTEST,
-            "micro_cpp": CPP_MICRO_UNITTEST,
             "topi": ("run topi tests", ["./tests/scripts/task_python_topi.sh"]),
             "unittest": (
                 "run unit tests",
@@ -585,7 +580,6 @@ def add_subparser(
         help="Run CPU build and test(s)",
         options={
             "cpp": CPP_UNITTEST,
-            "micro_cpp": CPP_MICRO_UNITTEST,
             "integration": (
                 "run integration tests",
                 ["./tests/scripts/task_python_integration.sh"],
@@ -619,7 +613,6 @@ def add_subparser(
         help="Run i386 build and test(s)",
         options={
             "cpp": CPP_UNITTEST,
-            "micro_cpp": CPP_MICRO_UNITTEST,
             "integration": (
                 "run integration tests",
                 [
@@ -634,7 +627,6 @@ def add_subparser(
         help="Run WASM build and test(s)",
         options={
             "cpp": CPP_UNITTEST,
-            "micro_cpp": CPP_MICRO_UNITTEST,
             "test": ("run WASM tests", ["./tests/scripts/task_web_wasm.sh"]),
         },
     ),
@@ -643,7 +635,6 @@ def add_subparser(
         help="Run Cortex-M build and test(s)",
         options={
             "cpp": CPP_UNITTEST,
-            "micro_cpp": CPP_MICRO_UNITTEST,
             "test": (
                 "run microTVM tests",
                 [
@@ -659,7 +650,6 @@ def add_subparser(
         post_build=["./tests/scripts/task_build_hexagon_api.sh --output build-hexagon"],
         options={
             "cpp": CPP_UNITTEST,
-            "micro_cpp": CPP_MICRO_UNITTEST,
             "test": (
                 "run Hexagon API/Python tests",
                 [
@@ -674,7 +664,6 @@ def add_subparser(
         precheck=check_arm_qemu,
         options={
             "cpp": CPP_UNITTEST,
-            "micro_cpp": CPP_MICRO_UNITTEST,
             "python": (
                 "run full Python tests",
                 [

diff --git a/tests/scripts/task_cpp_unittest.sh b/tests/scripts/task_cpp_unittest.sh
@@ -45,7 +45,22 @@ python3 tests/scripts/task_build.py \
     --cmake-target cpptest \
     --build-dir "${BUILD_DIR}"
 
+# crttest requries USE_MICRO to be enabled.
+if grep -Fq "USE_MICRO ON" ${BUILD_DIR}/TVMBuildOptions.txt; then
+  pushd "${BUILD_DIR}"
+  ninja crttest
+  popd
+fi
+
 pushd "${BUILD_DIR}"
 ctest --gtest_death_test_style=threadsafe
 popd
 
+# Test MISRA-C runtime. It requires USE_MICRO to be enabled.
+if grep -Fq "USE_MICRO ON" ${BUILD_DIR}/TVMBuildOptions.txt; then
+  pushd apps/bundle_deploy
+  rm -rf build
+  make test_dynamic test_static
+  popd
+fi
+
diff --git a/tests/scripts/task_cpp_unittest_micro.sh b/tests/scripts/task_cpp_unittest_micro.sh