This is an automated email from the ASF dual-hosted git repository.
areusch 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 3afb433eb8 [ci] Split hexagon into 2 steps (#11132)
3afb433eb8 is described below
commit 3afb433eb86d92b057163c5b7bb2160498ea4f98
Author: driazati <[email protected]>
AuthorDate: Wed Apr 27 11:17:23 2022 -0700
[ci] Split hexagon into 2 steps (#11132)
This shards up the hexagon build since after #11016 it's the longest test
step. This also drops the max runtime per stage down to 2 hours from 4 hours to
make these kind of increases more obvious in the future.
Co-authored-by: driazati <[email protected]>
---
Jenkinsfile | 141 ++++++++++++++++++++++++++++++++++++++++++++-----
jenkins/Jenkinsfile.j2 | 41 ++++++++++----
jenkins/macros.j2 | 2 +-
3 files changed, 159 insertions(+), 25 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 226cda5dab..824edeac4f 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,7 +45,7 @@
// 'python3 jenkins/generate.py'
// Note: This timestamp is here to ensure that updates to the Jenkinsfile are
// always rebased on main before merging:
-// Generated at 2022-04-22T12:59:15.071304
+// Generated at 2022-04-27T09:06:39.799194
import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
// NOTE: these lines are scanned by docker/dev_common.sh. Please update the
regex as needed. -->
@@ -92,7 +92,7 @@ upstream_revision = null
docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM'
docker_build = 'docker/build.sh'
// timeout in minutes
-max_time = 240
+max_time = 120
rebuild_docker_images = false
def per_exec_ws(folder) {
@@ -196,7 +196,7 @@ if
(currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
cancel_previous_build()
-
+def lint() {
stage('Lint') {
node('CPU') {
timeout(time: max_time, unit: 'MINUTES') {
@@ -252,6 +252,12 @@ stage('Lint') {
}
}
}
+}
+
+// [note: method size]
+// This has to be extracted into a method due to JVM limitations on the size of
+// a method (so the code can't all be inlined)
+lint()
def build_image(image_name) {
hash = sh(
@@ -465,6 +471,7 @@ def cpp_unittest(image) {
)
}
+def build() {
stage('Build') {
environment {
SKIP_SLOW_TESTS = "${skip_slow_tests}"
@@ -605,7 +612,12 @@ stage('Build') {
}
}
}
+}
+// [note: method size]
+build()
+
+def test() {
stage('Test') {
environment {
SKIP_SLOW_TESTS = "${skip_slow_tests}"
@@ -837,17 +849,52 @@ stage('Test') {
Utils.markStageSkippedForConditional('python: i386 2 of 2')
}
},
- 'test: Hexagon': {
+ 'test: Hexagon 1 of 4': {
if (!skip_ci && is_docs_only_build != 1) {
node('CPU') {
ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-hexagon") {
- timeout(time: max_time, unit: 'MINUTES') {
- try {
- init_git()
- withEnv(['PLATFORM=hexagon'], {
+ try {
+ init_git()
+ timeout(time: max_time, unit: 'MINUTES') {
+ withEnv([
+ 'PLATFORM=hexagon',
+ 'TVM_NUM_SHARDS=4',
+ 'TVM_SHARD_INDEX=0'], {
+ unpack_lib('hexagon', tvm_lib)
+ ci_setup(ci_hexagon)
+ cpp_unittest(ci_hexagon)
+ sh (
+ script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_build_hexagon_api.sh",
+ label: 'Build Hexagon API',
+ )
+ sh (
+ script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_python_hexagon.sh",
+ label: 'Run Hexagon tests',
+ )
+ })
+ }
+ } finally {
+ junit 'build/pytest-results/*.xml'
+ }
+ }
+ }
+ } else {
+ Utils.markStageSkippedForConditional('test: Hexagon 1 of 4')
+ }
+ },
+ 'test: Hexagon 2 of 4': {
+ if (!skip_ci && is_docs_only_build != 1) {
+ node('CPU') {
+ ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-hexagon") {
+ try {
+ init_git()
+ timeout(time: max_time, unit: 'MINUTES') {
+ withEnv([
+ 'PLATFORM=hexagon',
+ 'TVM_NUM_SHARDS=4',
+ 'TVM_SHARD_INDEX=1'], {
unpack_lib('hexagon', tvm_lib)
ci_setup(ci_hexagon)
- cpp_unittest(ci_hexagon)
sh (
script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_build_hexagon_api.sh",
label: 'Build Hexagon API',
@@ -857,14 +904,78 @@ stage('Test') {
label: 'Run Hexagon tests',
)
})
- } finally {
- junit 'build/pytest-results/*.xml'
}
+ } finally {
+ junit 'build/pytest-results/*.xml'
}
}
}
} else {
- Utils.markStageSkippedForConditional('test: Hexagon')
+ Utils.markStageSkippedForConditional('test: Hexagon 2 of 4')
+ }
+ },
+ 'test: Hexagon 3 of 4': {
+ if (!skip_ci && is_docs_only_build != 1) {
+ node('CPU') {
+ ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-hexagon") {
+ try {
+ init_git()
+ timeout(time: max_time, unit: 'MINUTES') {
+ withEnv([
+ 'PLATFORM=hexagon',
+ 'TVM_NUM_SHARDS=4',
+ 'TVM_SHARD_INDEX=2'], {
+ unpack_lib('hexagon', tvm_lib)
+ ci_setup(ci_hexagon)
+ sh (
+ script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_build_hexagon_api.sh",
+ label: 'Build Hexagon API',
+ )
+ sh (
+ script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_python_hexagon.sh",
+ label: 'Run Hexagon tests',
+ )
+ })
+ }
+ } finally {
+ junit 'build/pytest-results/*.xml'
+ }
+ }
+ }
+ } else {
+ Utils.markStageSkippedForConditional('test: Hexagon 3 of 4')
+ }
+ },
+ 'test: Hexagon 4 of 4': {
+ if (!skip_ci && is_docs_only_build != 1) {
+ node('CPU') {
+ ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/test-hexagon") {
+ try {
+ init_git()
+ timeout(time: max_time, unit: 'MINUTES') {
+ withEnv([
+ 'PLATFORM=hexagon',
+ 'TVM_NUM_SHARDS=4',
+ 'TVM_SHARD_INDEX=3'], {
+ unpack_lib('hexagon', tvm_lib)
+ ci_setup(ci_hexagon)
+ sh (
+ script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_build_hexagon_api.sh",
+ label: 'Build Hexagon API',
+ )
+ sh (
+ script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_python_hexagon.sh",
+ label: 'Run Hexagon tests',
+ )
+ })
+ }
+ } finally {
+ junit 'build/pytest-results/*.xml'
+ }
+ }
+ }
+ } else {
+ Utils.markStageSkippedForConditional('test: Hexagon 4 of 4')
}
},
'test: QEMU': {
@@ -1185,7 +1296,7 @@ stage('Test') {
ws("workspace/exec_${env.EXECUTOR_NUMBER}/tvm/docs-python-gpu") {
init_git()
unpack_lib('gpu', tvm_multilib)
- timeout(time: max_time, unit: 'MINUTES') {
+ timeout(time: 180, unit: 'MINUTES') {
ci_setup(ci_gpu)
sh (
script: "${docker_run} ${ci_gpu}
./tests/scripts/task_python_docs.sh",
@@ -1200,6 +1311,10 @@ stage('Test') {
},
)
}
+}
+
+// [note: method size]
+test()
/*
stage('Build packages') {
diff --git a/jenkins/Jenkinsfile.j2 b/jenkins/Jenkinsfile.j2
index 8331db0082..0d2d91ad91 100644
--- a/jenkins/Jenkinsfile.j2
+++ b/jenkins/Jenkinsfile.j2
@@ -89,7 +89,7 @@ upstream_revision = null
docker_run = 'docker/bash.sh --env CI --env TVM_SHARD_INDEX --env
TVM_NUM_SHARDS --env RUN_DISPLAY_URL --env PLATFORM'
docker_build = 'docker/build.sh'
// timeout in minutes
-max_time = 240
+max_time = 120
rebuild_docker_images = false
def per_exec_ws(folder) {
@@ -193,7 +193,7 @@ if
(currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
cancel_previous_build()
-
+def lint() {
stage('Lint') {
node('CPU') {
timeout(time: max_time, unit: 'MINUTES') {
@@ -249,6 +249,12 @@ stage('Lint') {
}
}
}
+}
+
+// [note: method size]
+// This has to be extracted into a method due to JVM limitations on the size of
+// a method (so the code can't all be inlined)
+lint()
def build_image(image_name) {
hash = sh(
@@ -462,6 +468,7 @@ def cpp_unittest(image) {
)
}
+def build() {
stage('Build') {
environment {
SKIP_SLOW_TESTS = "${skip_slow_tests}"
@@ -602,13 +609,18 @@ stage('Build') {
}
}
}
+}
+
+// [note: method size]
+build()
+def test() {
stage('Test') {
environment {
SKIP_SLOW_TESTS = "${skip_slow_tests}"
}
parallel(
- {% call m.sharded_test_step(
+ {% call(shard_index) m.sharded_test_step(
name="unittest: GPU",
num_shards=2,
node="GPU",
@@ -634,7 +646,7 @@ stage('Test') {
label: 'Run Python GPU integration tests',
)
{% endcall %}
- {% call m.sharded_test_step(
+ {% call(shard_index) m.sharded_test_step(
name="integration: CPU",
node="CPU",
num_shards=2,
@@ -663,7 +675,7 @@ stage('Test') {
label: 'Run VTA tests in TSIM',
)
{% endcall %}
- {% call m.sharded_test_step(
+ {% call(shard_index) m.sharded_test_step(
name="python: i386",
node="CPU",
num_shards=2,
@@ -680,14 +692,17 @@ stage('Test') {
)
fsim_test(ci_i386)
{% endcall %}
- {% call m.test_step(
+ {% call(shard_index) m.sharded_test_step(
name="test: Hexagon",
node="CPU", ws="tvm/test-hexagon",
platform="hexagon",
+ num_shards=4,
) %}
unpack_lib('hexagon', tvm_lib)
ci_setup(ci_hexagon)
- cpp_unittest(ci_hexagon)
+ {% if shard_index == 1 %}
+ cpp_unittest(ci_hexagon)
+ {% endif %}
sh (
script: "${docker_run} ${ci_hexagon}
./tests/scripts/task_build_hexagon_api.sh",
label: 'Build Hexagon API',
@@ -736,7 +751,7 @@ stage('Test') {
label: 'Run TOPI tests',
)
{% endcall %}
- {% call m.sharded_test_step(
+ {% call(shard_index) m.sharded_test_step(
name="integration: aarch64",
num_shards=2,
node="ARM", ws="tvm/ut-python-arm",
@@ -750,7 +765,7 @@ stage('Test') {
label: 'Run CPU integration tests',
)
{% endcall %}
- {% call m.sharded_test_step(
+ {% call(shard_index) m.sharded_test_step(
name="topi: GPU",
node="GPU",
num_shards=2,
@@ -764,7 +779,7 @@ stage('Test') {
label: 'Run TOPI tests',
)
{% endcall %}
- {% call m.sharded_test_step(
+ {% call(shard_index) m.sharded_test_step(
name="frontend: GPU", node="GPU",
num_shards=3,
ws="tvm/frontend-python-gpu",
@@ -809,7 +824,7 @@ stage('Test') {
ws({{ m.per_exec_ws('tvm/docs-python-gpu') }}) {
init_git()
unpack_lib('gpu', tvm_multilib)
- timeout(time: max_time, unit: 'MINUTES') {
+ timeout(time: 180, unit: 'MINUTES') {
ci_setup(ci_gpu)
sh (
script: "${docker_run} ${ci_gpu}
./tests/scripts/task_python_docs.sh",
@@ -824,6 +839,10 @@ stage('Test') {
},
)
}
+}
+
+// [note: method size]
+test()
/*
stage('Build packages') {
diff --git a/jenkins/macros.j2 b/jenkins/macros.j2
index 9e7c202b32..97e6eee68c 100644
--- a/jenkins/macros.j2
+++ b/jenkins/macros.j2
@@ -32,7 +32,7 @@
'PLATFORM={{ platform }}',
'TVM_NUM_SHARDS={{ num_shards }}',
'TVM_SHARD_INDEX={{ shard_index - 1 }}'], {
- {{ caller() | trim | indent(width=12) }}
+ {{ caller(shard_index) | trim | indent(width=12) }}
})
}
} finally {
