Merge pull request #2378 from pascalgouedo/cv32e40p/dev_dd_pgo_ci_check

Added configs and test in ci_check yaml file.
openhwgroup · Feb 26, 2024 · 8a91b22 · 8a91b22
2 parents cad5e5b + e189412
commit 8a91b22
Show file tree

Hide file tree

Showing 2 changed files with 102 additions and 13 deletions.
diff --git a/bin/templates/regress_sh.j2 b/bin/templates/regress_sh.j2
@@ -118,11 +118,10 @@ popd > /dev/null
 {% else %}
 {% set results_dir = t.simulator + '_results' %}
 {% endif %}
+{% set sim_log = t.simulator + '-' + test_log + '.log' %}
 {% if t.test_cfg is defined %}
-  {% set sim_log = t.simulator + '-' + test_log + '_' + t.test_cfg + '.log' %}
   {% set test_cfg_path = t.test_cfg %}
 {% else %}
-  {% set sim_log = t.simulator + '-' + test_log + '.log' %}
   {% set test_cfg_path = '' %}
 {% endif %}
 

diff --git a/cv32e40p/regress/cv32e40p_ci_check.yaml b/cv32e40p/regress/cv32e40p_ci_check.yaml
@@ -3,28 +3,88 @@ name: cv32e40p_ci_check
 description: Commit sanity for the cv32e40p
 
 builds:
-  corev-dv:
-    cmd: make comp_corev-dv
-    dir: cv32e40p/sim/uvmt
-
   uvmt_cv32e40p:
-    cmd: make comp
+    cmd: make comp comp_corev-dv
+    dir: cv32e40p/sim/uvmt
+
+  uvmt_cv32e40p_pulp:
+    cmd: make comp comp_corev-dv
+    cfg: pulp
+    dir: cv32e40p/sim/uvmt
+
+  uvmt_cv32e40p_pulp_fpu:
+    cmd: make comp comp_corev-dv
+    cfg: pulp_fpu
+    dir: cv32e40p/sim/uvmt
+
+  uvmt_cv32e40p_pulp_fpu_1cyclat:
+    cmd: make comp comp_corev-dv
+    cfg: pulp_fpu_1cyclat
+    dir: cv32e40p/sim/uvmt
+
+  uvmt_cv32e40p_pulp_fpu_2cyclat:
+    cmd: make comp comp_corev-dv
+    cfg: pulp_fpu_2cyclat
+    dir: cv32e40p/sim/uvmt
+
+  uvmt_cv32e40p_pulp_fpu_zfinx:
+    cmd: make comp comp_corev-dv
+    cfg: pulp_fpu_zfinx
+    dir: cv32e40p/sim/uvmt
+
+  uvmt_cv32e40p_pulp_fpu_zfinx_1cyclat:
+    cmd: make comp comp_corev-dv
+    cfg: pulp_fpu_zfinx_1cyclat
+    dir: cv32e40p/sim/uvmt
+
+  uvmt_cv32e40p_pulp_fpu_zfinx_2cyclat:
+    cmd: make comp comp_corev-dv
+    cfg: pulp_fpu_zfinx_2cyclat
     dir: cv32e40p/sim/uvmt
 
 tests:
   hello-world:
-    build: uvmt_cv32e40p
+    builds:
+      - uvmt_cv32e40p
+      - uvmt_cv32e40p_pulp
+      - uvmt_cv32e40p_pulp_fpu
+      - uvmt_cv32e40p_pulp_fpu_1cyclat
+      - uvmt_cv32e40p_pulp_fpu_2cyclat
+      - uvmt_cv32e40p_pulp_fpu_zfinx
+      - uvmt_cv32e40p_pulp_fpu_zfinx_1cyclat
+      - uvmt_cv32e40p_pulp_fpu_zfinx_2cyclat
     description: UVM Hello World Test
     dir: cv32e40p/sim/uvmt
-    cmd: make hello-world
     cmd: make test COREV=YES TEST=hello-world
-    
+
   interrupt_test:
-    build: uvmt_cv32e40p
+    builds:
+      - uvmt_cv32e40p
+      - uvmt_cv32e40p_pulp
+    description: Interrupt directed test  
+    dir: cv32e40p/sim/uvmt
+    cmd: make test COREV=YES TEST=interrupt_test
+
+  interrupt_test:
+    builds:
+      - uvmt_cv32e40p_pulp_fpu
+      - uvmt_cv32e40p_pulp_fpu_1cyclat
+      - uvmt_cv32e40p_pulp_fpu_2cyclat
+    description: Interrupt directed test  
+    dir: cv32e40p/sim/uvmt
+    cmd: make test COREV=YES TEST=interrupt_test
+    test_cfg: floating_pt_instr_en
+
+  interrupt_test:
+    builds:
+      - uvmt_cv32e40p_pulp_fpu_zfinx
+      - uvmt_cv32e40p_pulp_fpu_zfinx_1cyclat
+      - uvmt_cv32e40p_pulp_fpu_zfinx_2cyclat
     description: Interrupt directed test  
     dir: cv32e40p/sim/uvmt
     cmd: make test COREV=YES TEST=interrupt_test
-
+    test_cfg: floating_pt_zfinx_instr_en
+
   corev_rand_interrupt:
     build: uvmt_cv32e40p
     description: Interrupt random test
@@ -38,7 +98,9 @@ tests:
     cmd: make test COREV=YES TEST=illegal
 
   debug_test:
-    build: uvmt_cv32e40p
+    builds:
+      - uvmt_cv32e40p
+      - uvmt_cv32e40p_pulp
     dir: cv32e40p/sim/uvmt
     cmd: make test COREV=YES TEST=debug_test
 
@@ -75,3 +137,31 @@ tests:
     cmd: make gen_corev-dv test COREV=YES TEST=corev_rand_jump_stress_test
     num: 2
 
+  corev_rand_fp_instr_sanity_test:
+    builds:
+      - uvmt_cv32e40p_pulp_fpu
+      - uvmt_cv32e40p_pulp_fpu_1cyclat
+      - uvmt_cv32e40p_pulp_fpu_2cyclat
+    dir: cv32e40p/sim/uvmt
+    cmd: make gen_corev-dv test TEST=corev_rand_fp_instr_sanity_test
+    test_cfg: floating_pt_instr_en
+
+  corev_rand_fp_instr_sanity_test:
+    builds:
+      - uvmt_cv32e40p_pulp_fpu_zfinx
+      - uvmt_cv32e40p_pulp_fpu_zfinx_1cyclat
+      - uvmt_cv32e40p_pulp_fpu_zfinx_2cyclat
+    dir: cv32e40p/sim/uvmt
+    cmd: make gen_corev-dv test TEST=corev_rand_fp_instr_sanity_test
+    test_cfg: floating_pt_zfinx_instr_en
+
+  corev_rand_pulp_instr_test:
+    build: uvmt_cv32e40p_pulp
+    dir: cv32e40p/sim/uvmt
+    cmd: make gen_corev-dv test COREV=YES TEST=corev_rand_pulp_instr_test
+
+  corev_rand_pulp_hwloop_test:
+    build: uvmt_cv32e40p_pulp
+    dir: cv32e40p/sim/uvmt
+    cmd: make gen_corev-dv test COREV=YES TEST=corev_rand_pulp_hwloop_test
+