From 168292364ae3bd91b647fb7cba33e9364d365f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me?= <124148386+cathales@users.noreply.github.com>
Date: Tue, 7 Nov 2023 13:06:10 +0000
Subject: [PATCH] use embedded config to run coremark (#1602)

---
 .gitlab-ci/scripts/report_benchmark.py | 2 +-
 util/config_pkg_generator.py           | 2 +-
 verif/regress/coremark.sh              | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/scripts/report_benchmark.py b/.gitlab-ci/scripts/report_benchmark.py
index 544902b5e5..4f47c053e4 100644
--- 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': 670777,
+    'coremark': 733510,
 }
 
 for arg in sys.argv[1:]:
diff --git a/util/config_pkg_generator.py b/util/config_pkg_generator.py
index 53d11059ba..f008f35730 100644
--- a/util/config_pkg_generator.py
+++ b/util/config_pkg_generator.py
@@ -18,7 +18,7 @@ def setup_parser_config_generator():
   parser = argparse.ArgumentParser()
 
   parser.add_argument("--default_config", type=str, default="cv64a6_imafdc_sv39", required=True,
-                      choices=["cv32a6_imac_sv0","cv32a6_imac_sv32","cv32a6_imafc_sv32","cv64a6_imafdc_sv39","cv32a60x"],
+                      choices=["cv32a6_embedded","cv32a6_imac_sv0","cv32a6_imac_sv32","cv32a6_imafc_sv32","cv64a6_imafdc_sv39","cv32a60x"],
                       help="Default configuration is one of the 4 preexisting configuration: \
                             cv32a6_imac_sv0, cv32a6_imac_sv32, cv32a6_imafc_sv32, cv64a6_imafdc_sv39")
   parser.add_argument("--isa", type=str, default=None, required=True,
diff --git a/verif/regress/coremark.sh b/verif/regress/coremark.sh
index 492fd50c82..e528b8274f 100644
--- a/verif/regress/coremark.sh
+++ b/verif/regress/coremark.sh
@@ -69,10 +69,13 @@ cflags=(
         -DNOPRINT
 )
 
+default_config="cv32a6_embedded"
+isa="rv32imc_zba_zbb_zbc_zbs"
+
 set -x
 python3 cva6.py \
         --target hwconfig \
-        --hwconfig_opts="--default_config=cv32a6_imac_sv0 --isa=rv32imac --NrLoadPipeRegs=0" \
+        --hwconfig_opts="--default_config=$default_config --isa=$isa --NrLoadPipeRegs=0" \
         --iss="$DV_SIMULATORS" \
         --iss_yaml=cva6.yaml \
         --c_tests "$src0" \