Remove unused parameter DEBUG_TRIGGER_EN. Add explicit parameter types.

Part of fix for openhwgroup#676 Signed-off-by: Oivind Ekelund <[email protected]>
silabs-oivind · Apr 3, 2023 · 0fd2e60 · 0fd2e60
1 parent fa104f3
commit 0fd2e60
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 17 deletions.
diff --git a/bhv/cv32e40x_sim_clock_gate.sv b/bhv/cv32e40x_sim_clock_gate.sv
@@ -14,7 +14,7 @@
 
 module cv32e40x_clock_gate
 #(
-  parameter LIB = 0
+  parameter int LIB = 0
   )
 (
     input  logic clk_i,

diff --git a/bhv/cv32e40x_wrapper.sv b/bhv/cv32e40x_wrapper.sv
@@ -50,7 +50,7 @@
 module cv32e40x_wrapper
   import cv32e40x_pkg::*;
 #(
-  parameter              LIB                          = 0,
+  parameter int          LIB                          = 0,
   parameter rv32_e       RV32                         = RV32I,
   parameter a_ext_e      A_EXT                        = A_NONE,
   parameter b_ext_e      B_EXT                        = B_NONE,

diff --git a/rtl/cv32e40x_core.sv b/rtl/cv32e40x_core.sv
@@ -31,7 +31,7 @@
 
 module cv32e40x_core import cv32e40x_pkg::*;
 #(
-  parameter                             LIB                                     = 0,
+  parameter int                         LIB                                     = 0,
   parameter rv32_e                      RV32                                    = RV32I,
   parameter a_ext_e                     A_EXT                                   = A_NONE,
   parameter b_ext_e                     B_EXT                                   = B_NONE,

diff --git a/rtl/cv32e40x_decoder.sv b/rtl/cv32e40x_decoder.sv
@@ -32,7 +32,6 @@ module cv32e40x_decoder import cv32e40x_pkg::*;
   parameter a_ext_e      A_EXT                  = A_NONE,
   parameter b_ext_e      B_EXT                  = B_NONE,
   parameter m_ext_e      M_EXT                  = M,
-  parameter              DEBUG_TRIGGER_EN       = 1,
   parameter bit          CLIC                   = 1
 )
 (
@@ -142,7 +141,6 @@ module cv32e40x_decoder import cv32e40x_pkg::*;
   // RV32I Base instruction set decoder
   cv32e40x_i_decoder
   #(
-    .DEBUG_TRIGGER_EN (DEBUG_TRIGGER_EN),
     .CLIC             (CLIC            )
   )
   i_decoder_i

diff --git a/rtl/cv32e40x_ff_one.sv b/rtl/cv32e40x_ff_one.sv
@@ -24,7 +24,7 @@
 
 module cv32e40x_ff_one
 #(
-  parameter LEN = 32
+  parameter int unsigned LEN = 32
 )
 (
   input  logic [LEN-1:0]         in_i,

diff --git a/rtl/cv32e40x_i_decoder.sv b/rtl/cv32e40x_i_decoder.sv
@@ -29,7 +29,6 @@
 
 module cv32e40x_i_decoder import cv32e40x_pkg::*;
   #(
-    parameter     DEBUG_TRIGGER_EN  = 1,
     parameter bit CLIC              = 1
     )
   (

diff --git a/rtl/cv32e40x_id_stage.sv b/rtl/cv32e40x_id_stage.sv
@@ -37,7 +37,6 @@ module cv32e40x_id_stage import cv32e40x_pkg::*;
   parameter b_ext_e      B_EXT                  = B_NONE,
   parameter m_ext_e      M_EXT                  = M,
   parameter bit          X_EXT                  = 0,
-  parameter              DEBUG_TRIGGER_EN       = 1,
   parameter int unsigned REGFILE_NUM_READ_PORTS = 2,
   parameter bit          CLIC                   = 1
 )
@@ -422,7 +421,6 @@ module cv32e40x_id_stage import cv32e40x_pkg::*;
     .A_EXT                           ( A_EXT                     ),
     .B_EXT                           ( B_EXT                     ),
     .M_EXT                           ( M_EXT                     ),
-    .DEBUG_TRIGGER_EN                ( DEBUG_TRIGGER_EN          ),
     .CLIC                            ( CLIC                      )
   )
   decoder_i

diff --git a/rtl/cv32e40x_lsu_response_filter.sv b/rtl/cv32e40x_lsu_response_filter.sv
@@ -32,7 +32,7 @@
 
 module cv32e40x_lsu_response_filter
   import cv32e40x_pkg::*;
-  #(parameter DEPTH = 2)
+  #(parameter int unsigned DEPTH = 2)
   (
    // clock and reset
    input logic            clk,

diff --git a/rtl/cv32e40x_sleep_unit.sv b/rtl/cv32e40x_sleep_unit.sv
@@ -42,7 +42,7 @@
 
 module cv32e40x_sleep_unit import cv32e40x_pkg::*;
 #(
-  parameter LIB = 0
+  parameter int LIB = 0
 )
 (
   // Clock, reset interface

diff --git a/sva/cv32e40x_load_store_unit_sva.sv b/sva/cv32e40x_load_store_unit_sva.sv
@@ -22,10 +22,10 @@ module cv32e40x_load_store_unit_sva
   import uvm_pkg::*;
   import cv32e40x_pkg::*;
   #(
-    parameter bit     X_EXT = 0,
-    parameter         DEPTH = 0,
-    parameter bit     DEBUG = 1,
-    parameter a_ext_e A_EXT = A_NONE
+    parameter bit          X_EXT = 0,
+    parameter int unsigned DEPTH = 0,
+    parameter bit          DEBUG = 1,
+    parameter a_ext_e      A_EXT = A_NONE
   )
   (input logic       clk,
    input logic       rst_n,

diff --git a/sva/cv32e40x_lsu_response_filter_sva.sv b/sva/cv32e40x_lsu_response_filter_sva.sv
@@ -26,7 +26,7 @@
 module cv32e40x_lsu_response_filter_sva
   import cv32e40x_pkg::*;
   import uvm_pkg::*;
-  #(parameter DEPTH = 2)
+  #(parameter int unsigned DEPTH = 2)
   (input logic                       clk,
    input logic                       rst_n,
 

diff --git a/sva/cv32e40x_prefetch_unit_sva.sv b/sva/cv32e40x_prefetch_unit_sva.sv
@@ -21,7 +21,7 @@
 module cv32e40x_prefetch_unit_sva import cv32e40x_pkg::*;
   import uvm_pkg::*;
   #(
-        parameter CLIC = 1'b0
+        parameter bit CLIC = 1'b0
   )
   (
    input logic        clk,
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,6 @@ @@
     module cv32e40x_i_decoder import cv32e40x_pkg::*;
       #(
-        parameter     DEBUG_TRIGGER_EN  = 1,
         parameter bit CLIC              = 1
         )
       (
@@ Expand Down @@