[TEST] Remove CLIC, Re-enable RVH

pulp-platform · Nov 1, 2024 · f61c74d · f61c74d
1 parent 05ad43e
commit f61c74d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -92,7 +92,7 @@ packages:
       Git: https://github.com/pulp-platform/common_verification.git
     dependencies: []
   cva6:
-    revision: 5dfb8935db1bef2e7238b3025baf2d20b473784d
+    revision: 0148248d54fc4f56b760760fcaa58a7f9459e6fe
     version: null
     source:
       Git: https://github.com/pulp-platform/cva6.git

diff --git a/Bender.yml b/Bender.yml
@@ -22,7 +22,7 @@ dependencies:
   clint:                    { git: "https://github.com/pulp-platform/clint.git",                  version: 0.2.0  }
   common_cells:             { git: "https://github.com/pulp-platform/common_cells.git",           version: 1.33.0 }
   common_verification:      { git: "https://github.com/pulp-platform/common_verification.git",    version: 0.2.0  }
-  cva6:                     { git: "https://github.com/pulp-platform/cva6.git",                   rev: paulsc/v2-chs }
+  cva6:                     { git: "https://github.com/pulp-platform/cva6.git",                   rev: paulsc/v2-chs-dbg }
   iDMA:                     { git: "https://github.com/pulp-platform/iDMA.git",                   version: 0.5.1  }
   irq_router:               { git: "https://github.com/pulp-platform/irq_router.git",             version: 0.0.1-beta.1 }
   opentitan_peripherals:    { git: "https://github.com/pulp-platform/opentitan_peripherals.git",  version: 0.4.0  }

diff --git a/cheshire.mk b/cheshire.mk
@@ -14,7 +14,7 @@ CXX_PATH := $(shell which $(CXX))
 VLOG_ARGS ?= -suppress 2583 -suppress 13314 -timescale 1ns/1ps
 
 # Bender flags for CVA6; specify configuration target here.
-CHS_CVA6_BENDER_FLAGS ?= -t cv64a6_imafdchsclic_sv39_hpdcache -t cva6
+CHS_CVA6_BENDER_FLAGS ?= -t cv64a6_imafdc_sv39_hpdcache -t cva6
 
 # Define used paths (prefixed to avoid name conflicts)
 CHS_ROOT      ?= $(shell $(BENDER) path cheshire)

diff --git a/hw/cheshire_pkg.sv b/hw/cheshire_pkg.sv
@@ -508,8 +508,8 @@ package cheshire_pkg;
     ret.DebugEn               = 1;
     ret.RVSCLIC               = cfg.Clic;
     ret.CLICNumInterruptSrc   = NumCoreIrqs + NumIntIntrs + cfg.NumExtClicIntrs;
-    // TODO: Debuggig only; re-enable this
-    ret.RVH                   = 0;
+    // TODO: Debuggig only; remove this
+    ret.RVH                   = 1;
     // TODO: Should some things be removed from the main config?
     // TODO: Should other things be added to the main config?
     // TODO: Tune missing parameters of interest (esp. cache and interconnect) properly

diff --git a/hw/cheshire_soc.sv b/hw/cheshire_soc.sv
@@ -617,6 +617,7 @@ module cheshire_soc import cheshire_pkg::*; #(
       .ipi_i            ( msip[i] ),
       .time_irq_i       ( mtip[i] ),
       .debug_req_i      ( dbg_int_req[i] ),
+      /*
       .clic_irq_valid_i ( clic_irq_valid ),
       .clic_irq_id_i    ( clic_irq_id    ),
       .clic_irq_level_i ( clic_irq_level ),
@@ -625,6 +626,7 @@ module cheshire_soc import cheshire_pkg::*; #(
       .clic_irq_ready_o ( clic_irq_ready ),
       .clic_kill_req_i  ( clic_irq_kill_req ),
       .clic_kill_ack_o  ( clic_irq_kill_ack ),
+      */
       .rvfi_probes_o    ( ),
       .cvxif_req_o      ( ),
       .cvxif_resp_i     ( '0 ),