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

DSP48E1 sim model: Comb, no pre-adder, mode working 

Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-08-08 10:26:40 +01:00
parent f0f352e971
commit f6605c7dc0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
techlibs/xilinx/cells_sim.v
View File

@ -689,7 +689,7 @@ module DSP48E1 (
// ALU core // ALU core
wire [47:0] Z_muxinv = ALUMODEr[0] ? ~Z : Z; wire [47:0] Z_muxinv = ALUMODEr[0] ? ~Z : Z;
wire [47:0] xor_xyz = X ^ Y ^ Z_muxinv; wire [47:0] xor_xyz = X ^ Y ^ Z_muxinv;
wire [47:0] maj_xyz = (X & Y) | (X & Z) | (X & Y); wire [47:0] maj_xyz = (X & Y) | (X & Z_muxinv) | (Y & Z_muxinv);
wire [47:0] xor_xyz_muxed = ALUMODEr[3] ? maj_xyz : xor_xyz; wire [47:0] xor_xyz_muxed = ALUMODEr[3] ? maj_xyz : xor_xyz;
wire [47:0] maj_xyz_gated = ALUMODEr[2] ? 48'b0 : maj_xyz; wire [47:0] maj_xyz_gated = ALUMODEr[2] ? 48'b0 : maj_xyz;
@ -745,7 +745,8 @@ module DSP48E1 (
wire signed [47:0] Pd = ALUMODEr[1] ? ~alu_sum : alu_sum; wire signed [47:0] Pd = ALUMODEr[1] ? ~alu_sum : alu_sum;
initial P = 48'b0; initial P = 48'b0;
wire [3:0] CARRYOUTd = (ALUMODEr[0] & ALUMODEr[1]) ? ~ext_carry_out : ext_carry_out; 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);
wire CARRYCASCOUTd = ext_carry_out[3]; wire CARRYCASCOUTd = ext_carry_out[3];
wire MULTSIGNOUTd = Mr[42]; wire MULTSIGNOUTd = Mr[42];

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

@ -35,7 +35,7 @@ module testbench;
reg CLK; reg CLK;
reg CEA1, CEA2, CEAD, CEALUMODE, CEB1, CEB2, CEC, CECARRYIN, CECTRL; reg CEA1, CEA2, CEAD, CEALUMODE, CEB1, CEB2, CEC, CECARRYIN, CECTRL;
reg CED, CEINMODE, CEM, CEP; reg CED, CEINMODE, CEM, CEP;
reg RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTD, RSTINMODE, RSTM, RSTP; reg RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTCTRL, RSTD, RSTINMODE, RSTM, RSTP;
reg [29:0] A, ACIN; reg [29:0] A, ACIN;
reg [17:0] B, BCIN; reg [17:0] B, BCIN;
reg [47:0] C; reg [47:0] C;
@ -61,6 +61,8 @@ module testbench;
integer errcount = 0; integer errcount = 0;
reg ERROR_FLAG = 0;
task clkcycle; task clkcycle;
begin begin
#5; #5;
@ -68,14 +70,16 @@ module testbench;
#10; #10;
CLK = ~CLK; CLK = ~CLK;
#2; #2;
ERROR_FLAG = 0;
if (REF_P !== P) begin if (REF_P !== P) begin
$display("ERROR at %1t: REF_P=%b UUT_P=%b DIFF=%b", $time, REF_P, P, REF_P ^ P); $display("ERROR at %1t: REF_P=%b UUT_P=%b DIFF=%b", $time, REF_P, P, REF_P ^ P);
errcount = errcount + 1; errcount = errcount + 1;
ERROR_FLAG = 1;
end end
if (REF_CARRYOUT !== CARRYOUT) begin if (REF_CARRYOUT !== CARRYOUT) begin
$display("ERROR at %1t: REF_CARRYOUT=%b UUT_CARRYOUT=%b", $time, REF_CARRYOUT, CARRYOUT); $display("ERROR at %1t: REF_CARRYOUT=%b UUT_CARRYOUT=%b", $time, REF_CARRYOUT, CARRYOUT);
errcount = errcount + 1; errcount = errcount + 1;
ERROR_FLAG = 1;
end end
#3; #3;
end end
@ -114,7 +118,7 @@ module testbench;
{ALUMODE, CARRYINSEL, INMODE} = 0; {ALUMODE, CARRYINSEL, INMODE} = 0;
{OPMODE, CARRYCASCIN, CARRYIN, MULTSIGNIN} = 0; {OPMODE, CARRYCASCIN, CARRYIN, MULTSIGNIN} = 0;
{RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTD, RSTINMODE, RSTM, RSTP} = ~0; {RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTCTRL, RSTD, RSTINMODE, RSTM, RSTP} = ~0;
#5; #5;
CLK = 1'b1; CLK = 1'b1;
#10; #10;
@ -123,7 +127,7 @@ module testbench;
CLK = 1'b1; CLK = 1'b1;
#10; #10;
CLK = 1'b0; CLK = 1'b0;
{RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTD, RSTINMODE, RSTM, RSTP} = 0; {RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTCTRL, RSTD, RSTINMODE, RSTM, RSTP} = 0;
repeat (300) begin repeat (300) begin
clkcycle; clkcycle;
@ -137,8 +141,8 @@ module testbench;
D = $urandom; D = $urandom;
PCIN = {$urandom, $urandom}; PCIN = {$urandom, $urandom};
{RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTD, RSTINMODE, RSTM, RSTP} = $urandom & $urandom & $urandom; {RSTA, RSTALLCARRYIN, RSTALUMODE, RSTB, RSTC, RSTCTRL, RSTD, RSTINMODE, RSTM, RSTP} = $urandom & $urandom & $urandom & $urandom & $urandom & $urandom;
{ALUMODE, CARRYINSEL, INMODE} = $urandom & $urandom & $urandom; {ALUMODE, CARRYINSEL, INMODE} = $urandom;
OPMODE = $urandom; OPMODE = $urandom;
if ($urandom & 1'b1) if ($urandom & 1'b1)
OPMODE[3:0] = 4'b0101; // test multiply more than other modes OPMODE[3:0] = 4'b0101; // test multiply more than other modes