clean-up

remove unused traced_instr_pkg.sv file remove rvfi_pkg.sv file remove rvfi_port_t remove NR_COMMIT_PORTS remove RVFI_PORT Signed-off-by: Jean-Roch Coulon <[email protected]>
openhwgroup · Jul 18, 2023 · dc3fdc9 · dc3fdc9
1 parent ad884cb
commit dc3fdc9
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 172 deletions.
diff --git a/Bender.yml b/Bender.yml
@@ -25,7 +25,6 @@ sources:
         files:
           - core/include/cv64a6_imafdcv_sv39_config_pkg.sv
           - core/include/riscv_pkg.sv
-          - common/local/rvfi/rvfi_pkg.sv
           - core/include/ariane_dm_pkg.sv
           - core/include/ariane_pkg.sv
           - core/mmu_sv39/tlb.sv
@@ -37,7 +36,6 @@ sources:
         files:
           - core/include/cv64a6_imafdc_sv39_config_pkg.sv
           - core/include/riscv_pkg.sv
-          - common/local/rvfi/rvfi_pkg.sv
           - core/include/ariane_dm_pkg.sv
           - core/include/ariane_pkg.sv
           - core/mmu_sv39/tlb.sv
@@ -49,7 +47,6 @@ sources:
         files:
           - core/include/cv32a6_imac_sv0_config_pkg.sv
           - core/include/riscv_pkg.sv
-          - common/local/rvfi/rvfi_pkg.sv
           - core/include/ariane_dm_pkg.sv
           - core/include/ariane_pkg.sv
           - core/mmu_sv32/cva6_tlb_sv32.sv
@@ -61,7 +58,6 @@ sources:
         files:
           - core/include/cv32a6_imac_sv32_config_pkg.sv
           - core/include/riscv_pkg.sv
-          - common/local/rvfi/rvfi_pkg.sv
           - core/include/ariane_dm_pkg.sv
           - core/include/ariane_pkg.sv
           - core/mmu_sv32/cva6_tlb_sv32.sv

diff --git a/common/local/rvfi/rvfi_pkg.sv b/common/local/rvfi/rvfi_pkg.sv
diff --git a/config_pkg_generator.py b/config_pkg_generator.py
@@ -154,7 +154,6 @@ def setup_parser_config_generator():
   "PerfCounterEn": "CVA6ConfigPerfCounterEn",
   "DcacheType": "CVA6ConfigDcacheType",
   "MmuPresent": "CVA6ConfigMmuPresent",
-  "RvfiTrace": "RVFI_PORT",
   # Ignored parameters
   "ignored": "CVA6ConfigRvfiTrace",
 }

diff --git a/core/Flist.cva6 b/core/Flist.cva6
@@ -57,7 +57,6 @@ ${CVA6_REPO_DIR}/vendor/openhwgroup/cvfpu/src/fpu_div_sqrt_mvp/hdl/preprocess_mv
 
 ${CVA6_REPO_DIR}/core/include/${TARGET_CFG}_config_pkg.sv
 ${CVA6_REPO_DIR}/core/include/riscv_pkg.sv
-${CVA6_REPO_DIR}/common/local/rvfi/rvfi_pkg.sv
 ${CVA6_REPO_DIR}/core/include/ariane_dm_pkg.sv
 // Note: depends on fpnew_pkg, above
 ${CVA6_REPO_DIR}/core/include/ariane_pkg.sv

diff --git a/core/Flist.cva6_gate b/core/Flist.cva6_gate
@@ -10,7 +10,6 @@
 
 ${CVA6_REPO_DIR}/core/include/${TARGET_CFG}_config_pkg.sv
 ${CVA6_REPO_DIR}/core/include/riscv_pkg.sv
-${CVA6_REPO_DIR}/common/local/rvfi/rvfi_pkg.sv
 ${CVA6_REPO_DIR}/core/include/ariane_dm_pkg.sv
 ${CVA6_REPO_DIR}/core/include/ariane_pkg.sv
 // TODO: ariane_axi_pkg is dependent on this.

diff --git a/core/cva6.sv b/core/cva6.sv
@@ -41,8 +41,8 @@ module cva6 import ariane_pkg::*; #(
     logic [ariane_pkg::NRET*(riscv::XLEN/8)-1:0]  mem_rmask;
     logic [ariane_pkg::NRET*(riscv::XLEN/8)-1:0]  mem_wmask;
     logic [ariane_pkg::NRET*riscv::XLEN-1:0]      mem_rdata;
-    logic [ariane_pkg::NRET*riscv::XLEN-1:0]      mem_wdata; },
-  parameter type rvfi_port_t = rvfi_instr_t [NrCommitPorts-1:0],
+    logic [ariane_pkg::NRET*riscv::XLEN-1:0]      mem_wdata;
+  },
   //
   parameter ariane_pkg::ariane_cfg_t ArianeCfg     = ariane_pkg::ArianeDefaultConfig,
   parameter type cvxif_req_t  = cvxif_pkg::cvxif_req_t,
@@ -69,7 +69,7 @@ module cva6 import ariane_pkg::*; #(
   input  logic                         debug_req_i,  // debug request (async)
   // RISC-V formal interface port (`rvfi`):
   // Can be left open when formal tracing is not needed.
-  output rvfi_port_t                   rvfi_o,
+  output rvfi_instr_t [NrCommitPorts-1:0] rvfi_o,
   output cvxif_req_t                   cvxif_req_o,
   input  cvxif_resp_t                  cvxif_resp_i,
   // L15 (memory side)

diff --git a/core/include/ariane_pkg.sv b/core/include/ariane_pkg.sv
@@ -146,7 +146,6 @@ package ariane_pkg;
                                                       // to uniquely identify the entry in the scoreboard
     localparam ASID_WIDTH    = (riscv::XLEN == 64) ? 16 : 1;
     localparam BITS_SATURATION_COUNTER = 2;
-    localparam NR_COMMIT_PORTS = cva6_config_pkg::CVA6ConfigNrCommitPorts;
 
     localparam ENABLE_RENAME = cva6_config_pkg::CVA6ConfigRenameEn;
 
@@ -690,7 +689,6 @@ package ariane_pkg;
     // ---------------
 
     localparam RVFI = cva6_config_pkg::CVA6ConfigRvfiTrace;
-    typedef rvfi_pkg::rvfi_instr_t [NR_COMMIT_PORTS-1:0] rvfi_port_t;
 
     typedef struct packed {
         logic [riscv::VLEN-1:0]   pc;            // PC of instruction

diff --git a/core/include/cv32a60x_config_pkg.sv b/core/include/cv32a60x_config_pkg.sv
@@ -74,13 +74,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 1;
 
-    `define RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/core/include/cv32a6_embedded_config_pkg.sv b/core/include/cv32a6_embedded_config_pkg.sv
@@ -73,13 +73,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 0;
 
-    `define RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/core/include/cv32a6_ima_sv32_fpga_config_pkg.sv b/core/include/cv32a6_ima_sv32_fpga_config_pkg.sv
@@ -74,13 +74,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 1;
 
-    `undef RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/core/include/cv32a6_imac_sv0_config_pkg.sv b/core/include/cv32a6_imac_sv0_config_pkg.sv
@@ -74,13 +74,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 1;
 
-    `define RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/core/include/cv32a6_imac_sv32_config_pkg.sv b/core/include/cv32a6_imac_sv32_config_pkg.sv
@@ -74,13 +74,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 1;
 
-    `define RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/core/include/cv32a6_imafc_sv32_config_pkg.sv b/core/include/cv32a6_imafc_sv32_config_pkg.sv
@@ -74,13 +74,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 1;
 
-    `define RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/core/include/cv64a6_imafdc_sv39_config_pkg.sv b/core/include/cv64a6_imafdc_sv39_config_pkg.sv
@@ -74,13 +74,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 1;
 
-    `define RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/core/include/cv64a6_imafdc_sv39_openpiton_config_pkg.sv b/core/include/cv64a6_imafdc_sv39_openpiton_config_pkg.sv
@@ -74,13 +74,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 1;
 
-    `undef RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/core/include/cv64a6_imafdcv_sv39_config_pkg.sv b/core/include/cv64a6_imafdcv_sv39_config_pkg.sv
@@ -74,13 +74,6 @@ package cva6_config_pkg;
 
     localparam CVA6ConfigMmuPresent = 1;
 
-    `define RVFI_PORT
-
-    // Do not modify
-    `ifdef RVFI_PORT
-       localparam CVA6ConfigRvfiTrace = 1;
-    `else
-       localparam CVA6ConfigRvfiTrace = 0;
-    `endif
+    localparam CVA6ConfigRvfiTrace = 1;
 
 endpackage
diff --git a/corev_apu/fpga/src/ariane_xilinx.sv b/corev_apu/fpga/src/ariane_xilinx.sv
@@ -12,6 +12,7 @@
 // Author: Florian Zaruba <[email protected]>
 
 module ariane_xilinx (
+// WARNING: Do not define input parameters. This causes the FPGA build to fail.
 `ifdef GENESYSII
   input  logic         sys_clk_p   ,
   input  logic         sys_clk_n   ,
@@ -159,7 +160,6 @@ localparam int unsigned NrCommitPorts = cva6_config_pkg::CVA6ConfigNrCommitPorts
 // RVFI
 localparam int unsigned IsRVFI = 0;
 localparam type rvfi_instr_t = logic;
-localparam type rvfi_port_t = logic;
 
 
 // 24 MByte in 8 byte words
@@ -710,7 +710,6 @@ ariane #(
     .NrCommitPorts ( NrCommitPorts ),
     .IsRVFI ( IsRVFI ),
     .rvfi_instr_t ( rvfi_instr_t ),
-    .rvfi_port_t ( rvfi_port_t ),
     .ArianeCfg ( ariane_soc::ArianeSocCfg )
 ) i_ariane (
     .clk_i        ( clk                 ),

diff --git a/corev_apu/include/traced_instr_pkg.sv b/corev_apu/include/traced_instr_pkg.sv
diff --git a/corev_apu/src/ariane.sv b/corev_apu/src/ariane.sv
@@ -19,7 +19,6 @@ module ariane import ariane_pkg::*; #(
   // RVFI
   parameter int unsigned IsRVFI = 0,
   parameter type rvfi_instr_t = logic,
-  parameter type rvfi_port_t = logic,
   //
   parameter ariane_pkg::ariane_cfg_t ArianeCfg     = ariane_pkg::ArianeDefaultConfig,
   parameter int unsigned AxiAddrWidth = ariane_axi::AddrWidth,
@@ -43,11 +42,9 @@ module ariane import ariane_pkg::*; #(
   // Timer facilities
   input  logic                         time_irq_i,   // timer interrupt in (async)
   input  logic                         debug_req_i,  // debug request (async)
-`ifdef RVFI_PORT
   // RISC-V formal interface port (`rvfi`):
   // Can be left open when formal tracing is not needed.
-  output rvfi_pkg::rvfi_instr_t [NrCommitPorts-1:0] rvfi_o,
-`endif
+  output rvfi_instr_t [NrCommitPorts-1:0] rvfi_o,
 `ifdef PITON_ARIANE
   // L15 (memory side)
   output wt_cache_pkg::l15_req_t       l15_req_o,
@@ -66,7 +63,6 @@ module ariane import ariane_pkg::*; #(
     .NrCommitPorts ( NrCommitPorts ),
     .IsRVFI ( IsRVFI ),
     .rvfi_instr_t ( rvfi_instr_t ),
-    .rvfi_port_t ( rvfi_port_t ),
     //
     .ArianeCfg  ( ArianeCfg ),
     .AxiAddrWidth ( AxiAddrWidth ),
@@ -86,11 +82,7 @@ module ariane import ariane_pkg::*; #(
     .ipi_i                ( ipi_i                     ),
     .time_irq_i           ( time_irq_i                ),
     .debug_req_i          ( debug_req_i               ),
-`ifdef RVFI_PORT
     .rvfi_o               ( rvfi_o                    ),
-`else
-    .rvfi_o               (                           ),
-`endif
     .cvxif_req_o          ( cvxif_req                 ),
     .cvxif_resp_i         ( cvxif_resp                ),
 `ifdef PITON_ARIANE