From 064b0a60bc18ab5c268b76d49ba21950622c600b Mon Sep 17 00:00:00 2001 From: David Harris Date: Sat, 4 May 2024 03:27:39 -0700 Subject: [PATCH] Name cleanups --- .gitignore | 8 ++-- Makefile | 106 ++++++++++++++++++++++++++--------------------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 51dda9031..3a7513d12 100644 --- a/.gitignore +++ b/.gitignore @@ -213,9 +213,10 @@ sim/vcs/ucli.key sim/vcs/verdi_config_file sim/*/testbench.vcd sim/questa/imperas.log -sim/questa/regression.log -sim/questa/regression_logs/* -sim/questa/regression_ucdbs/* +sim/questa/functcov.log +sim/questa/functcov_logs/* +sim/questa/functcov_ucdbs/* +sim/questa/functcov sim/questa/riscv.ucdb sim/questa/riscv.ucdb.log sim/questa/riscv.ucdb.summary.log @@ -233,3 +234,4 @@ examples/verilog/fulladder/verdi_config_file tests/functcov tests/functcov/* tests/functcov/*/* +sim/vcs/simprofile* diff --git a/Makefile b/Makefile index a94701b04..e930e7ed4 100644 --- a/Makefile +++ b/Makefile @@ -62,65 +62,63 @@ funcovreg: # test_name=riscv_arithmetic_basic_test -rvdv: - python3 ${WALLY}/addins/riscv-dv/run.py --test ${test_name} --target rv64gc --output tests/riscvdv --iterations 1 -si questa --iss spike --verbose --cov --seed 0 --steps gen,gcc_compile >> ${SIM}/questa/regression_logs/${test_name}.log 2>&1 -# python3 ${WALLY}/addins/riscv-dv/run.py --test ${test_name} --target rv64gc --output tests/riscvdv --iterations 1 -si questa --iss spike --verbose --cov --seed 0 --steps gcc_compile >> ${SIM}/questa/regression_logs/${test_name}.log 2>&1 -# python3 ${WALLY}/addins/riscv-dv/run.py --test ${test_name} --target rv64gc --output tests/riscvdv --iterations 1 -si questa --iss spike --verbose --cov --seed 0 --steps iss_sim >> ${SIM}/questa/regression_logs/${test_name}.log 2>&1 -# run-elf.bash --seed ${SIM}/questa/seed0.txt --verbose --elf ${WALLY}/tests/riscvdv/asm_test/${test_name}_0.o >> ${SIM}/questa/regression_logs/${test_name}.log 2>&1 - run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/riscv.ucdb --elf ${WALLY}/tests/riscvdv/asm_test/${test_name}_0.o >> ${SIM}/questa/regression_logs/${test_name}.log 2>&1 - cp ${SIM}/questa/riscv.ucdb ${SIM}/questa/regression_ucdbs/${test_name}.ucdb +riscvdv: + python3 ${WALLY}/addins/riscv-dv/run.py --test ${test_name} --target rv64gc --output tests/riscvdv --iterations 1 -si questa --iss spike --verbose --cov --seed 0 --steps gen,gcc_compile >> ${SIM}/questa/functcov_logs/${test_name}.log 2>&1 +# python3 ${WALLY}/addins/riscv-dv/run.py --test ${test_name} --target rv64gc --output tests/riscvdv --iterations 1 -si questa --iss spike --verbose --cov --seed 0 --steps gcc_compile >> ${SIM}/questa/functcov_logs/${test_name}.log 2>&1 +# python3 ${WALLY}/addins/riscv-dv/run.py --test ${test_name} --target rv64gc --output tests/riscvdv --iterations 1 -si questa --iss spike --verbose --cov --seed 0 --steps iss_sim >> ${SIM}/questa/functcov_logs/${test_name}.log 2>&1 +# run-elf.bash --seed ${SIM}/questa/seed0.txt --verbose --elf ${WALLY}/tests/riscvdv/asm_test/${test_name}_0.o >> ${SIM}/questa/functcov_logs/${test_name}.log 2>&1 + run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/riscv.ucdb --elf ${WALLY}/tests/riscvdv/asm_test/${test_name}_0.o >> ${SIM}/questa/functcov_logs/${test_name}.log 2>&1 + cp ${SIM}/questa/riscv.ucdb ${SIM}/questa/functcov_ucdbs/${test_name}.ucdb -rvdv_regression: - mkdir -p ${SIM}/questa/regression_logs - mkdir -p ${SIM}/questa/regression_ucdbs - cd ${SIM}/questa/regression_logs && rm -rf * - cd ${SIM}/questa/regression_ucdbs && rm -rf * - make rvdv test_name=riscv_arithmetic_basic_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_amo_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_ebreak_debug_mode_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_ebreak_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_floating_point_arithmetic_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_floating_point_mmu_stress_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_floating_point_rand_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_full_interrupt_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_hint_instr_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_illegal_instr_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_invalid_csr_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_jump_stress_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_loop_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_machine_mode_rand_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_mmu_stress_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_no_fence_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_non_compressed_instr_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_pmp_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_privileged_mode_rand_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_rand_instr_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_rand_jump_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_sfence_exception_test >> ${SIM}/questa/regression.log 2>&1 - make rvdv test_name=riscv_unaligned_load_store_test >> ${SIM}/questa/regression.log 2>&1 +riscvdv_functcov: + mkdir -p ${SIM}/questa/functcov_logs + mkdir -p ${SIM}/questa/functcov_ucdbs + cd ${SIM}/questa/functcov_logs && rm -rf * + cd ${SIM}/questa/functcov_ucdbs && rm -rf * + make riscvdv test_name=riscv_arithmetic_basic_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_amo_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_ebreak_debug_mode_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_ebreak_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_floating_point_arithmetic_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_floating_point_mmu_stress_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_floating_point_rand_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_full_interrupt_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_hint_instr_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_illegal_instr_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_invalid_csr_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_jump_stress_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_loop_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_machine_mode_rand_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_mmu_stress_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_no_fence_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_non_compressed_instr_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_pmp_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_privileged_mode_rand_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_rand_instr_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_rand_jump_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_sfence_exception_test >> ${SIM}/questa/functcov.log 2>&1 + make riscvdv test_name=riscv_unaligned_load_store_test >> ${SIM}/questa/functcov.log 2>&1 -rvdv_combine_coverage: - mkdir -p ${SIM}/questa/regcov - cd ${SIM}/questa/regcov && rm -rf * - run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/regcov/add.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-add.elf >> ${SIM}/questa/regression_logs/add.log 2>&1 - run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/regcov/and.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-and.elf >> ${SIM}/questa/regression_logs/add.log 2>&1 - run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/regcov/ori.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-ori.elf >> ${SIM}/questa/regression_logs/add.log 2>&1 +combine_functcov: + mkdir -p ${SIM}/questa/functcov + cd ${SIM}/questa/functcov && rm -rf * + run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/functcov/add.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-add.elf >> ${SIM}/questa/functcov_logs/add.log 2>&1 + run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/functcov/and.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-and.elf >> ${SIM}/questa/functcov_logs/add.log 2>&1 + run-elf-cov.bash --seed ${SIM}/questa/seed0.txt --verbose --coverdb ${SIM}/questa/functcov/ori.ucdb --elf ${WALLY}/tests/functcov/rv64/I/WALLY-COV-ori.elf >> ${SIM}/questa/functcov_logs/add.log 2>&1 - vcover merge ${SIM}/questa/regcov/regcov.ucdb ${SIM}/questa/regcov/*.ucdb -suppress 6854 -64 - # vcover merge ${SIM}/questa/regcov/regcov.ucdb ${SIM}/questa/regression_ucdbs/* -suppress 6854 -64 - vcover report -details -html ${SIM}/questa/regcov/regcov.ucdb - vcover report ${SIM}/questa/regcov/regcov.ucdb -details -cvg > ${SIM}/questa/regcov/regcov.ucdb.log - vcover report ${SIM}/questa/regcov/regcov.ucdb -testdetails -cvg > ${SIM}/questa/regcov/regcov.ucdb.testdetails.log -# vcover report ${SIM}/questa/regcov/regcov.ucdb -details -cvg -below 100 | egrep "Coverpoint|Covergroup|Cross" | grep -v Metric > ${SIM}/questa/regcov/regcov.ucdb.summary.log - vcover report ${SIM}/questa/regcov/regcov.ucdb -details -cvg | egrep "Coverpoint|Covergroup|Cross|TYPE" > ${SIM}/questa/regcov/regcov.ucdb.summary.log - grep "Total Coverage By Instance" ${SIM}/questa/regcov/regcov.ucdb.log + vcover merge ${SIM}/questa/functcov/functcov.ucdb ${SIM}/questa/functcov/*.ucdb ${SIM}/questa/functcov_ucdbs/* -suppress 6854 -64 + # vcover merge ${SIM}/questa/functcov/functcov.ucdb ${SIM}/questa/functcov_ucdbs/* -suppress 6854 -64 + vcover report -details -html ${SIM}/questa/functcov/functcov.ucdb + vcover report ${SIM}/questa/functcov/functcov.ucdb -details -cvg > ${SIM}/questa/functcov/functcov.log + vcover report ${SIM}/questa/functcov/functcov.ucdb -testdetails -cvg > ${SIM}/questa/functcov/functcov.testdetails.log +# vcover report ${SIM}/questa/functcov/functcov.ucdb -details -cvg -below 100 | egrep "Coverpoint|Covergroup|Cross" | grep -v Metric > ${SIM}/questa/functcov/functcov.ucdb.summary.log + vcover report ${SIM}/questa/functcov/functcov.ucdb -details -cvg | egrep "Coverpoint|Covergroup|Cross|TYPE" > ${SIM}/questa/functcov/functcov.summary.log + grep "Total Coverage By Instance" ${SIM}/questa/functcov/functcov.ucdb.log -remove_rvdv_artifacts: - rm ${SIM}/questa/riscv.ucdb ${SIM}/questa/regression.log covhtmlreport/ ${SIM}/questa/regression_logs/ ${SIM}/questa/regression_ucdbs/ ${SIM}/questa/regcov/ -rf +remove_functcov_artifacts: + rm ${SIM}/questa/riscv.ucdb ${SIM}/questa/functcov.log covhtmlreport/ ${SIM}/questa/functcov_logs/ ${SIM}/questa/functcov_ucdbs/ ${SIM}/questa/functcov/ -rf -collect_riscvdv_regression_coverage: remove_rvdv_artifacts rvdv_regression rvdv_combine_coverage -coverage: - regression-wally -coverage -fp +collect_functcov: remove_functcov_artifacts riscvdv_functcov combine_functcov benchmarks: make coremark