fix: use NrCommitPorts and open tip_o in ariane_xilinx.sv

openhwgroup · Nov 19, 2024 · 5e21b9c · 5e21b9c
1 parent d0a9c58
commit 5e21b9c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/cva6_tip.sv b/core/cva6_tip.sv
@@ -60,7 +60,7 @@ module cva6_tip
 
   //  itype signals encoding
   generate
-    for (genvar i = 0; i < cva6_config_pkg::CVA6ConfigNrCommitPorts; i++) begin
+    for (genvar i = 0; i < CVA6Cfg.NrCommitPorts; i++) begin
       assign itype_signals[i][1] = commit_instr_i[i].valid && ex_commit_i.valid;
       assign itype_signals [i][2] = ( ipi_i || debug_req_i ); //time_irq_i (commit_ack_i[0] && !ex_commit_i.valid) &&
       assign itype_signals[i][3] = eret_i;
@@ -71,7 +71,7 @@ module cva6_tip
   endgenerate
 
   generate
-    for (genvar i = 0; i < cva6_config_pkg::CVA6ConfigNrCommitPorts; i++) begin
+    for (genvar i = 0; i < CVA6Cfg.NrCommitPorts; i++) begin
 
       encoder_16_4 ec_0 (
           .in(itype_signals[i]),
@@ -87,7 +87,7 @@ module cva6_tip
 
   //TIP signals
   always_comb begin
-    for (int i = 0; i < cva6_config_pkg::CVA6ConfigNrCommitPorts; i++) begin
+    for (int i = 0; i < CVA6Cfg.NrCommitPorts; i++) begin
       logic exception, mem_exception;
       exception = commit_instr_i[i].valid && ex_commit_i.valid;
       mem_exception = exception &&

diff --git a/corev_apu/fpga/src/ariane_xilinx.sv b/corev_apu/fpga/src/ariane_xilinx.sv
@@ -770,7 +770,8 @@ ariane #(
     .rvfi_probes_o( /* open */          ),
     .debug_req_i  ( debug_req_irq       ),
     .noc_req_o    ( axi_ariane_req      ),
-    .noc_resp_i   ( axi_ariane_resp     )
+    .noc_resp_i   ( axi_ariane_resp     ),
+    .tip_o        (/* open */)
 );
 
 `AXI_ASSIGN_FROM_REQ(slave[0], axi_ariane_req)