Merge remote-tracking branch 'upstream/master' into vortex2

2024-03-07 14:45:48 -08:00
parent e7b0a149c7 5f2b10b8a6
commit b63333a4ec
38 changed files with 553 additions and 390 deletions
--- a/hw/rtl/core/VX_decode.sv
+++ b/hw/rtl/core/VX_decode.sv
@@ -533,8 +533,9 @@ module VX_decode  #(
    assign decode_sched_if.valid    = fetch_fire;
    assign decode_sched_if.wid      = fetch_if.data.wid;
    assign decode_sched_if.is_wstall = is_wstall;
-    
+`ifndef L1_ENABLE    
    assign fetch_if.ibuf_pop = decode_if.ibuf_pop;
+`endif

 `ifdef DBG_TRACE_CORE_PIPELINE_VCS
    always @(posedge clk) begin