Bus-buffer testing start

el2_lsu_bus_buffer.fir

@@ -404,7 +404,7 @@ circuit el2_lsu_bus_buffer :
     buf_ldfwd_en[1] <= UInt<1>("h00") @[el2_lsu_bus_buffer.scala 150:16]
     buf_ldfwd_en[2] <= UInt<1>("h00") @[el2_lsu_bus_buffer.scala 150:16]
     buf_ldfwd_en[3] <= UInt<1>("h00") @[el2_lsu_bus_buffer.scala 150:16]
-    wire buf_data_in : UInt<4>[4] @[el2_lsu_bus_buffer.scala 151:25]
+    wire buf_data_in : UInt<32>[4] @[el2_lsu_bus_buffer.scala 151:25]
     buf_data_in[0] <= UInt<1>("h00") @[el2_lsu_bus_buffer.scala 152:15]
     buf_data_in[1] <= UInt<1>("h00") @[el2_lsu_bus_buffer.scala 152:15]
     buf_data_in[2] <= UInt<1>("h00") @[el2_lsu_bus_buffer.scala 152:15]

el2_lsu_bus_buffer.v

@@ -141,7 +141,7 @@ module el2_lsu_bus_buffer(
   output [2:0]   io_lsu_axi_arprot,
   output [3:0]   io_lsu_axi_arqos,
   output         io_lsu_axi_rready,
-  output [15:0] io_test,
+  output [127:0] io_test,
   output [31:0]  io_data_hi,
   output [31:0]  io_data_lo,
   output [3:0]   io_data_en
@@ -762,23 +762,19 @@ module el2_lsu_bus_buffer(
   wire  _T_82 = _T_80 | ld_byte_ibuf_hit_hi[3]; // @[el2_lsu_bus_buffer.scala 192:77]
   wire [2:0] _T_84 = {_T_82,_T_79,_T_76}; // @[Cat.scala 29:58]
   wire [7:0] _T_554 = ld_byte_hitvecfn_lo_3[0] ? 8'hff : 8'h0; // @[Bitwise.scala 72:12]
-  reg [3:0] _T_4297; // @[el2_lib.scala 491:16]
+  reg [31:0] buf_data_0; // @[el2_lib.scala 491:16]
-  wire [31:0] buf_data_0 = {{28'd0}, _T_4297}; // @[el2_lsu_bus_buffer.scala 213:22 el2_lsu_bus_buffer.scala 214:12 el2_lsu_bus_buffer.scala 543:14]
   wire [8:0] _GEN_354 = {{1'd0}, _T_554}; // @[el2_lsu_bus_buffer.scala 217:91]
   wire [8:0] _T_556 = _GEN_354 & buf_data_0[31:23]; // @[el2_lsu_bus_buffer.scala 217:91]
   wire [7:0] _T_559 = ld_byte_hitvecfn_lo_3[1] ? 8'hff : 8'h0; // @[Bitwise.scala 72:12]
-  reg [3:0] _T_4298; // @[el2_lib.scala 491:16]
+  reg [31:0] buf_data_1; // @[el2_lib.scala 491:16]
-  wire [31:0] buf_data_1 = {{28'd0}, _T_4298}; // @[el2_lsu_bus_buffer.scala 213:22 el2_lsu_bus_buffer.scala 214:12 el2_lsu_bus_buffer.scala 543:14]
   wire [8:0] _GEN_355 = {{1'd0}, _T_559}; // @[el2_lsu_bus_buffer.scala 217:91]
   wire [8:0] _T_561 = _GEN_355 & buf_data_1[31:23]; // @[el2_lsu_bus_buffer.scala 217:91]
   wire [7:0] _T_564 = ld_byte_hitvecfn_lo_3[2] ? 8'hff : 8'h0; // @[Bitwise.scala 72:12]
-  reg [3:0] _T_4299; // @[el2_lib.scala 491:16]
+  reg [31:0] buf_data_2; // @[el2_lib.scala 491:16]
-  wire [31:0] buf_data_2 = {{28'd0}, _T_4299}; // @[el2_lsu_bus_buffer.scala 213:22 el2_lsu_bus_buffer.scala 214:12 el2_lsu_bus_buffer.scala 543:14]
   wire [8:0] _GEN_356 = {{1'd0}, _T_564}; // @[el2_lsu_bus_buffer.scala 217:91]
   wire [8:0] _T_566 = _GEN_356 & buf_data_2[31:23]; // @[el2_lsu_bus_buffer.scala 217:91]
   wire [7:0] _T_569 = ld_byte_hitvecfn_lo_3[3] ? 8'hff : 8'h0; // @[Bitwise.scala 72:12]
-  reg [3:0] _T_4300; // @[el2_lib.scala 491:16]
+  reg [31:0] buf_data_3; // @[el2_lib.scala 491:16]
-  wire [31:0] buf_data_3 = {{28'd0}, _T_4300}; // @[el2_lsu_bus_buffer.scala 213:22 el2_lsu_bus_buffer.scala 214:12 el2_lsu_bus_buffer.scala 543:14]
   wire [8:0] _GEN_357 = {{1'd0}, _T_569}; // @[el2_lsu_bus_buffer.scala 217:91]
   wire [8:0] _T_571 = _GEN_357 & buf_data_3[31:23]; // @[el2_lsu_bus_buffer.scala 217:91]
   wire [8:0] _T_572 = _T_556 | _T_561; // @[el2_lsu_bus_buffer.scala 217:123]
@@ -2065,7 +2061,7 @@ module el2_lsu_bus_buffer(
   wire  _GEN_74 = _T_3460 ? 1'h0 : _GEN_62; // @[Conditional.scala 39:67]
   wire  buf_wr_en_0 = _T_3437 & buf_state_en_0; // @[Conditional.scala 40:58]
   wire  buf_data_en_0 = _T_3437 ? buf_state_en_0 : _GEN_70; // @[Conditional.scala 40:58]
-  wire [31:0] _GEN_79 = _T_3437 ? _T_3459 : _GEN_72; // @[Conditional.scala 40:58]
+  wire [31:0] buf_data_in_0 = _T_3437 ? _T_3459 : _GEN_72; // @[Conditional.scala 40:58]
   wire  buf_ldfwd_en_0 = _T_3437 ? 1'h0 : _GEN_68; // @[Conditional.scala 40:58]
   wire  buf_rst_0 = _T_3437 ? 1'h0 : _GEN_74; // @[Conditional.scala 40:58]
   wire [31:0] _T_3652 = _T_3645 ? ibuf_data_out : store_data_lo_r; // @[el2_lsu_bus_buffer.scala 473:30]
@@ -2141,7 +2137,7 @@ module el2_lsu_bus_buffer(
   wire  _GEN_150 = _T_3653 ? 1'h0 : _GEN_138; // @[Conditional.scala 39:67]
   wire  buf_wr_en_1 = _T_3630 & buf_state_en_1; // @[Conditional.scala 40:58]
   wire  buf_data_en_1 = _T_3630 ? buf_state_en_1 : _GEN_146; // @[Conditional.scala 40:58]
-  wire [31:0] _GEN_155 = _T_3630 ? _T_3652 : _GEN_148; // @[Conditional.scala 40:58]
+  wire [31:0] buf_data_in_1 = _T_3630 ? _T_3652 : _GEN_148; // @[Conditional.scala 40:58]
   wire  buf_ldfwd_en_1 = _T_3630 ? 1'h0 : _GEN_144; // @[Conditional.scala 40:58]
   wire  buf_rst_1 = _T_3630 ? 1'h0 : _GEN_150; // @[Conditional.scala 40:58]
   wire [31:0] _T_3845 = _T_3838 ? ibuf_data_out : store_data_lo_r; // @[el2_lsu_bus_buffer.scala 473:30]
@@ -2217,7 +2213,7 @@ module el2_lsu_bus_buffer(
   wire  _GEN_226 = _T_3846 ? 1'h0 : _GEN_214; // @[Conditional.scala 39:67]
   wire  buf_wr_en_2 = _T_3823 & buf_state_en_2; // @[Conditional.scala 40:58]
   wire  buf_data_en_2 = _T_3823 ? buf_state_en_2 : _GEN_222; // @[Conditional.scala 40:58]
-  wire [31:0] _GEN_231 = _T_3823 ? _T_3845 : _GEN_224; // @[Conditional.scala 40:58]
+  wire [31:0] buf_data_in_2 = _T_3823 ? _T_3845 : _GEN_224; // @[Conditional.scala 40:58]
   wire  buf_ldfwd_en_2 = _T_3823 ? 1'h0 : _GEN_220; // @[Conditional.scala 40:58]
   wire  buf_rst_2 = _T_3823 ? 1'h0 : _GEN_226; // @[Conditional.scala 40:58]
   wire [31:0] _T_4038 = _T_4031 ? ibuf_data_out : store_data_lo_r; // @[el2_lsu_bus_buffer.scala 473:30]
@@ -2293,7 +2289,7 @@ module el2_lsu_bus_buffer(
   wire  _GEN_302 = _T_4039 ? 1'h0 : _GEN_290; // @[Conditional.scala 39:67]
   wire  buf_wr_en_3 = _T_4016 & buf_state_en_3; // @[Conditional.scala 40:58]
   wire  buf_data_en_3 = _T_4016 ? buf_state_en_3 : _GEN_298; // @[Conditional.scala 40:58]
-  wire [31:0] _GEN_307 = _T_4016 ? _T_4038 : _GEN_300; // @[Conditional.scala 40:58]
+  wire [31:0] buf_data_in_3 = _T_4016 ? _T_4038 : _GEN_300; // @[Conditional.scala 40:58]
   wire  buf_ldfwd_en_3 = _T_4016 ? 1'h0 : _GEN_296; // @[Conditional.scala 40:58]
   wire  buf_rst_3 = _T_4016 ? 1'h0 : _GEN_302; // @[Conditional.scala 40:58]
   reg  _T_4245; // @[Reg.scala 27:20]
@@ -2319,11 +2315,7 @@ module el2_lsu_bus_buffer(
   wire  _T_4317 = buf_error_en_3 | buf_error[3]; // @[el2_lsu_bus_buffer.scala 544:86]
   wire  _T_4318 = ~buf_rst_3; // @[el2_lsu_bus_buffer.scala 544:128]
   wire [2:0] _T_4325 = {buf_data_en_3,buf_data_en_2,buf_data_en_1}; // @[Cat.scala 29:58]
-  wire [3:0] buf_data_in_3 = _GEN_307[3:0]; // @[el2_lsu_bus_buffer.scala 151:25 el2_lsu_bus_buffer.scala 152:15 el2_lsu_bus_buffer.scala 473:24 el2_lsu_bus_buffer.scala 489:24 el2_lsu_bus_buffer.scala 505:24]
+  wire [95:0] _T_4328 = {buf_data_in_3,buf_data_in_2,buf_data_in_1}; // @[Cat.scala 29:58]
-  wire [3:0] buf_data_in_2 = _GEN_231[3:0]; // @[el2_lsu_bus_buffer.scala 151:25 el2_lsu_bus_buffer.scala 152:15 el2_lsu_bus_buffer.scala 473:24 el2_lsu_bus_buffer.scala 489:24 el2_lsu_bus_buffer.scala 505:24]
-  wire [3:0] buf_data_in_1 = _GEN_155[3:0]; // @[el2_lsu_bus_buffer.scala 151:25 el2_lsu_bus_buffer.scala 152:15 el2_lsu_bus_buffer.scala 473:24 el2_lsu_bus_buffer.scala 489:24 el2_lsu_bus_buffer.scala 505:24]
-  wire [11:0] _T_4328 = {buf_data_in_3,buf_data_in_2,buf_data_in_1}; // @[Cat.scala 29:58]
-  wire [3:0] buf_data_in_0 = _GEN_79[3:0]; // @[el2_lsu_bus_buffer.scala 151:25 el2_lsu_bus_buffer.scala 152:15 el2_lsu_bus_buffer.scala 473:24 el2_lsu_bus_buffer.scala 489:24 el2_lsu_bus_buffer.scala 505:24]
   wire [1:0] _T_4334 = _T_26 + _T_19; // @[el2_lsu_bus_buffer.scala 547:96]
   wire [1:0] _GEN_391 = {{1'd0}, _T_12}; // @[el2_lsu_bus_buffer.scala 547:96]
   wire [2:0] _T_4335 = _T_4334 + _GEN_391; // @[el2_lsu_bus_buffer.scala 547:96]
@@ -2763,13 +2755,13 @@ initial begin
   _RAND_28 = {1{`RANDOM}};
   buf_ageQ_0 = _RAND_28[3:0];
   _RAND_29 = {1{`RANDOM}};
-  _T_4297 = _RAND_29[3:0];
+  buf_data_0 = _RAND_29[31:0];
   _RAND_30 = {1{`RANDOM}};
-  _T_4298 = _RAND_30[3:0];
+  buf_data_1 = _RAND_30[31:0];
   _RAND_31 = {1{`RANDOM}};
-  _T_4299 = _RAND_31[3:0];
+  buf_data_2 = _RAND_31[31:0];
   _RAND_32 = {1{`RANDOM}};
-  _T_4300 = _RAND_32[3:0];
+  buf_data_3 = _RAND_32[31:0];
   _RAND_33 = {1{`RANDOM}};
   ibuf_timer = _RAND_33[2:0];
   _RAND_34 = {1{`RANDOM}};
@@ -3007,16 +2999,16 @@ initial begin
     buf_ageQ_0 = 4'h0;
   end
   if (reset) begin
-    _T_4297 = 4'h0;
+    buf_data_0 = 32'h0;
   end
   if (reset) begin
-    _T_4298 = 4'h0;
+    buf_data_1 = 32'h0;
   end
   if (reset) begin
-    _T_4299 = 4'h0;
+    buf_data_2 = 32'h0;
   end
   if (reset) begin
-    _T_4300 = 4'h0;
+    buf_data_3 = 32'h0;
   end
   if (reset) begin
     ibuf_timer = 3'h0;
@@ -3667,30 +3659,134 @@ end // initial
   end
   always @(posedge rvclkhdr_8_io_l1clk or posedge reset) begin
     if (reset) begin
-      _T_4297 <= 4'h0;
+      buf_data_0 <= 32'h0;
+    end else if (_T_3437) begin
+      if (_T_3452) begin
+        buf_data_0 <= ibuf_data_out;
       end else begin
-      _T_4297 <= _GEN_79[3:0];
+        buf_data_0 <= store_data_lo_r;
+      end
+    end else if (_T_3460) begin
+      buf_data_0 <= 32'h0;
+    end else if (_T_3464) begin
+      if (buf_error_en_0) begin
+        buf_data_0 <= io_lsu_axi_rdata[31:0];
+      end else if (buf_addr_0[2]) begin
+        buf_data_0 <= io_lsu_axi_rdata[63:32];
+      end else begin
+        buf_data_0 <= io_lsu_axi_rdata[31:0];
+      end
+    end else if (_T_3498) begin
+      if (_T_3578) begin
+        if (buf_addr_0[2]) begin
+          buf_data_0 <= io_lsu_axi_rdata[63:32];
+        end else begin
+          buf_data_0 <= io_lsu_axi_rdata[31:0];
+        end
+      end else begin
+        buf_data_0 <= io_lsu_axi_rdata[31:0];
+      end
+    end else begin
+      buf_data_0 <= 32'h0;
     end
   end
   always @(posedge rvclkhdr_9_io_l1clk or posedge reset) begin
     if (reset) begin
-      _T_4298 <= 4'h0;
+      buf_data_1 <= 32'h0;
+    end else if (_T_3630) begin
+      if (_T_3645) begin
+        buf_data_1 <= ibuf_data_out;
       end else begin
-      _T_4298 <= _GEN_155[3:0];
+        buf_data_1 <= store_data_lo_r;
+      end
+    end else if (_T_3653) begin
+      buf_data_1 <= 32'h0;
+    end else if (_T_3657) begin
+      if (buf_error_en_1) begin
+        buf_data_1 <= io_lsu_axi_rdata[31:0];
+      end else if (buf_addr_1[2]) begin
+        buf_data_1 <= io_lsu_axi_rdata[63:32];
+      end else begin
+        buf_data_1 <= io_lsu_axi_rdata[31:0];
+      end
+    end else if (_T_3691) begin
+      if (_T_3771) begin
+        if (buf_addr_1[2]) begin
+          buf_data_1 <= io_lsu_axi_rdata[63:32];
+        end else begin
+          buf_data_1 <= io_lsu_axi_rdata[31:0];
+        end
+      end else begin
+        buf_data_1 <= io_lsu_axi_rdata[31:0];
+      end
+    end else begin
+      buf_data_1 <= 32'h0;
     end
   end
   always @(posedge rvclkhdr_10_io_l1clk or posedge reset) begin
     if (reset) begin
-      _T_4299 <= 4'h0;
+      buf_data_2 <= 32'h0;
+    end else if (_T_3823) begin
+      if (_T_3838) begin
+        buf_data_2 <= ibuf_data_out;
       end else begin
-      _T_4299 <= _GEN_231[3:0];
+        buf_data_2 <= store_data_lo_r;
+      end
+    end else if (_T_3846) begin
+      buf_data_2 <= 32'h0;
+    end else if (_T_3850) begin
+      if (buf_error_en_2) begin
+        buf_data_2 <= io_lsu_axi_rdata[31:0];
+      end else if (buf_addr_2[2]) begin
+        buf_data_2 <= io_lsu_axi_rdata[63:32];
+      end else begin
+        buf_data_2 <= io_lsu_axi_rdata[31:0];
+      end
+    end else if (_T_3884) begin
+      if (_T_3964) begin
+        if (buf_addr_2[2]) begin
+          buf_data_2 <= io_lsu_axi_rdata[63:32];
+        end else begin
+          buf_data_2 <= io_lsu_axi_rdata[31:0];
+        end
+      end else begin
+        buf_data_2 <= io_lsu_axi_rdata[31:0];
+      end
+    end else begin
+      buf_data_2 <= 32'h0;
     end
   end
   always @(posedge rvclkhdr_11_io_l1clk or posedge reset) begin
     if (reset) begin
-      _T_4300 <= 4'h0;
+      buf_data_3 <= 32'h0;
+    end else if (_T_4016) begin
+      if (_T_4031) begin
+        buf_data_3 <= ibuf_data_out;
       end else begin
-      _T_4300 <= _GEN_307[3:0];
+        buf_data_3 <= store_data_lo_r;
+      end
+    end else if (_T_4039) begin
+      buf_data_3 <= 32'h0;
+    end else if (_T_4043) begin
+      if (buf_error_en_3) begin
+        buf_data_3 <= io_lsu_axi_rdata[31:0];
+      end else if (buf_addr_3[2]) begin
+        buf_data_3 <= io_lsu_axi_rdata[63:32];
+      end else begin
+        buf_data_3 <= io_lsu_axi_rdata[31:0];
+      end
+    end else if (_T_4077) begin
+      if (_T_4157) begin
+        if (buf_addr_3[2]) begin
+          buf_data_3 <= io_lsu_axi_rdata[63:32];
+        end else begin
+          buf_data_3 <= io_lsu_axi_rdata[31:0];
+        end
+      end else begin
+        buf_data_3 <= io_lsu_axi_rdata[31:0];
+      end
+    end else begin
+      buf_data_3 <= 32'h0;
     end
   end
   always @(posedge io_lsu_bus_ibuf_c1_clk or posedge reset) begin

src/main/scala/lsu/el2_lsu_bus_buffer.scala

@@ -148,7 +148,7 @@ class  el2_lsu_bus_buffer extends Module with RequireAsyncReset with el2_lib {
   buf_ldfwd_in := buf_ldfwd_in.map(i=> false.B)
   val buf_ldfwd_en = Wire(Vec(DEPTH, Bool()))
   buf_ldfwd_en := buf_ldfwd_en.map(i=> false.B)
-  val buf_data_in = Wire(Vec(DEPTH, UInt(DEPTH.W)))
+  val buf_data_in = Wire(Vec(DEPTH, UInt(32.W)))
   buf_data_in := buf_data_in.map(i=> 0.U)
   val buf_ldfwdtag_in = Wire(Vec(DEPTH, UInt(DEPTH_LOG2.W)))
   buf_ldfwdtag_in := buf_ldfwdtag_in.map(i=> 0.U)