From 4f7bcc409666cb9cd272367933d9cc2f621f2ebd Mon Sep 17 00:00:00 2001 From: waleed-lm Date: Sun, 8 Nov 2020 18:39:05 +0500 Subject: [PATCH] Bus-buffer testing start --- el2_lsu_bus_buffer.fir | 2 +- el2_lsu_bus_buffer.v | 2 +- src/main/scala/lsu/el2_lsu_bus_buffer.scala | 2 +- .../classes/lsu/el2_lsu_bus_buffer.class | Bin 567822 -> 567826 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/el2_lsu_bus_buffer.fir b/el2_lsu_bus_buffer.fir index 426e5f0f..79f6cd91 100644 --- a/el2_lsu_bus_buffer.fir +++ b/el2_lsu_bus_buffer.fir @@ -5954,7 +5954,7 @@ circuit el2_lsu_bus_buffer : io.lsu_bus_buffer_pend_any <= _T_4515 @[el2_lsu_bus_buffer.scala 585:30] node _T_4516 = and(io.ldst_dual_d, io.dec_lsu_valid_raw_d) @[el2_lsu_bus_buffer.scala 586:52] node _T_4517 = geq(buf_numvld_any, UInt<2>("h03")) @[el2_lsu_bus_buffer.scala 586:92] - node _T_4518 = eq(buf_numvld_any, UInt<2>("h03")) @[el2_lsu_bus_buffer.scala 586:119] + node _T_4518 = eq(buf_numvld_any, UInt<3>("h04")) @[el2_lsu_bus_buffer.scala 586:121] node _T_4519 = mux(_T_4516, _T_4517, _T_4518) @[el2_lsu_bus_buffer.scala 586:36] io.lsu_bus_buffer_full_any <= _T_4519 @[el2_lsu_bus_buffer.scala 586:30] node _T_4520 = orr(buf_state[0]) @[el2_lsu_bus_buffer.scala 587:52] diff --git a/el2_lsu_bus_buffer.v b/el2_lsu_bus_buffer.v index 6f32da68..fb8b0d33 100644 --- a/el2_lsu_bus_buffer.v +++ b/el2_lsu_bus_buffer.v @@ -2463,7 +2463,7 @@ module el2_lsu_bus_buffer( wire [3:0] buf_numvld_any = _T_4438 + _T_4445; // @[el2_lsu_bus_buffer.scala 580:169] wire _T_4516 = io_ldst_dual_d & io_dec_lsu_valid_raw_d; // @[el2_lsu_bus_buffer.scala 586:52] wire _T_4517 = buf_numvld_any >= 4'h3; // @[el2_lsu_bus_buffer.scala 586:92] - wire _T_4518 = buf_numvld_any == 4'h3; // @[el2_lsu_bus_buffer.scala 586:119] + wire _T_4518 = buf_numvld_any == 4'h4; // @[el2_lsu_bus_buffer.scala 586:121] wire _T_4520 = |buf_state_0; // @[el2_lsu_bus_buffer.scala 587:52] wire _T_4521 = |buf_state_1; // @[el2_lsu_bus_buffer.scala 587:52] wire _T_4522 = |buf_state_2; // @[el2_lsu_bus_buffer.scala 587:52] diff --git a/src/main/scala/lsu/el2_lsu_bus_buffer.scala b/src/main/scala/lsu/el2_lsu_bus_buffer.scala index 72171936..529b756e 100644 --- a/src/main/scala/lsu/el2_lsu_bus_buffer.scala +++ b/src/main/scala/lsu/el2_lsu_bus_buffer.scala @@ -583,7 +583,7 @@ class el2_lsu_bus_buffer extends Module with RequireAsyncReset with el2_lib { buf_numvld_pend_any := (0 until DEPTH).map(i=>((buf_state(i)===wait_C) | ((buf_state(i)===cmd_C) & !buf_cmd_state_bus_en(i))).asUInt).reverse.reduce(_ +& _) any_done_wait_state := (0 until DEPTH).map(i=>buf_state(i)===done_wait_C).reverse.reduce(_|_) io.lsu_bus_buffer_pend_any := buf_numvld_pend_any.orR - io.lsu_bus_buffer_full_any := Mux(io.ldst_dual_d & io.dec_lsu_valid_raw_d, buf_numvld_any>=(DEPTH-1), buf_numvld_any===(DEPTH-1)) + io.lsu_bus_buffer_full_any := Mux(io.ldst_dual_d & io.dec_lsu_valid_raw_d, buf_numvld_any>=(DEPTH-1).U, buf_numvld_any===DEPTH.U) io.lsu_bus_buffer_empty_any := !(buf_state.map(_.orR).reduce(_|_)) & !ibuf_valid & !obuf_valid io.lsu_nonblock_load_valid_m := io.lsu_busreq_m & io.lsu_pkt_m.valid & io.lsu_pkt_m.load & !io.flush_m_up & !io.ld_full_hit_m diff --git a/target/scala-2.12/classes/lsu/el2_lsu_bus_buffer.class b/target/scala-2.12/classes/lsu/el2_lsu_bus_buffer.class index d6b2fd52ee0feb48d1d25eb6433d4298730753c4..866a2900c9351ebba8fd8eb65d3e83d09a7ff501 100644 GIT binary patch delta 3458 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 Qh&}k