From 536132ca786ae8bf8101a2ab438bb3e92b59d052 Mon Sep 17 00:00:00 2001 From: Wojciech Sipak Date: Thu, 14 Nov 2024 15:02:45 +0100 Subject: [PATCH] bring back _ext_in_pkt --- design/ifu/el2_ifu_ic_mem.sv | 72 ++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/design/ifu/el2_ifu_ic_mem.sv b/design/ifu/el2_ifu_ic_mem.sv index 133dda4bcb8..88575bda8f8 100644 --- a/design/ifu/el2_ifu_ic_mem.sv +++ b/design/ifu/el2_ifu_ic_mem.sv @@ -281,17 +281,17 @@ import el2_pkg::*; .Q (wb_dout_pre_up[i][k]), \ .CLK (clk), \ .ROP ( ), \ - .TEST1(), \ - .RME(), \ - .RM(), \ + .TEST1(ic_data_ext_in_pkt[i][k].TEST1), \ + .RME(ic_data_ext_in_pkt[i][k].RME), \ + .RM(ic_data_ext_in_pkt[i][k].RM), \ \ - .LS(), \ - .DS(), \ - .SD(), \ + .LS(ic_data_ext_in_pkt[i][k].LS), \ + .DS(ic_data_ext_in_pkt[i][k].DS), \ + .SD(ic_data_ext_in_pkt[i][k].SD), \ \ - .TEST_RNM(), \ - .BC1(), \ - .BC2() \ + .TEST_RNM(ic_data_ext_in_pkt[i][k].TEST_RNM), \ + .BC1(ic_data_ext_in_pkt[i][k].BC1), \ + .BC2(ic_data_ext_in_pkt[i][k].BC2) \ ); \ if (pt.ICACHE_BYPASS_ENABLE == 1) begin \ assign wrptr_in_up[i][k] = (wrptr_up[i][k] == (pt.ICACHE_NUM_BYPASS-1)) ? '0 : (wrptr_up[i][k] + 1'd1); \ @@ -433,17 +433,17 @@ if (pt.ICACHE_BYPASS_ENABLE == 1) begin \ .Q (wb_packeddout_pre[k]), \ .ME (|ic_bank_way_clken_final[k]), \ .ROP ( ), \ - .TEST1 (), \ - .RME (), \ - .RM (), \ + .TEST1 (ic_data_ext_in_pkt[0][k].TEST1), \ + .RME (ic_data_ext_in_pkt[0][k].RME), \ + .RM (ic_data_ext_in_pkt[0][k].RM), \ \ - .LS (), \ - .DS (), \ - .SD (), \ + .LS (ic_data_ext_in_pkt[0][k].LS), \ + .DS (ic_data_ext_in_pkt[0][k].DS), \ + .SD (ic_data_ext_in_pkt[0][k].SD), \ \ - .TEST_RNM (), \ - .BC1 (), \ - .BC2 () \ + .TEST_RNM (ic_data_ext_in_pkt[0][k].TEST_RNM), \ + .BC1 (ic_data_ext_in_pkt[0][k].BC1), \ + .BC2 (ic_data_ext_in_pkt[0][k].BC2) \ ); \ \ if (pt.ICACHE_BYPASS_ENABLE == 1) begin \ @@ -1004,17 +1004,17 @@ end // block: OTHERS .CLK (clk), \ .ROP ( ), \ \ - .TEST1(), \ - .RME(), \ - .RM(), \ + .TEST1(ic_tag_ext_in_pkt[i].TEST1), \ + .RME(ic_tag_ext_in_pkt[i].RME), \ + .RM(ic_tag_ext_in_pkt[i].RM), \ \ - .LS(), \ - .DS(), \ - .SD(), \ + .LS(ic_tag_ext_in_pkt[i].LS), \ + .DS(ic_tag_ext_in_pkt[i].DS), \ + .SD(ic_tag_ext_in_pkt[i].SD), \ \ - .TEST_RNM(), \ - .BC1(), \ - .BC2() \ + .TEST_RNM(ic_tag_ext_in_pkt[i].TEST_RNM), \ + .BC1(ic_tag_ext_in_pkt[i].BC1), \ + .BC2(ic_tag_ext_in_pkt[i].BC2) \ \ ); \ \ @@ -1208,17 +1208,17 @@ end // block: OTHERS .CLK (clk), \ .ROP ( ), \ \ - .TEST1 (), \ - .RME (), \ - .RM (), \ + .TEST1 (ic_tag_ext_in_pkt[0].TEST1), \ + .RME (ic_tag_ext_in_pkt[0].RME), \ + .RM (ic_tag_ext_in_pkt[0].RM), \ \ - .LS (), \ - .DS (), \ - .SD (), \ + .LS (ic_tag_ext_in_pkt[0].LS), \ + .DS (ic_tag_ext_in_pkt[0].DS), \ + .SD (ic_tag_ext_in_pkt[0].SD), \ \ - .TEST_RNM (), \ - .BC1 (), \ - .BC2 () \ + .TEST_RNM (ic_tag_ext_in_pkt[0].TEST_RNM), \ + .BC1 (ic_tag_ext_in_pkt[0].BC1), \ + .BC2 (ic_tag_ext_in_pkt[0].BC2) \ \ ); \ \