[rtl] Exclude data_wdata_intg from lockstep comparison

We can remove the integrity portion of the write data as we anyways
compare the `data_wdata` in the lockstep comparison. This helps us
to save some area.

Signed-off-by: Pascal Nasahl <[email protected]>

Author: nasahlpa

rtl/ibex_lockstep.sv

@@ -71,7 +71,7 @@ module ibex_lockstep import ibex_pkg::*; #(
   input  logic                         data_we_i,
   input  logic [3:0]                   data_be_i,
   input  logic [31:0]                  data_addr_i,
-  input  logic [MemDataWidth-1:0]      data_wdata_i,
+  input  logic [31:0]                  data_wdata_i,
   input  logic [MemDataWidth-1:0]      data_rdata_i,
   input  logic                         data_err_i,
 
@@ -339,7 +339,7 @@ module ibex_lockstep import ibex_pkg::*; #(
     logic                    data_we;
     logic [3:0]              data_be;
     logic [31:0]             data_addr;
-    logic [MemDataWidth-1:0] data_wdata;
+    logic [31:0]             data_wdata;
     logic [IC_NUM_WAYS-1:0]  ic_tag_req;
     logic                    ic_tag_write;
     logic [IC_INDEX_W-1:0]   ic_tag_addr;
@@ -402,6 +402,10 @@ module ibex_lockstep import ibex_pkg::*; #(
   logic                           shadow_dummy_instr_id;
   logic                           shadow_dummy_instr_wb;
 
+  // The following output does not need to be checked in the lockstep comparison as we anyways
+  // check the data_wdata itself.
+  logic [6:0]                     shadow_data_wdata_intg;
+
   ///////////////////////////////
   // Shadow core instantiation //
   ///////////////////////////////
@@ -468,7 +472,7 @@ module ibex_lockstep import ibex_pkg::*; #(
     .data_we_o           (shadow_outputs_d.data_we),
     .data_be_o           (shadow_outputs_d.data_be),
     .data_addr_o         (shadow_outputs_d.data_addr),
-    .data_wdata_o        (shadow_outputs_d.data_wdata),
+    .data_wdata_o        ({shadow_data_wdata_intg, shadow_outputs_d.data_wdata}),
     .data_rdata_i        (shadow_inputs_q[0].data_rdata),
     .data_err_i          (shadow_inputs_q[0].data_err),
 
@@ -657,8 +661,8 @@ module ibex_lockstep import ibex_pkg::*; #(
   assign data_we_shadow_o = shadow_outputs_d.data_we;
   assign data_be_shadow_o = shadow_outputs_d.data_be;
   assign data_addr_shadow_o = shadow_outputs_d.data_addr;
-  assign data_wdata_shadow_o = shadow_outputs_d.data_wdata[31:0];
-  assign data_wdata_intg_shadow_o = shadow_outputs_d.data_wdata[38:32];
+  assign data_wdata_shadow_o = shadow_outputs_d.data_wdata;
+  assign data_wdata_intg_shadow_o = shadow_data_wdata_intg;
   assign instr_req_shadow_o = shadow_outputs_d.instr_req;
   assign instr_addr_shadow_o = shadow_outputs_d.instr_addr;
 endmodule

rtl/ibex_top.sv

@@ -800,7 +800,7 @@ module ibex_top import ibex_pkg::*; #(
       data_we_o,
       data_be_o,
       data_addr_o,
-      data_wdata_core,
+      data_wdata_o,
       data_rdata_core,
       data_err_i,
       rf_rdata_a,
@@ -846,7 +846,7 @@ module ibex_top import ibex_pkg::*; #(
     logic                         data_we_local;
     logic [3:0]                   data_be_local;
     logic [31:0]                  data_addr_local;
-    logic [MemDataWidth-1:0]      data_wdata_local;
+    logic [31:0]                  data_wdata_local;
     logic [MemDataWidth-1:0]      data_rdata_local;
     logic                         data_err_local;
 
@@ -893,7 +893,7 @@ module ibex_top import ibex_pkg::*; #(
       data_we_o,
       data_be_o,
       data_addr_o,
-      data_wdata_core,
+      data_wdata_o,
       data_rdata_core,
       data_err_i,
       rf_rdata_a,