Merge branch 'dev' into sw_dev

NALAYBUDY · May 17, 2021 · 588f110 · 588f110
2 parents 9791086 + ef403fb
commit 588f110
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 120 deletions.
diff --git a/bp_be/src/v/bp_be_calculator/bp_be_pipe_long.sv b/bp_be/src/v/bp_be_calculator/bp_be_pipe_long.sv
@@ -47,7 +47,7 @@ module bp_be_pipe_long
   wire [dword_width_gp-1:0] rs2 = reservation.rs2[0+:dword_width_gp];
   wire [dword_width_gp-1:0] imm = reservation.imm[0+:dword_width_gp];
 
-  wire v_li = reservation.v & reservation.decode.pipe_long_v;
+  wire v_li = reservation.v & reservation.decode.pipe_long_v & (reservation.decode.late_iwb_v | reservation.decode.late_fwb_v);
 
   wire signed_div_li = decode.fu_op inside {e_mul_op_div, e_mul_op_rem};
   wire rem_not_div_li = decode.fu_op inside {e_mul_op_rem, e_mul_op_remu};

diff --git a/bp_be/src/v/bp_be_calculator/bp_be_pipe_mem.sv b/bp_be/src/v/bp_be_calculator/bp_be_pipe_mem.sv
@@ -154,7 +154,7 @@ module bp_be_pipe_mem
   wire is_store  = (decode.pipe_mem_early_v | decode.pipe_mem_final_v) & decode.dcache_w_v;
   wire is_load   = (decode.pipe_mem_early_v | decode.pipe_mem_final_v) & decode.dcache_r_v;
   wire is_fencei = (decode.pipe_mem_early_v | decode.pipe_mem_final_v) & decode.fu_op inside {e_dcache_op_fencei};
-  wire is_req    = is_store | is_load;
+  wire is_req    = reservation.v & (is_store | is_load);
 
   // Calculate cache access eaddr
   wire [rv64_eaddr_width_gp-1:0] eaddr = rs1 + imm;

diff --git a/bp_be/src/v/bp_be_checker/bp_be_detector.sv b/bp_be/src/v/bp_be_checker/bp_be_detector.sv
@@ -215,7 +215,7 @@ module bp_be_detector
       frs3_data_haz_v[3] = (isd_status_cast_i.frs3_v & rs3_match_vector[3])
                            & (dep_status_r[3].fma_fwb_v);
 
-      mem_in_pipe_v      = (dep_status_r[0].mem_v) | (dep_status_r[1].mem_v);
+      mem_in_pipe_v      = dep_status_r[0].mem_v | dep_status_r[1].mem_v | dep_status_r[2].mem_v;
       fence_haz_v        = (isd_status_cast_i.fence_v & (~credits_empty_i | mem_in_pipe_v))
                            | (isd_status_cast_i.mem_v & credits_full_i);
       cmd_haz_v          = cmd_full_i;