treewide: Replace snitch_icache with cluster_icache dependency (#112

)
pulp-platform · Mar 18, 2024 · 5eb17af · 5eb17af
1 parent 9c62c2e
commit 5eb17af
Show file tree

Hide file tree

Showing 16 changed files with 5 additions and 2,471 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -6,6 +6,5 @@
 
 hw/snitch_cluster @paulsc96 @lucabertaccini
 hw/snitch_dma @paulsc96 @thommythomaso
-hw/snitch_icache @paulsc96 @SamuelRiedel
 
 sw @colluca @fischeti @viv-eth
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -68,7 +68,6 @@ snitch-ip-tests:
       - IP:
           - mem_interface
           - snitch_cluster
-          - snitch_icache
           - tcdm_interface
   script:
     - cd hw/$IP

diff --git a/Bender.yml b/Bender.yml
@@ -26,6 +26,7 @@ dependencies:
   register_interface: { git: https://github.com/pulp-platform/register_interface, version:  0.4.2   }
   tech_cells_generic: { git: https://github.com/pulp-platform/tech_cells_generic, version:  0.2.11  }
   riscv-dbg:          { git: https://github.com/pulp-platform/riscv-dbg,          version:  0.8.0   }
+  cluster_icache:     { git: https://github.com/pulp-platform/cluster_icache.git, version:  0.1.0   }
 
 vendor_package:
   - name: musl
@@ -197,23 +198,6 @@ sources:
       # Level 2:
       - hw/snitch_dma/src/axi_dma_tc_snitch_fe.sv
 
-  # snitch_icache
-  - files:
-      # Level 0
-      - hw/snitch_icache/src/snitch_icache_pkg.sv
-      # Level 1
-      - hw/snitch_icache/src/snitch_icache_l0.sv
-      - hw/snitch_icache/src/snitch_icache_refill.sv
-      - hw/snitch_icache/src/snitch_icache_lfsr.sv
-      - hw/snitch_icache/src/snitch_icache_lookup.sv
-      # Level 2
-      - hw/snitch_icache/src/snitch_icache_handler.sv
-      # Level 3
-      - hw/snitch_icache/src/snitch_icache.sv
-      - target: test
-        files:
-          - hw/snitch_icache/test/snitch_icache_l0_tb.sv
-
   # snitch_ipu
   - files:
       # Level 0

diff --git a/hw/snitch_cluster/src/snitch_hive.sv b/hw/snitch_cluster/src/snitch_hive.sv
@@ -92,7 +92,10 @@ module snitch_hive #(
     .FETCH_DW           ( 32               ),
     .FILL_AW            ( AddrWidth        ),
     .FILL_DW            ( WideDataWidth    ),
-    .EARLY_LATCH        ( 0               ),
+    .SERIAL_LOOKUP      ( 0                ),
+    .L1_TAG_SCM         ( 0                ),
+    .NUM_AXI_OUTSTANDING( 2                ),
+    .EARLY_LATCH        ( 0                ),
     .L0_EARLY_TAG_WIDTH ( snitch_pkg::PageShift - $clog2(ICacheLineWidth/8) ),
     .ISO_CROSSING       ( IsoCrossing     ),
     .sram_cfg_tag_t     ( sram_cfg_t ),

diff --git a/hw/snitch_icache/.gitignore b/hw/snitch_icache/.gitignore
diff --git a/hw/snitch_icache/doc/index.md b/hw/snitch_icache/doc/index.md