Remove cv32a6_embedded configuration (openhwgroup#2246)

likeamahoney · Jun 14, 2024 · cb6211b · cb6211b
1 parent e26267b
commit cb6211b
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 2,135 deletions.
diff --git a/.gitlab-ci/expected_synth.yml b/.gitlab-ci/expected_synth.yml
@@ -1,4 +1,2 @@
-cv32a6_embedded:
-  gates: 110095
 cv32a65x:
   gates: 128497 
diff --git a/.gitlab-ci/scripts/report_benchmark.py b/.gitlab-ci/scripts/report_benchmark.py
@@ -18,7 +18,7 @@
 # Will fail if the number of cycles is different from this one
 valid_cycles = {
     'dhrystone': 217900,
-    'coremark': 665193,
+    'coremark': 686479,
 }
 
 for arg in sys.argv[1:]:

diff --git a/core/include/cv32a6_embedded_config_pkg.sv → .../cv32a6_embedded_config_pkg_deprecated.sv b/core/include/cv32a6_embedded_config_pkg.sv → .../cv32a6_embedded_config_pkg_deprecated.sv
diff --git a/util/user_config.py b/util/user_config.py
@@ -253,15 +253,9 @@ def write_file(path, lines):
 # Command line interface
 
 if __name__ == "__main__":
-    if len(sys.argv) == 2:
-        target = sys.argv[1]
-        config = get_config(f"core/include/{target}_config_pkg.sv")
-        for k, v in config.items():
-            print(f"{k} = {v}")
-    elif len(sys.argv) > 1:
-        base, changes = parse_derive_args(sys.argv[1:])
-
-        input_file = f"core/include/{base}_config_pkg.sv"
-        output_file = "core/include/gen_config_pkg.sv"
-
-        derive_config(input_file, output_file, changes)
+    base, changes = parse_derive_args(sys.argv[1:])
+
+    input_file = f"core/include/{base}_config_pkg.sv"
+    output_file = "core/include/gen_config_pkg.sv"
+
+    derive_config(input_file, output_file, changes)
diff --git a/verif/regress/coremark.sh b/verif/regress/coremark.sh
@@ -78,14 +78,14 @@ cflags=(
         -DNOPRINT
 )
 
-default_config="cv32a6_embedded"
+default_config="cv32a65x"
 isa="rv32imc_zba_zbb_zbc_zbs"
 
 set -x
 python3 cva6.py \
         --target hwconfig \
         --isa "$isa" \
-        --hwconfig_opts="$default_config +CVA6ConfigNrLoadPipeRegs=0" \
+        --hwconfig_opts="$default_config" \
         --iss="$DV_SIMULATORS" \
         --iss_yaml=cva6.yaml \
         --c_tests "$src0" \

diff --git a/verif/regress/smoke-gen_tests.sh b/verif/regress/smoke-gen_tests.sh
@@ -24,7 +24,7 @@ source ./verif/regress/install-spike.sh
 source verif/sim/setup-env.sh
 
 if ! [ -n "$DV_TARGET" ]; then
-  DV_TARGET=cv32a6_embedded
+  DV_TARGET=cv32a65x
 fi
 
 if ! [ -n "$DV_SIMULATORS" ]; then

diff --git a/verif/regress/smoke-tests.sh b/verif/regress/smoke-tests.sh
@@ -55,13 +55,6 @@ python3 cva6.py --target cv32a6_imac_sv32 --iss=$DV_SIMULATORS --iss_yaml=cva6.y
   --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc -I../tests/custom/env -I../tests/custom/common" $DV_OPTS
 make -C ../.. clean
 make clean_all
-python3 cva6.py --testlist=../tests/testlist_riscv-compliance-cv32a60x.yaml --test rv32i-I-ADD-01 --iss_yaml cva6.yaml --target cv32a6_embedded --iss=$DV_SIMULATORS $DV_OPTS
-python3 cva6.py --testlist=../tests/testlist_riscv-tests-cv32a60x-p.yaml --test rv32ui-p-add --iss_yaml cva6.yaml --target cv32a6_embedded --iss=$DV_SIMULATORS $DV_OPTS
-python3 cva6.py --testlist=../tests/testlist_riscv-arch-test-cv32a60x.yaml --test rv32im-cadd-01 --iss_yaml cva6.yaml --target cv32a6_embedded --iss=$DV_SIMULATORS $DV_OPTS  --linker=../tests/riscv-arch-test/riscv-target/spike/link.ld
-python3 cva6.py --target cv32a6_embedded --iss=$DV_SIMULATORS --iss_yaml=cva6.yaml --c_tests ../tests/custom/hello_world/hello_world.c --linker=../tests/custom/common/test.ld\
-  --gcc_opts="-static -mcmodel=medany -fvisibility=hidden -nostdlib -nostartfiles -g ../tests/custom/common/syscalls.c ../tests/custom/common/crt.S -lgcc -I../tests/custom/env -I../tests/custom/common" $DV_OPTS
-make -C ../.. clean
-make clean_all
 python3 cva6.py --testlist=../tests/testlist_riscv-compliance-cv32a60x.yaml --test rv32i-I-ADD-01 --iss_yaml cva6.yaml --target cv32a65x --iss=$DV_SIMULATORS $DV_OPTS
 python3 cva6.py --testlist=../tests/testlist_riscv-tests-cv32a60x-p.yaml --test rv32ui-p-add --iss_yaml cva6.yaml --target cv32a65x --iss=$DV_SIMULATORS $DV_OPTS
 python3 cva6.py --testlist=../tests/testlist_riscv-arch-test-cv32a60x.yaml --test rv32im-cadd-01 --iss_yaml cva6.yaml --target cv32a65x --iss=$DV_SIMULATORS $DV_OPTS  --linker=../tests/riscv-arch-test/riscv-target/spike/link.ld

diff --git a/verif/sim/cva6.py b/verif/sim/cva6.py
@@ -997,10 +997,6 @@ def load_config(args, cwd):
     elif args.target == "cv32a60x": # step1 configuration
       args.mabi = "ilp32"
       args.isa  = "rv32imac_zba_zbb_zbs_zbc"
-    elif args.target == "cv32a6_embedded":
-      args.mabi = "ilp32"
-      args.isa  = "rv32imc_zba_zbb_zbs_zbc"
-      args.priv  = "m"
     elif args.target == "cv32a65x":
       args.mabi = "ilp32"
       args.isa  = "rv32imc_zba_zbb_zbs_zbc"