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

zinit: resolve one more comment by @mwkmwkmwk

This commit is contained in:
Eddie Hung 2020-04-13 15:25:37 -07:00
parent c6afce7638
commit b75c5bf743
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passes/techmap/zinit.cc
View File

@ -153,6 +153,7 @@ struct ZinitPass : public Pass {
else if (cell->type.in(ID($_DFF_NN0_), ID($_DFF_NN1_), ID($_DFF_NP0_), ID($_DFF_NP1_), else if (cell->type.in(ID($_DFF_NN0_), ID($_DFF_NN1_), ID($_DFF_NP0_), ID($_DFF_NP1_),
ID($_DFF_PN0_), ID($_DFF_PN1_), ID($_DFF_PP0_), ID($_DFF_PP1_))) ID($_DFF_PN0_), ID($_DFF_PN1_), ID($_DFF_PP0_), ID($_DFF_PP1_)))
{ {
if (initval == State::S1) {
std::string t = cell->type.str(); std::string t = cell->type.str();
t[8] = (t[8] == '0' ? '1' : '0'); t[8] = (t[8] == '0' ? '1' : '0');
cell->type = t; cell->type = t;
@ -160,6 +161,7 @@ struct ZinitPass : public Pass {
} }
} }
} }
}
} ZinitPass; } ZinitPass;
PRIVATE_NAMESPACE_END PRIVATE_NAMESPACE_END

9
tests/techmap/zinit.ys
View File

@ -23,6 +23,8 @@ design -load postopt
select -assert-count 20 t:$_NOT_ select -assert-count 20 t:$_NOT_
select -assert-count 1 w:unused a:init %i select -assert-count 1 w:unused a:init %i
select -assert-count 1 w:Q a:init=13'bxxxx1xxxxxxxx %i select -assert-count 1 w:Q a:init=13'bxxxx1xxxxxxxx %i
select -assert-count 4 c:dff0 c:dff2 c:dff4 c:dff6 %% t:$_DFF_??1_ %i
select -assert-count 4 c:dff1 c:dff3 c:dff5 c:dff7 %% t:$_DFF_??0_ %i
design -reset design -reset
@ -45,6 +47,11 @@ $adff #(.WIDTH(2), .CLK_POLARITY(1), .ARST_POLARITY(1'b0), .ARST_VALUE(2'b10)) d
$adff #(.WIDTH(2), .CLK_POLARITY(0), .ARST_POLARITY(1'b1), .ARST_VALUE(2'b01)) dff9 (.CLK(C), .ARST(R), .D(D), .Q(Q[12:11])); $adff #(.WIDTH(2), .CLK_POLARITY(0), .ARST_POLARITY(1'b1), .ARST_VALUE(2'b01)) dff9 (.CLK(C), .ARST(R), .D(D), .Q(Q[12:11]));
endmodule endmodule
EOT EOT
equiv_opt -assert -map +/simcells.v -multiclock zinit
design -load postopt
select -assert-count 0 t:$_NOT_ select -assert-count 0 t:$_NOT_
select -assert-count 1 w:unused a:init %i select -assert-count 1 w:unused a:init %i
select -assert-count 1 w:Q a:init=13'bx00x100000000 %i select -assert-count 1 w:Q a:init=13'bxxxx1xxxxxxxx %i
select -assert-count 4 c:dff0 c:dff2 c:dff4 c:dff6 %% t:$_DFF_??0_ %i
select -assert-count 4 c:dff1 c:dff3 c:dff5 c:dff7 %% t:$_DFF_??1_ %i