From 9420564ceee26af61b1ae789b21f00f692ee665f Mon Sep 17 00:00:00 2001 From: Liangfu Chen Date: Fri, 17 Jan 2020 19:30:24 +0800 Subject: [PATCH 1/2] [VTA] Update Jenkinsfile for VTA test with TSIM --- Jenkinsfile | 5 +- ..._python_vta.sh => task_python_vta_fsim.sh} | 0 tests/scripts/task_python_vta_tsim.sh | 55 +++++++++++++++++++ 3 files changed, 58 insertions(+), 2 deletions(-) rename tests/scripts/{task_python_vta.sh => task_python_vta_fsim.sh} (100%) create mode 100755 tests/scripts/task_python_vta_tsim.sh diff --git a/Jenkinsfile b/Jenkinsfile index f974fdcb0246..6b92f969142c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -217,7 +217,8 @@ stage('Build') { timeout(time: max_time, unit: 'MINUTES') { sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_unittest.sh" sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_integration.sh" - sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta.sh" + sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_fsim.sh" + sh "${docker_run} ${ci_cpu} ./tests/scripts/task_python_vta_tsim.sh" sh "${docker_run} ${ci_cpu} ./tests/scripts/task_golang.sh" } } @@ -269,7 +270,7 @@ stage('Unit Test') { timeout(time: max_time, unit: 'MINUTES') { sh "${docker_run} ${ci_i386} ./tests/scripts/task_python_unittest.sh" sh "${docker_run} ${ci_i386} ./tests/scripts/task_python_integration.sh" - sh "${docker_run} ${ci_i386} ./tests/scripts/task_python_vta.sh" + sh "${docker_run} ${ci_i386} ./tests/scripts/task_python_vta_fsim.sh" } } } diff --git a/tests/scripts/task_python_vta.sh b/tests/scripts/task_python_vta_fsim.sh similarity index 100% rename from tests/scripts/task_python_vta.sh rename to tests/scripts/task_python_vta_fsim.sh diff --git a/tests/scripts/task_python_vta_tsim.sh b/tests/scripts/task_python_vta_tsim.sh new file mode 100755 index 000000000000..1e5055edee65 --- /dev/null +++ b/tests/scripts/task_python_vta_tsim.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +set -u + +export PYTHONPATH=python:vta/python:topi/python + +# cleanup pycache +find . -type f -path "*.pyc" | xargs rm -f + +rm -rf ~/.tvm + +# Rebuild cython +make cython3 + +# Run unit tests in functional/fast simulator +echo "Running unittest in fsim..." +python3 -m pytest -v vta/tests/python/unittest + +# Run unit tests in functional/fast simulator +echo "Running integration test in fsim..." +python3 -m pytest -v vta/tests/python/integration + +# # Build VTA chisel design and verilator simulator +# (make -C vta/hardware/chisel/) + +# # Set default VTA config to use TSIM cycle accurate sim +# cp vta/config/tsim_sample.json vta/config/vta_config.json + +# # Run unit tests in cycle accurate simulator +# echo "Running unittest in tsim..." +# python3 -m pytest -v vta/tests/python/unittest + +# # Run unit tests in cycle accurate simulator +# echo "Running integration test in tsim..." +# python3 -m pytest -v vta/tests/python/integration + +# # Reset default fsim simulation +# cp vta/config/fsim_sample.json vta/config/vta_config.json From fdc582705243d328d19165216ba4cf384607bbc7 Mon Sep 17 00:00:00 2001 From: Liangfu Chen Date: Fri, 17 Jan 2020 19:39:09 +0800 Subject: [PATCH 2/2] duplicate task_python_vta.sh multiple copies for now --- tests/scripts/task_python_vta.sh | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100755 tests/scripts/task_python_vta.sh diff --git a/tests/scripts/task_python_vta.sh b/tests/scripts/task_python_vta.sh new file mode 100755 index 000000000000..1e5055edee65 --- /dev/null +++ b/tests/scripts/task_python_vta.sh @@ -0,0 +1,55 @@ +#!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e +set -u + +export PYTHONPATH=python:vta/python:topi/python + +# cleanup pycache +find . -type f -path "*.pyc" | xargs rm -f + +rm -rf ~/.tvm + +# Rebuild cython +make cython3 + +# Run unit tests in functional/fast simulator +echo "Running unittest in fsim..." +python3 -m pytest -v vta/tests/python/unittest + +# Run unit tests in functional/fast simulator +echo "Running integration test in fsim..." +python3 -m pytest -v vta/tests/python/integration + +# # Build VTA chisel design and verilator simulator +# (make -C vta/hardware/chisel/) + +# # Set default VTA config to use TSIM cycle accurate sim +# cp vta/config/tsim_sample.json vta/config/vta_config.json + +# # Run unit tests in cycle accurate simulator +# echo "Running unittest in tsim..." +# python3 -m pytest -v vta/tests/python/unittest + +# # Run unit tests in cycle accurate simulator +# echo "Running integration test in tsim..." +# python3 -m pytest -v vta/tests/python/integration + +# # Reset default fsim simulation +# cp vta/config/fsim_sample.json vta/config/vta_config.json