Merge pull request #47 from micprog/ibex_bump

Update ibex
pulp-platform · Feb 2, 2021 · f5e42d9 · f5e42d9
2 parents 84aa62f + b000e96
commit f5e42d9
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Added
 ### Changed
+- updated `ibex`
+
 ### Removed
 ### Fixed
 

diff --git a/ips_list.yml b/ips_list.yml
@@ -72,7 +72,7 @@ riscv:
   commit: pulpissimo-v3.4.0
   domain: [cluster, soc]
 ibex:
-  commit: e65a27e14dda7bb3b09cadc4e9232305fd451cec
+  commit: pulpissimo-v6.1.1
   group: lowRISC
   domain: [soc]
 scm:

diff --git a/rtl/fc/fc_subsystem.sv b/rtl/fc/fc_subsystem.sv
@@ -48,7 +48,7 @@ module fc_subsystem #(
 );
 
     localparam USE_IBEX   = CORE_TYPE == 1 || CORE_TYPE == 2;
-    localparam IBEX_RV32M = CORE_TYPE == 1;
+    localparam IBEX_RV32M = CORE_TYPE == 1 ? ibex_pkg::RV32MFast : ibex_pkg::RV32MNone;
     localparam IBEX_RV32E = CORE_TYPE == 2;
 
     // Interrupt signals
@@ -192,20 +192,25 @@ module fc_subsystem #(
 `else
     ibex_core #(
 `endif
-        .PMPEnable                ( 1'b0         ),
-        .MHPMCounterNum           ( 10           ),
-        .MHPMCounterWidth         ( 40           ),
-        .RV32E                    ( IBEX_RV32E   ),
-        .RV32M                    ( IBEX_RV32M   ),
-        .RV32B                    ( 1'b0         ),
-        .BranchTargetALU          ( 1'b0         ),
-        .WritebackStage           ( 1'b0         ),
-        .MultiplierImplementation ( "fast"       ),
-        .ICache                   ( 1'b0         ),
-        .DbgTriggerEn             ( 1'b1         ),
-        .SecureIbex               ( 1'b0         ),
-        .DmHaltAddr               ( 32'h1A110800 ),
-        .DmExceptionAddr          ( 32'h1A110808 )
+        .PMPEnable        ( 1'b0                ),
+        .PMPGranularity   ( 0                   ),
+        .PMPNumRegions    ( 4                   ),
+        .MHPMCounterNum   ( 10                  ),
+        .MHPMCounterWidth ( 40                  ),
+        .RV32E            ( IBEX_RV32E          ),
+        .RV32M            ( IBEX_RV32M          ),
+        .RV32B            ( ibex_pkg::RV32BNone ),
+        .RegFile          ( ibex_pkg::RegFileFF ),
+        .BranchTargetALU  ( 1'b0                ),
+        .WritebackStage   ( 1'b0                ),
+        .ICache           ( 1'b0                ),
+        .ICacheECC        ( 1'b0                ),
+        .BranchPredictor  ( 1'b0                ),
+        .DbgTriggerEn     ( 1'b1                ),
+        .DbgHwBreakNum    ( 1                   ),
+        .SecureIbex       ( 1'b0                ),
+        .DmHaltAddr       ( 32'h1A110800        ),
+        .DmExceptionAddr  ( 32'h1A110808        )
     ) lFC_CORE (
         .clk_i                 ( clk_i             ),
         .rst_ni                ( rst_ni            ),
@@ -244,9 +249,13 @@ module fc_subsystem #(
         .irq_x_ack_o           ( core_irq_ack      ),
         .irq_x_ack_id_o        ( core_irq_ack_id   ),
 
+        .external_perf_i       ( { {16 - N_EXT_PERF_COUNTERS {'0}}, perf_counters_int } ),
+
         .debug_req_i           ( debug_req_i       ),
 
         .fetch_enable_i        ( fetch_en_int      ),
+        .alert_minor_o         (                   ),
+        .alert_major_o         (                   ),
         .core_sleep_o          (                   )
     );
     end

diff --git a/rtl/pulp_soc/boot_rom.sv b/rtl/pulp_soc/boot_rom.sv
@@ -22,6 +22,8 @@ module boot_rom #(
      input logic             test_mode_i
     );
 
+    assign mem_slave.r_opc = 1'b0;
+
     //Perform TCDM handshaking for constant 1 cycle latency
     assign mem_slave.gnt     = mem_slave.req;
     always_ff @(posedge clk_i, negedge rst_ni) begin

diff --git a/src_files.yml b/src_files.yml
@@ -48,6 +48,9 @@ fc:
     rtl/fc/fc_subsystem.sv,
     rtl/fc/fc_hwpe.sv,
   ]
+  vlog_opts : [
+    -L ibex_lib,
+  ]
 
 components:
   incdirs: [