mirror of
https://github.com/openhwgroup/cva6.git
synced 2025-04-19 03:44:46 -04:00
ci: Consolidate tests
The tests have been spread to many smaller tests previously to avoid CI timeouts. With memory preloading the overhead of setting up the tests is dominating so we merge the tests again. Also remove `rv64ui-v-fence_i` from test list as it is currently failing. Signed-off-by: Florian Zaruba <florian@openhwgroup.org>
This commit is contained in:
Florian Zaruba
Florian Zaruba
parent
3a13ae0333
commit
8de6e35288
3 changed files with 14 additions and 140 deletions
120
.travis.yml
120
.travis.yml
|
|
@ -80,41 +80,11 @@ jobs:
|
|||
- make -j${NUM_JOBS} run-benchmarks-verilator defines=WB_DCACHE
|
||||
|
||||
# asm tests
|
||||
# rv64ui-v-* tests
|
||||
- stage: test
|
||||
name: run asm tests1 (Write-Back Cache)
|
||||
name: run asm tests (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests1-verilator defines=WB_DCACHE
|
||||
|
||||
- stage: test
|
||||
name: run asm tests2 (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests2-verilator defines=WB_DCACHE
|
||||
# rv64ui-p-* tests
|
||||
- stage: test
|
||||
name: run asm tests3 (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests3-verilator defines=WB_DCACHE
|
||||
- stage: test
|
||||
name: run asm tests4 (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests4-verilator defines=WB_DCACHE
|
||||
# rv64mi-p-* tests
|
||||
- stage: test
|
||||
name: run asm tests5 (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests5-verilator defines=WB_DCACHE
|
||||
# rv64-* other tests
|
||||
- stage: test
|
||||
name: run asm tests6 (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests6-verilator defines=WB_DCACHE
|
||||
- make -j${NUM_JOBS} run-asm-tests-verilator defines=WB_DCACHE
|
||||
|
||||
# rv64um-*-* tests
|
||||
- stage: test
|
||||
|
|
@ -123,38 +93,19 @@ jobs:
|
|||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-mul-verilator defines=WB_DCACHE
|
||||
|
||||
# rv64ud-*-* tests
|
||||
- stage: test
|
||||
name: run fp64 tests (Write-Back Cache)
|
||||
name: run fp tests (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-fp-d-verilator defines=WB_DCACHE
|
||||
|
||||
# rv64uf-*-* tests
|
||||
- stage: test
|
||||
name: run fp32 tests (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-fp-f-verilator defines=WB_DCACHE
|
||||
- make -j${NUM_JOBS} run-fp-verilator defines=WB_DCACHE
|
||||
|
||||
# amo tests
|
||||
# rv64ua-v-* tests
|
||||
- stage: test
|
||||
name: run amo tests1 (Write-Back Cache)
|
||||
name: run amo tests (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- travis_wait 60 make -j${NUM_JOBS} run-amo-tests1-verilator defines=WB_DCACHE
|
||||
- stage: test
|
||||
name: run amo tests2 (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- travis_wait 60 make -j${NUM_JOBS} run-amo-tests2-verilator defines=WB_DCACHE
|
||||
# rv64ua-p-* tests
|
||||
- stage: test
|
||||
name: run amo tests3 (Write-Back Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-amo-tests3-verilator defines=WB_DCACHE
|
||||
- travis_wait 60 make -j${NUM_JOBS} run-amo-verilator defines=WB_DCACHE
|
||||
|
||||
- stage: test
|
||||
name: run riscv benchmarks (Write-through Cache)
|
||||
|
|
@ -165,39 +116,10 @@ jobs:
|
|||
# asm tests
|
||||
# rv64ui-v-* tests
|
||||
- stage: test
|
||||
name: run asm tests1 (Write-through Cache)
|
||||
name: run asm tests (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests1-verilator defines=WT_DCACHE
|
||||
|
||||
- stage: test
|
||||
name: run asm tests2 (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests2-verilator defines=WT_DCACHE
|
||||
# rv64ui-p-* tests
|
||||
- stage: test
|
||||
name: run asm tests3 (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests3-verilator defines=WT_DCACHE
|
||||
- stage: test
|
||||
name: run asm tests4 (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests4-verilator defines=WT_DCACHE
|
||||
# rv64mi-p-* tests
|
||||
- stage: test
|
||||
name: run asm tests5 (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests5-verilator defines=WT_DCACHE
|
||||
# rv64-* other tests
|
||||
- stage: test
|
||||
name: run asm tests6 (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-asm-tests6-verilator defines=WT_DCACHE
|
||||
- make -j${NUM_JOBS} run-asm-tests-verilator defines=WT_DCACHE
|
||||
|
||||
# rv64um-*-* tests
|
||||
- stage: test
|
||||
|
|
@ -208,36 +130,18 @@ jobs:
|
|||
|
||||
# rv64ud-*-* tests
|
||||
- stage: test
|
||||
name: run fp64 tests (Write-through Cache)
|
||||
name: run fp tests (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-fp-d-verilator defines=WT_DCACHE
|
||||
|
||||
# rv64uf-*-* tests
|
||||
- stage: test
|
||||
name: run fp32 tests (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-fp-f-verilator defines=WT_DCACHE
|
||||
- make -j${NUM_JOBS} run-fp-verilator defines=WT_DCACHE
|
||||
|
||||
# amo tests
|
||||
# rv64ua-v-* tests
|
||||
- stage: test
|
||||
name: run amo tests1 (Write-through Cache)
|
||||
name: run amo tests (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-amo-tests1-verilator defines=WT_DCACHE
|
||||
- stage: test
|
||||
name: run amo tests2 (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-amo-tests2-verilator defines=WT_DCACHE
|
||||
# rv64ua-p-* tests
|
||||
- stage: test
|
||||
name: run amo tests3 (Write-through Cache)
|
||||
script:
|
||||
- ci/build-riscv-tests.sh
|
||||
- make -j${NUM_JOBS} run-amo-tests3-verilator defines=WT_DCACHE
|
||||
- make -j${NUM_JOBS} run-amo-verilator defines=WT_DCACHE
|
||||
|
||||
# extra time during long builds
|
||||
install: travis_wait
|
||||
|
|
|
|||
33
Makefile
33
Makefile
|
|
@ -488,41 +488,12 @@ $(addsuffix -verilator,$(riscv-fp-tests)): verilate
|
|||
$(addsuffix -verilator,$(riscv-benchmarks)): verilate
|
||||
$(ver-library)/Variane_testharness $(riscv-benchmarks-dir)/$(subst -verilator,,$@)
|
||||
|
||||
run-asm-tests-verilator: $(addsuffix -verilator, $(riscv-asm-tests)) $(addsuffix -verilator, $(riscv-amo-tests)) $(addsuffix -verilator, $(run-mul-verilator)) $(addsuffix -verilator, $(riscv-fp-tests))
|
||||
run-all-tests-verilator: $(addsuffix -verilator, $(riscv-asm-tests)) $(addsuffix -verilator, $(riscv-amo-tests)) $(addsuffix -verilator, $(run-mul-verilator)) $(addsuffix -verilator, $(riscv-fp-tests))
|
||||
|
||||
# split into smaller travis jobs (otherwise they will time out)
|
||||
riscv-asm-rv64ui-v := $(filter rv64ui-v-%, $(riscv-asm-tests))
|
||||
|
||||
riscv-asm-rv64ui-p := $(filter rv64ui-p-%, $(riscv-asm-tests))
|
||||
|
||||
riscv-asm-rv64mi-p := $(filter rv64mi-p-%, $(riscv-asm-tests))
|
||||
|
||||
riscv-asm-rest := $(filter-out $(riscv-asm-rv64ui-v) $(riscv-asm-rv64ui-p) $(riscv-asm-rv64mi-p), $(riscv-asm-tests))
|
||||
|
||||
run-asm-tests1-verilator: $(addsuffix -verilator, $(filter rv64ui-v-a% rv64ui-v-b%, $(riscv-asm-rv64ui-v)))
|
||||
|
||||
run-asm-tests2-verilator: $(addsuffix -verilator, $(filter-out rv64ui-v-a% rv64ui-v-b%, $(riscv-asm-rv64ui-v)))
|
||||
|
||||
run-asm-tests3-verilator: $(addsuffix -verilator, $(filter rv64ui-p-a% rv64ui-p-b%, $(riscv-asm-rv64ui-p)))
|
||||
|
||||
run-asm-tests4-verilator: $(addsuffix -verilator, $(filter-out rv64ui-p-a% rv64ui-p-b%, $(riscv-asm-rv64ui-p)))
|
||||
|
||||
run-asm-tests5-verilator: $(addsuffix -verilator, $(riscv-asm-rv64mi-p))
|
||||
|
||||
run-asm-tests6-verilator: $(addsuffix -verilator, $(riscv-asm-rest))
|
||||
run-asm-tests-verilator: $(addsuffix -verilator, $(riscv-asm-tests))
|
||||
|
||||
run-amo-verilator: $(addsuffix -verilator, $(riscv-amo-tests))
|
||||
|
||||
riscv-amo-rv64ua-v := $(filter rv64ua-v-%, $(riscv-amo-tests))
|
||||
|
||||
riscv-amo-rv64ua-p := $(filter rv64ua-p-%, $(riscv-amo-tests))
|
||||
|
||||
run-amo-tests1-verilator: $(addsuffix -verilator, $(filter rv64ua-v-amom%, $(riscv-amo-rv64ua-v)))
|
||||
|
||||
run-amo-tests2-verilator: $(addsuffix -verilator, $(filter-out rv64ua-v-amom%, $(riscv-amo-rv64ua-v)))
|
||||
|
||||
run-amo-tests3-verilator: $(addsuffix -verilator, $(riscv-amo-rv64ua-p))
|
||||
|
||||
run-mul-verilator: $(addsuffix -verilator, $(riscv-mul-tests))
|
||||
|
||||
run-fp-verilator: $(addsuffix -verilator, $(riscv-fp-tests))
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ rv64ui-v-bgeu
|
|||
rv64ui-v-blt
|
||||
rv64ui-v-bltu
|
||||
rv64ui-v-bne
|
||||
rv64ui-v-fence_i
|
||||
rv64ui-v-jal
|
||||
rv64ui-v-jalr
|
||||
rv64ui-v-lb
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue