Skip to content

Commit 21fdb11

Browse files
author
Anders Ryd
committed
Fix to use the hit mask for the mpar memory
1 parent 7e1b9b7 commit 21fdb11

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

WriteVHDLSyntax.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,8 @@ def writeTopLevelMemoryType(mtypeB, memList, memInfo, extraports, delay = 0, spl
527527
wirelist += "STD_LOGIC_VECTOR(8 downto 0);\n"
528528
wirelist += " signal "+mem+"_AV_dout_nent : "
529529
wirelist += "t_arr_7b(0 to 31);\n"
530+
wirelist += " signal "+mem+"_AV_dout_mask : "
531+
wirelist += "t_arr_4b(0 to 7);\n"
530532
#FIXME this is a hack
531533
if "AS" in mem and "in" in mem :
532534
wirelist += " signal "+mem+"_V_as : "
@@ -779,6 +781,8 @@ def writeTopLevelMemoryType(mtypeB, memList, memInfo, extraports, delay = 0, spl
779781
portlist += " nent_o => "+mem+"_AV_dout_nent,\n"
780782
if "MPROJ" in mem:
781783
portlist += " mask_o => "+mem+"_AV_dout_mask,\n"
784+
if "MPAR" in mem:
785+
portlist += " mask_o => "+mem+"_AV_dout_mask,\n"
782786
else:
783787
portlist += " nent_o => open,\n"
784788

@@ -1505,7 +1509,8 @@ def writeProcCombination(module, str_ctrl_func, str_ports):
15051509
module_str += " dout => MPAR_"+module.inst[3:]+"in_V_tpar,\n"
15061510
module_str += " valid => MPAR_"+module.inst[3:]+"in_valid,\n"
15071511
module_str += " index => MPAR_"+module.inst[3:]+"in_trackletindex,\n"
1508-
module_str += " nent => MPAR_"+module.inst[3:]+"in_AV_dout_nent\n"
1512+
module_str += " nent => MPAR_"+module.inst[3:]+"in_AV_dout_nent,\n"
1513+
module_str += " mask => MPAR_"+module.inst[3:]+"in_AV_dout_mask\n"
15091514
module_str += " );\n\n"
15101515

15111516
if "VMSMER_" in module.inst:
@@ -1524,7 +1529,8 @@ def writeProcCombination(module, str_ctrl_func, str_ports):
15241529
module_str += " dout => AS_"+module.inst[7:]+"in_V_as,\n"
15251530
module_str += " valid => AS_"+module.inst[7:]+"in_valid,\n"
15261531
module_str += " index => AS_"+module.inst[7:]+"in_index(6 downto 0),\n"
1527-
module_str += " nent => AS_"+module.inst[7:]+"in_AV_dout_nent\n"
1532+
module_str += " nent => AS_"+module.inst[7:]+"in_AV_dout_nent,\n"
1533+
module_str += " mask => (others => (others => '1'))\n"
15281534
module_str += " );\n\n"
15291535

15301536
module_str += str_ctrl_func

0 commit comments

Comments
 (0)