Skip to content

Commit 4660938

Browse files
SamuelRiedelSamuelRiedel
committed
[rv_core_ibex] Add missing rvfi ports
Signed-off-by: Samuel Riedel <sriedel@lowrisc.org>
1 parent 3e7d731 commit 4660938

4 files changed

Lines changed: 84 additions & 52 deletions

File tree

‎hw/ip_templates/rv_core_ibex/rtl/rv_core_ibex.sv.tpl‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ module ${module_instance_name}
237237
logic [ 3:0] rvfi_mem_wmask;
238238
logic [31:0] rvfi_mem_rdata;
239239
logic [31:0] rvfi_mem_wdata;
240+
logic rvfi_ext_expanded_insn_valid;
241+
logic [15:0] rvfi_ext_expanded_insn;
240242
`endif
241243

242244
import tlul_pkg::tl_h2d_t;
@@ -568,18 +570,22 @@ module ${module_instance_name}
568570
.rvfi_mem_rdata,
569571
.rvfi_mem_wdata,
570572
// Unused ports from the RVFI interface
571-
.rvfi_ext_pre_mip (),
572-
.rvfi_ext_post_mip (),
573-
.rvfi_ext_nmi (),
574-
.rvfi_ext_nmi_int (),
575-
.rvfi_ext_debug_req (),
576-
.rvfi_ext_debug_mode (),
577-
.rvfi_ext_rf_wr_suppress (),
578-
.rvfi_ext_mcycle (),
579-
.rvfi_ext_mhpmcounters (),
580-
.rvfi_ext_mhpmcountersh (),
581-
.rvfi_ext_ic_scr_key_valid(),
582-
.rvfi_ext_irq_valid (),
573+
.rvfi_ext_pre_mip (),
574+
.rvfi_ext_post_mip (),
575+
.rvfi_ext_nmi (),
576+
.rvfi_ext_nmi_int (),
577+
.rvfi_ext_debug_req (),
578+
.rvfi_ext_debug_mode (),
579+
.rvfi_ext_rf_wr_suppress (),
580+
.rvfi_ext_mcycle (),
581+
.rvfi_ext_minstret (),
582+
.rvfi_ext_mhpmcounters (),
583+
.rvfi_ext_mhpmcountersh (),
584+
.rvfi_ext_ic_scr_key_valid (),
585+
.rvfi_ext_irq_valid (),
586+
.rvfi_ext_expanded_insn_valid(),
587+
.rvfi_ext_expanded_insn (),
588+
.rvfi_ext_expanded_insn_last (),
583589
`endif
584590
// SEC_CM: FETCH.CTRL.LC_GATED
585591
.fetch_enable_i (fetch_enable),
@@ -836,7 +842,9 @@ module ${module_instance_name}
836842
.rvfi_mem_rmask,
837843
.rvfi_mem_wmask,
838844
.rvfi_mem_rdata,
839-
.rvfi_mem_wdata
845+
.rvfi_mem_wdata,
846+
.rvfi_ext_expanded_insn_valid,
847+
.rvfi_ext_expanded_insn
840848
);
841849
`endif
842850

‎hw/top_darjeeling/ip_autogen/rv_core_ibex/rtl/rv_core_ibex.sv‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ module rv_core_ibex
224224
logic [ 3:0] rvfi_mem_wmask;
225225
logic [31:0] rvfi_mem_rdata;
226226
logic [31:0] rvfi_mem_wdata;
227+
logic rvfi_ext_expanded_insn_valid;
228+
logic [15:0] rvfi_ext_expanded_insn;
227229
`endif
228230

229231
import tlul_pkg::tl_h2d_t;
@@ -555,18 +557,22 @@ module rv_core_ibex
555557
.rvfi_mem_rdata,
556558
.rvfi_mem_wdata,
557559
// Unused ports from the RVFI interface
558-
.rvfi_ext_pre_mip (),
559-
.rvfi_ext_post_mip (),
560-
.rvfi_ext_nmi (),
561-
.rvfi_ext_nmi_int (),
562-
.rvfi_ext_debug_req (),
563-
.rvfi_ext_debug_mode (),
564-
.rvfi_ext_rf_wr_suppress (),
565-
.rvfi_ext_mcycle (),
566-
.rvfi_ext_mhpmcounters (),
567-
.rvfi_ext_mhpmcountersh (),
568-
.rvfi_ext_ic_scr_key_valid(),
569-
.rvfi_ext_irq_valid (),
560+
.rvfi_ext_pre_mip (),
561+
.rvfi_ext_post_mip (),
562+
.rvfi_ext_nmi (),
563+
.rvfi_ext_nmi_int (),
564+
.rvfi_ext_debug_req (),
565+
.rvfi_ext_debug_mode (),
566+
.rvfi_ext_rf_wr_suppress (),
567+
.rvfi_ext_mcycle (),
568+
.rvfi_ext_minstret (),
569+
.rvfi_ext_mhpmcounters (),
570+
.rvfi_ext_mhpmcountersh (),
571+
.rvfi_ext_ic_scr_key_valid (),
572+
.rvfi_ext_irq_valid (),
573+
.rvfi_ext_expanded_insn_valid(),
574+
.rvfi_ext_expanded_insn (),
575+
.rvfi_ext_expanded_insn_last (),
570576
`endif
571577
// SEC_CM: FETCH.CTRL.LC_GATED
572578
.fetch_enable_i (fetch_enable),
@@ -823,7 +829,9 @@ module rv_core_ibex
823829
.rvfi_mem_rmask,
824830
.rvfi_mem_wmask,
825831
.rvfi_mem_rdata,
826-
.rvfi_mem_wdata
832+
.rvfi_mem_wdata,
833+
.rvfi_ext_expanded_insn_valid,
834+
.rvfi_ext_expanded_insn
827835
);
828836
`endif
829837

‎hw/top_earlgrey/ip_autogen/rv_core_ibex/rtl/rv_core_ibex.sv‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ module rv_core_ibex
224224
logic [ 3:0] rvfi_mem_wmask;
225225
logic [31:0] rvfi_mem_rdata;
226226
logic [31:0] rvfi_mem_wdata;
227+
logic rvfi_ext_expanded_insn_valid;
228+
logic [15:0] rvfi_ext_expanded_insn;
227229
`endif
228230

229231
import tlul_pkg::tl_h2d_t;
@@ -555,18 +557,22 @@ module rv_core_ibex
555557
.rvfi_mem_rdata,
556558
.rvfi_mem_wdata,
557559
// Unused ports from the RVFI interface
558-
.rvfi_ext_pre_mip (),
559-
.rvfi_ext_post_mip (),
560-
.rvfi_ext_nmi (),
561-
.rvfi_ext_nmi_int (),
562-
.rvfi_ext_debug_req (),
563-
.rvfi_ext_debug_mode (),
564-
.rvfi_ext_rf_wr_suppress (),
565-
.rvfi_ext_mcycle (),
566-
.rvfi_ext_mhpmcounters (),
567-
.rvfi_ext_mhpmcountersh (),
568-
.rvfi_ext_ic_scr_key_valid(),
569-
.rvfi_ext_irq_valid (),
560+
.rvfi_ext_pre_mip (),
561+
.rvfi_ext_post_mip (),
562+
.rvfi_ext_nmi (),
563+
.rvfi_ext_nmi_int (),
564+
.rvfi_ext_debug_req (),
565+
.rvfi_ext_debug_mode (),
566+
.rvfi_ext_rf_wr_suppress (),
567+
.rvfi_ext_mcycle (),
568+
.rvfi_ext_minstret (),
569+
.rvfi_ext_mhpmcounters (),
570+
.rvfi_ext_mhpmcountersh (),
571+
.rvfi_ext_ic_scr_key_valid (),
572+
.rvfi_ext_irq_valid (),
573+
.rvfi_ext_expanded_insn_valid(),
574+
.rvfi_ext_expanded_insn (),
575+
.rvfi_ext_expanded_insn_last (),
570576
`endif
571577
// SEC_CM: FETCH.CTRL.LC_GATED
572578
.fetch_enable_i (fetch_enable),
@@ -823,7 +829,9 @@ module rv_core_ibex
823829
.rvfi_mem_rmask,
824830
.rvfi_mem_wmask,
825831
.rvfi_mem_rdata,
826-
.rvfi_mem_wdata
832+
.rvfi_mem_wdata,
833+
.rvfi_ext_expanded_insn_valid,
834+
.rvfi_ext_expanded_insn
827835
);
828836
`endif
829837

‎hw/top_englishbreakfast/ip_autogen/rv_core_ibex/rtl/rv_core_ibex.sv‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ module rv_core_ibex
224224
logic [ 3:0] rvfi_mem_wmask;
225225
logic [31:0] rvfi_mem_rdata;
226226
logic [31:0] rvfi_mem_wdata;
227+
logic rvfi_ext_expanded_insn_valid;
228+
logic [15:0] rvfi_ext_expanded_insn;
227229
`endif
228230

229231
import tlul_pkg::tl_h2d_t;
@@ -555,18 +557,22 @@ module rv_core_ibex
555557
.rvfi_mem_rdata,
556558
.rvfi_mem_wdata,
557559
// Unused ports from the RVFI interface
558-
.rvfi_ext_pre_mip (),
559-
.rvfi_ext_post_mip (),
560-
.rvfi_ext_nmi (),
561-
.rvfi_ext_nmi_int (),
562-
.rvfi_ext_debug_req (),
563-
.rvfi_ext_debug_mode (),
564-
.rvfi_ext_rf_wr_suppress (),
565-
.rvfi_ext_mcycle (),
566-
.rvfi_ext_mhpmcounters (),
567-
.rvfi_ext_mhpmcountersh (),
568-
.rvfi_ext_ic_scr_key_valid(),
569-
.rvfi_ext_irq_valid (),
560+
.rvfi_ext_pre_mip (),
561+
.rvfi_ext_post_mip (),
562+
.rvfi_ext_nmi (),
563+
.rvfi_ext_nmi_int (),
564+
.rvfi_ext_debug_req (),
565+
.rvfi_ext_debug_mode (),
566+
.rvfi_ext_rf_wr_suppress (),
567+
.rvfi_ext_mcycle (),
568+
.rvfi_ext_minstret (),
569+
.rvfi_ext_mhpmcounters (),
570+
.rvfi_ext_mhpmcountersh (),
571+
.rvfi_ext_ic_scr_key_valid (),
572+
.rvfi_ext_irq_valid (),
573+
.rvfi_ext_expanded_insn_valid(),
574+
.rvfi_ext_expanded_insn (),
575+
.rvfi_ext_expanded_insn_last (),
570576
`endif
571577
// SEC_CM: FETCH.CTRL.LC_GATED
572578
.fetch_enable_i (fetch_enable),
@@ -823,7 +829,9 @@ module rv_core_ibex
823829
.rvfi_mem_rmask,
824830
.rvfi_mem_wmask,
825831
.rvfi_mem_rdata,
826-
.rvfi_mem_wdata
832+
.rvfi_mem_wdata,
833+
.rvfi_ext_expanded_insn_valid,
834+
.rvfi_ext_expanded_insn
827835
);
828836
`endif
829837

0 commit comments

Comments
 (0)