Skip to content
Snippets Groups Projects
Commit d73a2778 authored by BRONES Romain's avatar BRONES Romain
Browse files

fix(rdl): Set memory to 32 bit words

* This is handled better by DESYRDL
parent 0775eedc
No related branches found
No related tags found
No related merge requests found
...@@ -126,8 +126,8 @@ begin ...@@ -126,8 +126,8 @@ begin
pi_en_a => pscid_table_i.en, pi_en_a => pscid_table_i.en,
pi_we_a => pscid_table_i.we, pi_we_a => pscid_table_i.we,
pi_addr_a => pscid_table_i.addr(C_W_SER_CNT-1 downto 0), pi_addr_a => pscid_table_i.addr(C_W_SER_CNT-1 downto 0),
pi_data_a => pscid_table_i.data, pi_data_a => pscid_table_i.data(C_W_PSCID-1 downto 0),
po_data_a => pscid_table_o.data, po_data_a => pscid_table_o.data(C_W_PSCID-1 downto 0),
pi_clk_b => clk, pi_clk_b => clk,
pi_en_b => '1', pi_en_b => '1',
pi_we_b => '0', pi_we_b => '0',
...@@ -135,6 +135,7 @@ begin ...@@ -135,6 +135,7 @@ begin
pi_data_b => (others => '0'), pi_data_b => (others => '0'),
po_data_b => pscid po_data_b => pscid
); );
pscid_table_o.data(31 downto C_W_PSCID) <= (others => '0');
----------------------- -----------------------
-- OUTPUT CONNEXIONS -- -- OUTPUT CONNEXIONS --
......
...@@ -148,8 +148,8 @@ begin ...@@ -148,8 +148,8 @@ begin
pi_en_a => mm_coef_i(I).en, pi_en_a => mm_coef_i(I).en,
pi_we_a => mm_coef_i(I).we, pi_we_a => mm_coef_i(I).we,
pi_addr_a => mm_coef_i(I).addr(C_W_MM_IDCNT-1 downto 0), pi_addr_a => mm_coef_i(I).addr(C_W_MM_IDCNT-1 downto 0),
pi_data_a => mm_coef_i(I).data, pi_data_a => mm_coef_i(I).data(C_W_MM_COEF-1 downto 0),
po_data_a => mm_coef_o(I).data, po_data_a => mm_coef_o(I).data(C_W_MM_COEF-1 downto 0),
pi_clk_b => clk, pi_clk_b => clk,
pi_en_b => '1', pi_en_b => '1',
pi_we_b => '0', pi_we_b => '0',
...@@ -157,6 +157,7 @@ begin ...@@ -157,6 +157,7 @@ begin
pi_data_b => (others => '0'), pi_data_b => (others => '0'),
po_data_b => table_coefx po_data_b => table_coefx
); );
mm_coef_o(I).data(31 downto C_W_MM_COEF) <= (others => '0');
inst_coefy_table: entity desy.ram_tdp inst_coefy_table: entity desy.ram_tdp
generic map( generic map(
...@@ -168,8 +169,8 @@ begin ...@@ -168,8 +169,8 @@ begin
pi_en_a => mm_coef_i(I+C_N_MM_PSC/2).en, pi_en_a => mm_coef_i(I+C_N_MM_PSC/2).en,
pi_we_a => mm_coef_i(I+C_N_MM_PSC/2).we, pi_we_a => mm_coef_i(I+C_N_MM_PSC/2).we,
pi_addr_a => mm_coef_i(I+C_N_MM_PSC/2).addr(C_W_MM_IDCNT-1 downto 0), pi_addr_a => mm_coef_i(I+C_N_MM_PSC/2).addr(C_W_MM_IDCNT-1 downto 0),
pi_data_a => mm_coef_i(I+C_N_MM_PSC/2).data, pi_data_a => mm_coef_i(I+C_N_MM_PSC/2).data(C_W_MM_COEF-1 downto 0),
po_data_a => mm_coef_o(I+C_N_MM_PSC/2).data, po_data_a => mm_coef_o(I+C_N_MM_PSC/2).data(C_W_MM_COEF-1 downto 0),
pi_clk_b => clk, pi_clk_b => clk,
pi_en_b => '1', pi_en_b => '1',
pi_we_b => '0', pi_we_b => '0',
...@@ -177,6 +178,7 @@ begin ...@@ -177,6 +178,7 @@ begin
pi_data_b => (others => '0'), pi_data_b => (others => '0'),
po_data_b => table_coefy po_data_b => table_coefy
); );
mm_coef_o(I+C_N_MM_PSC/2).data(31 downto C_W_MM_COEF) <= (others => '0');
------------------------------------------------------------------ ------------------------------------------------------------------
-- MULT ACCU -- MULT ACCU
......
...@@ -51,26 +51,26 @@ addrmap corr_matrixpi { ...@@ -51,26 +51,26 @@ addrmap corr_matrixpi {
mem { mem {
desc = "X Reference orbit."; desc = "X Reference orbit.";
memwidth = `C_W_BPMPOS; memwidth = 32;
mementries = 2**`C_W_MM_IDCNT; mementries = 2**`C_W_MM_IDCNT;
} external REFORBITX; } external REFORBITX;
mem { mem {
desc = "Y Reference orbit."; desc = "Y Reference orbit.";
memwidth = `C_W_BPMPOS; memwidth = 32;
mementries = 2**`C_W_MM_IDCNT; mementries = 2**`C_W_MM_IDCNT;
} external REFORBITY; } external REFORBITY;
mem { mem {
desc = "PSC identifier table."; desc = "PSC identifier table.";
memwidth = `C_W_PSCID; memwidth = 32;
mementries = `C_N_MM_PSC; mementries = `C_W_PSCID;
} external PSCIDTABLE; } external PSCIDTABLE;
mem { mem {
desc = "Matrix multiplication coefficients."; desc = "Matrix multiplication coefficients.";
memwidth = `C_W_MM_COEF; memwidth = 32;
mementries = 2**`C_W_MM_IDCNT; mementries = 2**`C_W_MM_IDCNT;
} external MATRIXCOEF[`C_N_MM_PSC]; } external MATRIXCOEF[`C_N_MM_PSC];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment