From d97bd25a9905325982eeebcebdc89cd7452df5bf Mon Sep 17 00:00:00 2001
From: driazati <driazati@users.noreply.github.com>
Date: Mon, 13 Dec 2021 14:10:11 -0800
Subject: [PATCH 1/2] Combine unit and integration test steps into one stage

This removes the barrier wait between test and integration tests in CI. This will increase capacity requirements and usage but, assuming we can meet that with autoscaler, should reduce CI times by an hour or two since we're doing all the testing in parallel.

The slow path is CPU unit test -> GPU frontend tests, so kicking off the GPU frontend tests faster should help decrease CI runtime.
---
 Jenkinsfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a782204d6307..ed916feff2aa 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -463,11 +463,8 @@ stage('Unit Test') {
       } else {
          Utils.markStageSkippedForConditional('python3: arm')
       }
-    }
-}
-
-stage('Integration Test') {
-  parallel 'topi: GPU': {
+    },
+  'topi: GPU': {
   if (is_docs_only_build != 1) {
     node('GPU') {
       ws(per_exec_ws('tvm/topi-python-gpu')) {

From 5c4a6fae977b8915fad80ff01b50536a78372eb0 Mon Sep 17 00:00:00 2001
From: driazati <driazati@users.noreply.github.com>
Date: Mon, 13 Dec 2021 18:49:39 -0800
Subject: [PATCH 2/2] blank

---
 Jenkinsfile | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ed916feff2aa..d6a7c5567507 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -267,16 +267,9 @@ stage('Build') {
           pack_lib('cpu', tvm_multilib_tsim)
           timeout(time: max_time, unit: 'MINUTES') {
             ci_setup(ci_cpu)
-            python_unittest(ci_cpu)
-            fsim_test(ci_cpu)
-            sh (
-              script: "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh",
-              label: "Run VTA tests in TSIM",
-            )
             // sh "${docker_run} ${ci_cpu} ./tests/scripts/task_golang.sh"
             // TODO(@jroesch): need to resolve CI issue will turn back on in follow up patch
             sh (script: "${docker_run} ${ci_cpu} ./tests/scripts/task_rust.sh", label: "Rust build and test")
-            junit "build/pytest-results/*.xml"
           }
         }
       }
@@ -367,8 +360,8 @@ stage('Build') {
   }
 }
 
-stage('Unit Test') {
-    parallel 'python3: GPU': {
+stage('Test') {
+    parallel 'unittest: GPU': {
       if (is_docs_only_build != 1) {
         node('TensorCore') {
           ws(per_exec_ws('tvm/ut-python-gpu')) {
@@ -397,10 +390,10 @@ stage('Unit Test') {
           }
         }
       } else {
-        Utils.markStageSkippedForConditional('python3: GPU')
+        Utils.markStageSkippedForConditional('unittest: GPU')
       }
     },
-    'python3: CPU': {
+    'integration: CPU': {
       if (is_docs_only_build != 1) {
         node('CPU') {
           ws(per_exec_ws("tvm/ut-python-cpu")) {
@@ -417,7 +410,29 @@ stage('Unit Test') {
           }
         }
       } else {
-        Utils.markStageSkippedForConditional('python3: CPU')
+        Utils.markStageSkippedForConditional('integration: CPU')
+      }
+    },
+    'unittest: CPU': {
+      if (is_docs_only_build != 1) {
+        node('CPU') {
+          ws(per_exec_ws("tvm/ut-python-cpu")) {
+            init_git()
+            unpack_lib('cpu', tvm_multilib_tsim)
+            timeout(time: max_time, unit: 'MINUTES') {
+              ci_setup(ci_cpu)
+              python_unittest(ci_cpu)
+              fsim_test(ci_cpu)
+              sh (
+                script: "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh",
+                label: "Run VTA tests in TSIM",
+              )
+              junit "build/pytest-results/*.xml"
+            }
+          }
+        }
+      } else {
+        Utils.markStageSkippedForConditional('unittest: CPU')
       }
     },
     'python3: i386': {