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

Merge remote-tracking branch 'origin/eddie/peepopt_dffmuxext' into xc7dsp

This commit is contained in:
Eddie Hung 2019-09-11 00:07:33 -07:00
parent feb3fa65a3 97e1520b13
commit 6b23c7c227
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
passes/pmgen/peepopt_shiftmul.pmg
View File

@ -50,8 +50,9 @@ code
if (GetSize(const_factor_cnst) > 20) if (GetSize(const_factor_cnst) > 20)
reject; reject;
if (GetSize(port(shift, \Y)) > const_factor) if (shift->type.in($shift, $shiftx))
reject; if (GetSize(port(shift, \Y)) > const_factor)
reject;
int factor_bits = ceil_log2(const_factor); int factor_bits = ceil_log2(const_factor);
SigSpec mul_din = port(mul, const_factor_port == \A ? \B : \A); SigSpec mul_din = port(mul, const_factor_port == \A ? \B : \A);

12
tests/various/peepopt.ys
View File

@ -5,7 +5,7 @@ endmodule
EOT EOT
prep -nokeepdc prep -nokeepdc
equiv_opt peepopt equiv_opt -assert peepopt
design -load postopt design -load postopt
clean clean
select -assert-count 1 t:$shiftx select -assert-count 1 t:$shiftx
@ -16,16 +16,16 @@ select -assert-count 0 t:$shiftx t:* %D
design -reset design -reset
read_verilog <<EOT read_verilog <<EOT
module peepopt_shiftmul_1 (output [7:0] y, input [2:0] w); module peepopt_shiftmul_1 (output [7:0] y, input [2:0] w);
assign y = 1'b1 >> (w * (3'b110)); assign y = 1'b1 >> (w * (8'b110));
endmodule endmodule
EOT EOT
prep -nokeepdc prep -nokeepdc
equiv_opt peepopt equiv_opt -assert peepopt
design -load postopt design -load postopt
clean clean
select -assert-count 1 t:$shr select -assert-count 1 t:$shr
select -assert-count 1 t:$mul select -assert-count 0 t:$mul
select -assert-count 0 t:$shr t:$mul %% t:* %D select -assert-count 0 t:$shr t:$mul %% t:* %D
#################### ####################
@ -40,7 +40,7 @@ endmodule
EOT EOT
prep -nokeepdc prep -nokeepdc
equiv_opt peepopt equiv_opt -assert peepopt
design -load postopt design -load postopt
clean clean
select -assert-count 0 t:* select -assert-count 0 t:*
@ -55,7 +55,7 @@ endmodule
EOT EOT
prep -nokeepdc prep -nokeepdc
equiv_opt peepopt equiv_opt -assert peepopt
design -load postopt design -load postopt
clean clean
select -assert-count 1 t:$dff r:WIDTH=2 %i select -assert-count 1 t:$dff r:WIDTH=2 %i