[treewide] Only use top-level parametrization

Author: Andrea Belano

Bender.yml

@@ -49,16 +49,6 @@ sources:
     - rtl/redmule_mux.sv
     - rtl/redmule_inst_decoder.sv
 
-    - target: redmule_test_hwpe
-      files:
-        - rtl/redmule_wrap.sv
-
-    - target: redmule_complex
-      files:
-        - rtl/redmule_inst_decoder.sv
-        - rtl/redmule_complex.sv
-        - rtl/redmule_complex_wrap.sv
-
     - target: any(redmule_test_complex, redmule_test_hwpe)
       files:
         - target/sim/src/tb_dummy_memory.sv

rtl/redmule_castin.sv

@@ -5,18 +5,18 @@
 // Yvan Tortorella <[email protected]>
 //
 
-import fpnew_pkg::*;
-import hci_package::*;
-import redmule_pkg::*;
-
-module redmule_castin #(
-  parameter fpnew_pkg::fmt_logic_t   FpFmtConfig  = FpFmtConfig,
-  parameter fpnew_pkg::ifmt_logic_t  IntFmtConfig = IntFmtConfig,
-  parameter fpnew_pkg::fp_format_e   DstFormat    = FPFORMAT,
-  parameter fpnew_pkg::operation_e   Operation    = CAST_OP,
+module redmule_castin
+  import fpnew_pkg::*;
+  import hci_package::*;
+  import redmule_pkg::*;
+#(
+  parameter fpnew_pkg::fmt_logic_t   FpFmtConfig  = 6'b001101,
+  parameter fpnew_pkg::ifmt_logic_t  IntFmtConfig = 4'b1000,
+  parameter fpnew_pkg::fp_format_e   DstFormat    = FP16,
+  parameter fpnew_pkg::operation_e   Operation    = F2F,
+  parameter int unsigned             DataW        = MaxDataW,
   parameter logic Pipe                            = 1'b0    ,
   localparam int unsigned BW = hci_package::DEFAULT_BW      ,
-  localparam int unsigned OW = ADDR_W                       ,
   localparam int unsigned UW = hci_package::DEFAULT_UW      ,
   localparam int unsigned WIDTH = fpnew_pkg::maximum(fpnew_pkg::max_fp_width(FpFmtConfig),
                                                      fpnew_pkg::max_int_width(IntFmtConfig))
@@ -25,23 +25,25 @@ module redmule_castin #(
   input  logic                   rst_ni   ,
   input  logic                   clear_i  ,
   input  logic                   cast_i   ,
-  input  logic [DATA_W-1:0]      src_i    ,
+  input  logic [DataW-1:0]       src_i    ,
   input  fpnew_pkg::fp_format_e  src_fmt_i,
-  output logic [DATA_W-1:0]      dst_o
+  output logic [DataW-1:0]       dst_o
 );
 
-localparam int unsigned NUM_CAST = DATA_W/BITW;
+localparam int unsigned NUM_CAST = DataW/fp_width(DstFormat);
 localparam int unsigned NARRBITW = fpnew_pkg::fp_width(fpnew_pkg::FP8);
 // localparam int unsigned ZEROBITS = WIDTH - NARRBITW;
-localparam int unsigned ZEROBITS = MIN_FMT;
+localparam int unsigned ZEROBITS = fpnew_pkg::min_fp_width(FpFmtConfig);
+localparam int unsigned MIN_FMT  = fpnew_pkg::min_fp_width(FpFmtConfig);
 localparam fpnew_pkg::int_format_e INT_SRC = fpnew_pkg::INT8;
+localparam int unsigned DW_RATIO = fp_width(DstFormat)/min_fp_width(FpFmtConfig);
 
-logic [DATA_W-1:0] src_int;
+logic [DataW-1:0] src_int;
 
-assign src_int[DATA_W-DW_CUT-1:0] = src_i[DATA_W-DW_CUT-1:0];
-assign src_int[DATA_W-1:DATA_W-DW_CUT] = '0;
+assign src_int[DataW/DW_RATIO-1:0] = src_i[DataW/DW_RATIO-1:0];
+assign src_int[DataW-1:DataW/DW_RATIO] = '0;
 
-logic [DATA_W-1:0] dst_int;
+logic [DataW-1:0] dst_int;
 logic [NUM_CAST-1:0][WIDTH-1:0] result ,
                                 operand;
 

rtl/redmule_castout.sv

@@ -5,18 +5,19 @@
 // Yvan Tortorella <[email protected]>
 //
 
-import fpnew_pkg::*;
-import hci_package::*;
-import redmule_pkg::*;
 
-module redmule_castout #(
-  parameter fpnew_pkg::fmt_logic_t   FpFmtConfig  = FpFmtConfig,
-  parameter fpnew_pkg::ifmt_logic_t  IntFmtConfig = IntFmtConfig,
-  parameter fpnew_pkg::fp_format_e   SrcFormat    = FPFORMAT,
-  parameter fpnew_pkg::operation_e   Operation    = CAST_OP,
+module redmule_castout
+  import fpnew_pkg::*;
+  import hci_package::*;
+  import redmule_pkg::*;
+#(
+  parameter fpnew_pkg::fmt_logic_t   FpFmtConfig  = 6'b001101,
+  parameter fpnew_pkg::ifmt_logic_t  IntFmtConfig = 4'b1000,
+  parameter fpnew_pkg::fp_format_e   SrcFormat    = FP16,
+  parameter fpnew_pkg::operation_e   Operation    = F2F,
   parameter logic Pipe                            = 1'b0    ,
+  parameter int unsigned             DataW        = 0,
   localparam int unsigned BW = hci_package::DEFAULT_BW      ,
-  localparam int unsigned OW = ADDR_W                       ,
   localparam int unsigned UW = hci_package::DEFAULT_UW      ,
   localparam int unsigned WIDTH = fpnew_pkg::maximum(fpnew_pkg::max_fp_width(FpFmtConfig),
                                                      fpnew_pkg::max_int_width(IntFmtConfig))
@@ -25,18 +26,20 @@ module redmule_castout #(
   input  logic                   rst_ni   ,
   input  logic                   clear_i  ,
   input  logic                   cast_i   ,
-  input  logic [DATA_W-1:0]      src_i    ,
+  input  logic [DataW-1:0]       src_i    ,
   input  fpnew_pkg::fp_format_e  dst_fmt_i,
-  output logic [DATA_W-1:0]      dst_o
+  output logic [DataW-1:0]       dst_o
 );
 
-localparam int unsigned NUM_CAST = DATA_W/BITW;
+localparam int unsigned NUM_CAST = DataW/fp_width(SrcFormat);
 localparam int unsigned NARRBITW = fpnew_pkg::fp_width(fpnew_pkg::FP8);
 // localparam int unsigned ZEROBITS = WIDTH - NARRBITW;
-localparam int unsigned ZEROBITS = MIN_FMT;
+localparam int unsigned ZEROBITS = fpnew_pkg::min_fp_width(FpFmtConfig);
+localparam int unsigned MIN_FMT  = fpnew_pkg::min_fp_width(FpFmtConfig);
 localparam fpnew_pkg::int_format_e INT_SRC = fpnew_pkg::INT8;
+localparam int unsigned DW_RATIO = fp_width(SrcFormat)/min_fp_width(FpFmtConfig);
 
-logic [DATA_W-1:0] dst_int,
+logic [DataW-1:0]  dst_int,
                    res;
 logic [NUM_CAST-1:0][WIDTH-1:0] result ,
                                 operand;
@@ -83,7 +86,7 @@ generate
 
 endgenerate
 
-assign dst_int = {{DATA_W-DW_CUT{1'b0}}, res[DATA_W-DW_CUT-1:0]};
+assign dst_int = {{DataW/DW_RATIO{1'b0}}, res[DataW/DW_RATIO-1:0]};
 
 assign dst_o = cast_i ? dst_int : src_i;