riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DSP48E1 model: test CE inputs 

Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-08-08 11:32:43 +01:00
parent d60b3c0dc8
commit 57aeb4cc01
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
techlibs/xilinx/cells_sim.v
View File

@ -593,14 +593,17 @@ module DSP48E1 (
endgenerate endgenerate
wire signed [42:0] M = A_MULT * B_MULT; wire signed [42:0] M = A_MULT * B_MULT;
wire signed [42:0] Mx = (CARRYINSEL == 3'b010) ? 43'bx : M;
reg signed [42:0] Mr = 43'b0; reg signed [42:0] Mr = 43'b0;
// Multiplier result register // Multiplier result register
generate generate
if (MREG == 1) begin always @(posedge CLK) if (RSTM) Mr <= 43'b0; else if (CEM) Mr <= M; end if (MREG == 1) begin always @(posedge CLK) if (RSTM) Mr <= 43'b0; else if (CEM) Mr <= Mx; end
else always @* Mr <= M; else always @* Mr <= Mx;
endgenerate endgenerate
wire signed [42:0] Mrx = (CARRYINSELr == 3'b010) ? 43'bx : Mr;
// X, Y and Z ALU inputs // X, Y and Z ALU inputs
reg signed [47:0] X, Y, Z; reg signed [47:0] X, Y, Z;
@ -608,7 +611,7 @@ module DSP48E1 (
// X multiplexer // X multiplexer
case (OPMODEr[1:0]) case (OPMODEr[1:0])
2'b00: X = 48'b0; 2'b00: X = 48'b0;
2'b01: begin X = $signed(Mr); 2'b01: begin X = $signed(Mrx);
`ifdef __ICARUS__ `ifdef __ICARUS__
if (OPMODEr[3:2] != 2'b01) $fatal(1, "OPMODEr[3:2] must be 2'b01 when OPMODEr[1:0] is 2'b01"); if (OPMODEr[3:2] != 2'b01) $fatal(1, "OPMODEr[3:2] must be 2'b01 when OPMODEr[1:0] is 2'b01");
`endif `endif
@ -664,7 +667,7 @@ module DSP48E1 (
if (CARRYINREG == 1) begin always @(posedge CLK) if (RSTALLCARRYIN) CARRYINr <= 1'b0; else if (CECARRYIN) CARRYINr <= CARRYIN; end if (CARRYINREG == 1) begin always @(posedge CLK) if (RSTALLCARRYIN) CARRYINr <= 1'b0; else if (CECARRYIN) CARRYINr <= CARRYIN; end
else always @* CARRYINr = CARRYIN; else always @* CARRYINr = CARRYIN;
if (MREG == 1) begin always @(posedge CLK) if (RSTALLCARRYIN) A24_xnor_B17 <= 1'b0; else if (CECARRYIN) A24_xnor_B17 <= A24_xnor_B17d; end if (MREG == 1) begin always @(posedge CLK) if (RSTALLCARRYIN) A24_xnor_B17 <= 1'b0; else if (CEM) A24_xnor_B17 <= A24_xnor_B17d; end
else always @* A24_xnor_B17 = A24_xnor_B17d; else always @* A24_xnor_B17 = A24_xnor_B17d;
endgenerate endgenerate
@ -755,7 +758,7 @@ module DSP48E1 (
wire [3:0] CARRYOUTd = (OPMODEr[3:0] == 4'b0101 || ALUMODEr[3:2] != 2'b00) ? 4'bxxxx : wire [3:0] CARRYOUTd = (OPMODEr[3:0] == 4'b0101 || ALUMODEr[3:2] != 2'b00) ? 4'bxxxx :
((ALUMODEr[0] & ALUMODEr[1]) ? ~ext_carry_out : ext_carry_out); ((ALUMODEr[0] & ALUMODEr[1]) ? ~ext_carry_out : ext_carry_out);
wire CARRYCASCOUTd = ext_carry_out[3]; wire CARRYCASCOUTd = ext_carry_out[3];
wire MULTSIGNOUTd = Mr[42]; wire MULTSIGNOUTd = Mrx[42];
generate generate
if (PREG == 1) begin if (PREG == 1) begin

9
techlibs/xilinx/tests/test_dsp_model.v
View File

@ -134,7 +134,7 @@ module testbench;
end end
{RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTCTRL, RSTD, RSTINMODE, RSTM, RSTP} = 0; {RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTCTRL, RSTD, RSTINMODE, RSTM, RSTP} = 0;
repeat (5000) begin repeat (10000) begin
clkcycle; clkcycle;
config_valid = 0; config_valid = 0;
while (!config_valid) begin while (!config_valid) begin
@ -146,6 +146,13 @@ module testbench;
D = $urandom; D = $urandom;
PCIN = {$urandom, $urandom}; PCIN = {$urandom, $urandom};
{CEA1, CEA2, CEAD, CEALUMODE, CEB1, CEB2, CEC, CECARRYIN, CECTRL} = $urandom | $urandom | $urandom;
{CED, CEINMODE, CEM, CEP} = $urandom | $urandom | $urandom | $urandom;
// Otherwise we can accidentally create illegal configs
CEINMODE = CECTRL;
CEALUMODE = CECTRL;
{RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTCTRL, RSTD, RSTINMODE, RSTM, RSTP} = $urandom & $urandom & $urandom & $urandom & $urandom & $urandom; {RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTCTRL, RSTD, RSTINMODE, RSTM, RSTP} = $urandom & $urandom & $urandom & $urandom & $urandom & $urandom;
{ALUMODE, INMODE} = $urandom; {ALUMODE, INMODE} = $urandom;
CARRYINSEL = $urandom & $urandom & $urandom; CARRYINSEL = $urandom & $urandom & $urandom;