From 23c3476c84e2edf73cccb7e02dfd22e401071fcc Mon Sep 17 00:00:00 2001 From: Florian Zaruba Date: Fri, 6 Oct 2023 14:48:21 +0200 Subject: [PATCH 01/18] [ci] Add codebuild Signed-off-by: Florian Zaruba --- .github/workflows/aws.yml | 28 ++++++++++++++++++++++++++++ buildspec.yml | 8 ++++++++ 2 files changed, 36 insertions(+) create mode 100644 .github/workflows/aws.yml create mode 100644 buildspec.yml diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml new file mode 100644 index 0000000000..b8839c1901 --- /dev/null +++ b/.github/workflows/aws.yml @@ -0,0 +1,28 @@ +name: aws +on: push + +# on: +# push: +# branches: +# - 'dev' + +jobs: + aws: + name: AWS Pipeline (private) + if: github.actor == 'davideschiavone' || github.actor == 'MikeOpenHWGroup' || github.actor == 'zarubaf' + runs-on: ubuntu-latest + # These permissions are needed to interact with GitHub's OIDC Token endpoint. + permissions: + id-token: write + contents: read + steps: + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }} + aws-region: eu-west-1 + - name: Run AWS Pipeline + uses: aws-actions/aws-codebuild-run-build@v1 + with: + project-name: core-v-verif + hide-cloudwatch-logs: true diff --git a/buildspec.yml b/buildspec.yml new file mode 100644 index 0000000000..073d2119ef --- /dev/null +++ b/buildspec.yml @@ -0,0 +1,8 @@ +version: 0.2 + +phases: + + build: + commands: + - chown -R florian:florian . + - su florian -c "source /synopsys/scripts/env.sh; echo $PATH" From f1e490fe6b7ca062e4cdc73ca42a10a2ccd46eb3 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Tue, 10 Oct 2023 16:37:15 -0400 Subject: [PATCH 02/18] Fix README formatting --- .github/workflows/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index b03c4972fd..2869c49689 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -86,5 +86,5 @@ on: ``` --> -####end +#### end From 026e84bfcb7a08dd77623faee30ff1b9d4869b9a Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Tue, 10 Oct 2023 18:01:10 -0400 Subject: [PATCH 03/18] Test setup for VCS --- buildspec.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 073d2119ef..32e5692855 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -5,4 +5,7 @@ phases: build: commands: - chown -R florian:florian . - - su florian -c "source /synopsys/scripts/env.sh; echo $PATH" +# - su florian -c "source /synopsys/scripts/env.sh; echo $PATH" + - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 + - export PATH=$VCS_HOME/bin:$PATH + - vcs -id From de472eb00fd0bff2d4f42ae820b2a1aa59633780 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Tue, 10 Oct 2023 18:46:43 -0400 Subject: [PATCH 04/18] Fetch the toolchain --- buildspec.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/buildspec.yml b/buildspec.yml index 32e5692855..2f06737907 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -9,3 +9,10 @@ phases: - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id + - wget https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz + - tar xvf corev-openhw-gcc-centos7-20230905.tar.gz + - export CV_SW_TOOLCHAIN=corev-openhw-gcc-centos7-20230905 + - export CV_SW_PREFIX=riscv32-corev-elf- + - export CV_SW_MARCH=rv32imc_zicsr_zifencei + - corev-openhw-gcc-centos7-20230905/bin/riscv32-corev-elf-gcc --version + From 92362a3d92c42e7c2eff27e70747e2d7f987a455 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Tue, 10 Oct 2023 18:52:27 -0400 Subject: [PATCH 05/18] Use curl, not wget. --- buildspec.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 2f06737907..05780b8627 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -9,7 +9,8 @@ phases: - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id - - wget https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz +# - wget https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz + - curl -O https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - tar xvf corev-openhw-gcc-centos7-20230905.tar.gz - export CV_SW_TOOLCHAIN=corev-openhw-gcc-centos7-20230905 - export CV_SW_PREFIX=riscv32-corev-elf- From 6dc6070b2a0249c87ddaca022875ead3c62c69ca Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Tue, 10 Oct 2023 19:08:11 -0400 Subject: [PATCH 06/18] Run a test --- buildspec.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildspec.yml b/buildspec.yml index 05780b8627..1442a775af 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -11,9 +11,10 @@ phases: - vcs -id # - wget https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - curl -O https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - - tar xvf corev-openhw-gcc-centos7-20230905.tar.gz + - tar xf corev-openhw-gcc-centos7-20230905.tar.gz - export CV_SW_TOOLCHAIN=corev-openhw-gcc-centos7-20230905 - export CV_SW_PREFIX=riscv32-corev-elf- - export CV_SW_MARCH=rv32imc_zicsr_zifencei - corev-openhw-gcc-centos7-20230905/bin/riscv32-corev-elf-gcc --version - + - cd cv32e40p/sim/uvmt + - make test USE_ISS=0 SIMULATOR=vcs TEST=hello-world From 49de7743531cd1337c5ae8509ba0f9d741b4aeb4 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Tue, 10 Oct 2023 19:52:12 -0400 Subject: [PATCH 07/18] Setup shell env for Questasim (vsim) --- buildspec.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 1442a775af..da258db4da 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -9,6 +9,8 @@ phases: - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id + - source /onespin/scripts/questasim.2022.10.bash + - export MTI_VCO_MODE=64 # - wget https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - curl -O https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - tar xf corev-openhw-gcc-centos7-20230905.tar.gz @@ -17,4 +19,4 @@ phases: - export CV_SW_MARCH=rv32imc_zicsr_zifencei - corev-openhw-gcc-centos7-20230905/bin/riscv32-corev-elf-gcc --version - cd cv32e40p/sim/uvmt - - make test USE_ISS=0 SIMULATOR=vcs TEST=hello-world + - make test USE_ISS=0 SIMULATOR=vsim TEST=hello-world From dfe0c3d9acb1865644e896022786aca2c2ed002b Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Tue, 10 Oct 2023 20:07:37 -0400 Subject: [PATCH 08/18] Add Questa shell env --- buildspec.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/buildspec.yml b/buildspec.yml index da258db4da..98aad82979 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -6,11 +6,15 @@ phases: commands: - chown -R florian:florian . # - su florian -c "source /synopsys/scripts/env.sh; echo $PATH" +# VCS environment - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id - - source /onespin/scripts/questasim.2022.10.bash - - export MTI_VCO_MODE=64 +# Questasim (vsim) environment +# - export QUESTAROOT=/onespin/questasim +# - export LM_LICENSE_FILE=29000@ip-172-31-46-244 +# - export PATH=${QUESTAROOT}/bin:${PATH} +# - export MTI_VCO_MODE=64 # - wget https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - curl -O https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - tar xf corev-openhw-gcc-centos7-20230905.tar.gz @@ -19,4 +23,4 @@ phases: - export CV_SW_MARCH=rv32imc_zicsr_zifencei - corev-openhw-gcc-centos7-20230905/bin/riscv32-corev-elf-gcc --version - cd cv32e40p/sim/uvmt - - make test USE_ISS=0 SIMULATOR=vsim TEST=hello-world +# - make test USE_ISS=0 SIMULATOR=vcs TEST=hello-world From 32bc0a653c60841c5dc368a0a14cf9be88aaf6fd Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Wed, 11 Oct 2023 08:38:41 -0400 Subject: [PATCH 09/18] build-essentials (to get gcc for VCS) --- buildspec.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 98aad82979..29f7d39fe3 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -7,6 +7,7 @@ phases: - chown -R florian:florian . # - su florian -c "source /synopsys/scripts/env.sh; echo $PATH" # VCS environment + - apt get install build-essentials - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id @@ -23,4 +24,4 @@ phases: - export CV_SW_MARCH=rv32imc_zicsr_zifencei - corev-openhw-gcc-centos7-20230905/bin/riscv32-corev-elf-gcc --version - cd cv32e40p/sim/uvmt -# - make test USE_ISS=0 SIMULATOR=vcs TEST=hello-world + - make test USE_ISS=0 SIMULATOR=vcs TEST=hello-world From ee399c83d3e67ac6f256313bc21c864e57f92045 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Wed, 11 Oct 2023 08:48:06 -0400 Subject: [PATCH 10/18] Update buildspec.yml (correct typo) --- buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 29f7d39fe3..7532770609 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -7,7 +7,7 @@ phases: - chown -R florian:florian . # - su florian -c "source /synopsys/scripts/env.sh; echo $PATH" # VCS environment - - apt get install build-essentials + - apt-get install build-essentials - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id From 4f1db659ce718fd45b59e8fb0a7c2ef40bdd7044 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Wed, 11 Oct 2023 09:22:53 -0400 Subject: [PATCH 11/18] Yum install, not apt-get (this runs on a CentOS7 machine) --- buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 7532770609..87dbb522a8 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -7,7 +7,7 @@ phases: - chown -R florian:florian . # - su florian -c "source /synopsys/scripts/env.sh; echo $PATH" # VCS environment - - apt-get install build-essentials + - yum install gcc gcc-c++ make - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id From a5442673abf842a69ec83a26bed6b70e56468bf7 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Wed, 11 Oct 2023 10:18:39 -0400 Subject: [PATCH 12/18] assume yes for all yum questions --- buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 87dbb522a8..286b498c8f 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -7,7 +7,7 @@ phases: - chown -R florian:florian . # - su florian -c "source /synopsys/scripts/env.sh; echo $PATH" # VCS environment - - yum install gcc gcc-c++ make + - yum -y install gcc gcc-c++ make - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id From fadd215375fcf0f259b3f75381b4d1d95b03d3da Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Wed, 11 Oct 2023 10:29:46 -0400 Subject: [PATCH 13/18] Add LM_LICENSE_FILE --- buildspec.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/buildspec.yml b/buildspec.yml index 286b498c8f..e6a39405c8 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -11,6 +11,7 @@ phases: - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id + - export LM_LICENSE_FILE=29000@ip-172-31-46-244 # Questasim (vsim) environment # - export QUESTAROOT=/onespin/questasim # - export LM_LICENSE_FILE=29000@ip-172-31-46-244 From 953ffe752b8d7ca186129ec9f3f03a868fb1c7ab Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Wed, 11 Oct 2023 10:47:50 -0400 Subject: [PATCH 14/18] Add SNPSLMD_LICENSE_FILE for VCS --- buildspec.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index e6a39405c8..186940b877 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -11,7 +11,8 @@ phases: - export VCS_HOME=/synopsys/vcs/S-2021.09-SP1 - export PATH=$VCS_HOME/bin:$PATH - vcs -id - - export LM_LICENSE_FILE=29000@ip-172-31-46-244 +# - export LM_LICENSE_FILE=29000@ip-172-31-46-244 + - export SNPSLMD_LICENSE_FILE=27020@ip-172-31-46-244.eu-west-1.compute.internal # Questasim (vsim) environment # - export QUESTAROOT=/onespin/questasim # - export LM_LICENSE_FILE=29000@ip-172-31-46-244 From 6c192d54054bf7625700ac8bd43336f8edcb5de3 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Wed, 11 Oct 2023 10:56:55 -0400 Subject: [PATCH 15/18] Relative path to Toolchain --- buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 186940b877..4e295cf4ab 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -21,7 +21,7 @@ phases: # - wget https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - curl -O https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - tar xf corev-openhw-gcc-centos7-20230905.tar.gz - - export CV_SW_TOOLCHAIN=corev-openhw-gcc-centos7-20230905 + - export CV_SW_TOOLCHAIN=../../../corev-openhw-gcc-centos7-20230905 - export CV_SW_PREFIX=riscv32-corev-elf- - export CV_SW_MARCH=rv32imc_zicsr_zifencei - corev-openhw-gcc-centos7-20230905/bin/riscv32-corev-elf-gcc --version From 550341c5e3e793d8c4c3f82a6aac3aeb58fe2dc9 Mon Sep 17 00:00:00 2001 From: Mike Thompson Date: Wed, 11 Oct 2023 11:42:18 -0400 Subject: [PATCH 16/18] Absolute TOOLCHAIN path --- buildspec.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildspec.yml b/buildspec.yml index 4e295cf4ab..ecdfc2b0e0 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -21,7 +21,8 @@ phases: # - wget https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - curl -O https://buildbot.embecosm.com/job/corev-gcc-centos7/19/artifact/corev-openhw-gcc-centos7-20230905.tar.gz - tar xf corev-openhw-gcc-centos7-20230905.tar.gz - - export CV_SW_TOOLCHAIN=../../../corev-openhw-gcc-centos7-20230905 + - export HERE=`pwd` + - export CV_SW_TOOLCHAIN=$HERE/corev-openhw-gcc-centos7-20230905 - export CV_SW_PREFIX=riscv32-corev-elf- - export CV_SW_MARCH=rv32imc_zicsr_zifencei - corev-openhw-gcc-centos7-20230905/bin/riscv32-corev-elf-gcc --version From 60ae70a5d32205801f2b2a4e50e8ec3285a3226f Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 11 Oct 2023 15:12:55 -0400 Subject: [PATCH 17/18] First attempt at ci_check run --- .github/workflows/README.md | 2 +- bin/ci_check | 25 ++++++++++++++++--------- buildspec.yml | 11 +++++++++-- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 2869c49689..7c532ac21a 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -1,4 +1,4 @@ -# Github CI Regressions +# GitHub CI Regressions The directory **_typically_** contains YAML files that specify the functional regressions for core-v-verif projects. We are currently transitioning to a new CI flow and so for now this directory is empty. diff --git a/bin/ci_check b/bin/ci_check index 42cf58c127..21d4eacc17 100755 --- a/bin/ci_check +++ b/bin/ci_check @@ -57,6 +57,7 @@ if (sys.version_info < (3,0,0)): # Globals.... name_of_ci_check_regression = '_ci_check_dev' # must match the name of one regression list in .metrics.json core_tests = ['misalign', 'illegal', 'dhrystone', 'fibonacci', 'riscv_ebreak_test_0'] +return_code = 1 # signal failure by default try: default_core = os.environ['CV_CORE'] except KeyError: @@ -73,6 +74,7 @@ print('ci_check: topdir : {}'.format(topdir)) parser = argparse.ArgumentParser() parser.add_argument("-s", "--simulator", help="SystemVerilog simulator", choices=['dsim', 'xrun', 'vsim', 'vcs', 'riviera']) parser.add_argument("--core", help="Set the core to test (default: {})".format(default_core), default=default_core) +parser.add_argument("-b", "--batch", help="Run in batch mode (won't prompt for user input)", action="store_true") parser.add_argument("-d", "--debug", help="Display debug messages", action="store_true") parser.add_argument("-p", "--print_command", help="Print commands to stdout, do not run", action="store_true") parser.add_argument("-c", "--check_only", help="Check previosu results (do not run)", action="store_true") @@ -120,6 +122,7 @@ def check_uvm_results(check_only=0): fail_count = 0 expct_fail = 0 pass_count = 0 + global return_code if os.path.exists(sim_results_dir): fails = subprocess.Popen('grep "SIMULATION FAILED" `find {} -name "*.log" -print`'.format(sim_results_dir), @@ -153,9 +156,11 @@ def check_uvm_results(check_only=0): elif ((fail_count == 0) and (pass_count >=3)): print ('\nCI Check PASSED with no failures.') print ('OK to issue a pull-request.\n') + return_code = 0 elif (fail_count == expct_fail): print ('\nCI Check PASSED with KNOWN failure(s).') print ('OK to issue a pull-request.\n') + return_code = 0 else: print ('\nCI Check FAILED with unknown failures.') print ('Please fix before issuing a pull-request.\n') @@ -163,6 +168,7 @@ def check_uvm_results(check_only=0): print ('\nCI Check FAILED with non-existent sim directory: {}'.format(sim_results_dir)) print ('Please fix before issuing a pull-request.\n') + exit(return_code) def check_core_results(run_count): core_runs = subprocess.Popen('grep "EXIT SUCCESS" -R -I ../{}/sim/core/simulation_results'.format(args.core.lower()), @@ -187,9 +193,10 @@ def check_core_results(run_count): # This script may do some unexpected things, so give the user an escape hatch. def ask_user(): - txt = input("Is this what you want [Y/N]? ") - if not ((txt == 'Y') or (txt == 'y')): - exit(1) + if (not args.batch): + txt = input("Is this what you want [Y/N]? ") + if not ((txt == 'Y') or (txt == 'y')): + exit(1) # Load regression YAML def load_regress_yaml(regression): @@ -233,7 +240,7 @@ if (args.check_only): check_core_results(len(core_tests)+1) # +1 because 'make' runs hello-world if not (args.no_uvm): check_uvm_results(args.check_only) - exit(0) + exit(return_code) if (args.no_uvm): uvm = 0 @@ -242,10 +249,10 @@ if (args.verilator): veril = 1 elif (args.simulator == None): print ('Must specify a simulator. Type `ci_check -h` to see how') - exit(0) + exit(1) elif (not(shutil.which(args.simulator))): print ('ERROR: simulator='+args.simulator+' but executable not found') - exit(0) + exit(1) else: svtool = args.simulator @@ -254,13 +261,13 @@ print('ci_check: core : {}'.format(args.core)) print('ci_check: name_of_ci_check_regression : {}'.format(name_of_ci_check_regression)) os.environ['CV_CORE'] = args.core.upper() -# --print_command is set: do not actually _do_ anything +# if --print_command is set: do not actually _do_ anything if not (prcmd): if (args.keep): print ('Keeping previously cloned version of the RTL plus any previously generated files') ask_user() else: - print ('This will delete your previously cloned RTL repo plus all previously generated files') + print ('Deleting your previously cloned RTL repo plus all previously generated files') ask_user() os.chdir(os.path.abspath(os.path.join(topdir, args.core.lower(), 'sim/uvmt'))) os.system('make clean_all') @@ -319,7 +326,7 @@ if (uvm): os.chdir(topdir) # cmd in .metrics.json assumes all cmds start from here else: print ('ERROR: cannot find build command in .metrics.json') - exit(0) + exit(1) # Get the simulation command(s) for key in metrics_dict: diff --git a/buildspec.yml b/buildspec.yml index ecdfc2b0e0..475a5cf0d5 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -1,3 +1,8 @@ +# Copyright 2023, OpenHW Group +# SPDX-License-Identifier:Apache-2.0 WITH SHL-2.0 +# +# Build-specification for the aws.yml workflow. + version: 0.2 phases: @@ -26,5 +31,7 @@ phases: - export CV_SW_PREFIX=riscv32-corev-elf- - export CV_SW_MARCH=rv32imc_zicsr_zifencei - corev-openhw-gcc-centos7-20230905/bin/riscv32-corev-elf-gcc --version - - cd cv32e40p/sim/uvmt - - make test USE_ISS=0 SIMULATOR=vcs TEST=hello-world +# - cd cv32e40p/sim/uvmt +# - make test USE_ISS=0 SIMULATOR=vcs TEST=hello-world + - cd bin + - ./ci_check --batch --iss 0 --simulator vcs --core cv32e40p From 7edd4d04260ac37c3409b81ef997eaeee4d3c3a9 Mon Sep 17 00:00:00 2001 From: mike Date: Wed, 11 Oct 2023 16:01:14 -0400 Subject: [PATCH 18/18] Supress warnings (for now) --- bin/ci_check | 2 +- mk/uvmt/vcs.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/ci_check b/bin/ci_check index 21d4eacc17..cd9f6fbbe4 100755 --- a/bin/ci_check +++ b/bin/ci_check @@ -270,7 +270,7 @@ if not (prcmd): print ('Deleting your previously cloned RTL repo plus all previously generated files') ask_user() os.chdir(os.path.abspath(os.path.join(topdir, args.core.lower(), 'sim/uvmt'))) - os.system('make clean_all') + os.system('make clean_all SIMULATOR={}'.format(args.simulator)) os.chdir(os.path.join(topdir, '{}/sim/core'.format(args.core.lower()))) os.system('make clean_all') os.chdir(os.path.join(topdir, 'bin')) diff --git a/mk/uvmt/vcs.mk b/mk/uvmt/vcs.mk index 617d30389d..9996111dd7 100644 --- a/mk/uvmt/vcs.mk +++ b/mk/uvmt/vcs.mk @@ -58,6 +58,9 @@ VCS_COMP_FLAGS ?= -lca -sverilog \ $(SV_CMP_FLAGS) $(VCS_UVM_ARGS) $(VCS_TIMESCALE) \ -assert svaext -race=all -ignore unique_checks -full64 +# TODO: make this optional +VCS_COMP_FLAGS += -suppress + VCS_GUI ?= VCS_RUN_COV = -cm line+cond+tgl+fsm+branch+assert -cm_dir $(MAKECMDGOALS).vdb