mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-10-29 18:52:30 +00:00
Code Activity

Merge pull request #4807 from YosysHQ/emil/dfflibmap-test-dffe

Browse source 
dfflibmap: cover enable inference with test
This commit is contained in:
Emil J 2024-12-10 12:41:11 +01:00 • committed by GitHub
commit 87736a2bf9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 51 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/techmap/dfflibmap-sim.v
View file

@ -20,3 +20,12 @@ always @(posedge CLK, posedge CLEAR, posedge PRESET)
assign QN = ~Q; assign QN = ~Q;
endmodule endmodule
module dffe(input CLK, EN, D, output reg Q, output QN);
always @(negedge CLK)
if (EN) Q <= D;
assign QN = ~Q;
endmodule

32
tests/techmap/dfflibmap.lib
View file

@ -5,7 +5,7 @@ library(test) {
ff("IQ", "IQN") { ff("IQ", "IQN") {
next_state : "D"; next_state : "D";
clocked_on : "!CLK"; clocked_on : "!CLK";
} }
pin(D) { pin(D) {
direction : input; direction : input;
} }
@ -19,7 +19,7 @@ library(test) {
pin(QN) { pin(QN) {
direction: output; direction: output;
function : "IQN"; function : "IQN";
} }
} }
cell (dffsr) { cell (dffsr) {
area : 6; area : 6;
@ -30,7 +30,7 @@ library(test) {
preset : "PRESET"; preset : "PRESET";
clear_preset_var1 : L; clear_preset_var1 : L;
clear_preset_var2 : L; clear_preset_var2 : L;
} }
pin(D) { pin(D) {
direction : input; direction : input;
} }
@ -50,6 +50,30 @@ library(test) {
pin(QN) { pin(QN) {
direction: output; direction: output;
function : "IQN"; function : "IQN";
} }
}
cell (dffe) {
area : 6;
ff("IQ", "IQN") {
next_state : "(D&EN) | (IQ&!EN)";
clocked_on : "!CLK";
}
pin(D) {
direction : input;
}
pin(EN) {
direction : input;
}
pin(CLK) {
direction : input;
}
pin(Q) {
direction: output;
function : "IQ";
}
pin(QN) {
direction: output;
function : "IQN";
}
} }
} }

23
tests/techmap/dfflibmap.ys
View file

@ -1,14 +1,15 @@
read_verilog -icells <<EOT read_verilog -icells <<EOT
module top(input C, D, S, R, output [9:0] Q); module top(input C, D, E, S, R, output [11:0] Q);
$_DFF_P_ ff0 (.C(C), .D(D), .Q(Q[0])); $_DFF_P_ ff0 (.C(C), .D(D), .Q(Q[0]));
$_DFF_PP0_ ff1 (.C(C), .D(D), .R(R), .Q(Q[1])); $_DFF_PP0_ ff1 (.C(C), .D(D), .R(R), .Q(Q[1]));
$_DFF_PP1_ ff2 (.C(C), .D(D), .R(R), .Q(Q[2])); $_DFF_PP1_ ff2 (.C(C), .D(D), .R(R), .Q(Q[2]));
$_DFFSR_PPP_ ff3 (.C(C), .D(D), .R(R), .S(S), .Q(Q[3])); $_DFFSR_PPP_ ff3 (.C(C), .D(D), .R(R), .S(S), .Q(Q[3]));
$_DFFSR_NNN_ ff4 (.C(C), .D(D), .R(R), .S(S), .Q(Q[4])); $_DFFSR_NNN_ ff4 (.C(C), .D(D), .R(R), .S(S), .Q(Q[4]));
$_DFFE_PP_ ff5 (.C(C), .D(D), .E(E), .Q(Q[5]));
assign Q[9:5] = ~Q[4:0]; assign Q[11:6] = ~Q[5:0];
endmodule endmodule
@ -29,23 +30,25 @@ design -load orig
dfflibmap -liberty dfflibmap.lib dfflibmap -liberty dfflibmap.lib
clean clean
select -assert-count 4 t:$_NOT_ select -assert-count 5 t:$_NOT_
select -assert-count 1 t:dffn select -assert-count 1 t:dffn
select -assert-count 4 t:dffsr select -assert-count 4 t:dffsr
select -assert-none t:dffn t:dffsr t:$_NOT_ %% %n t:* %i select -assert-count 1 t:dffe
select -assert-none t:dffn t:dffsr t:dffe t:$_NOT_ %% %n t:* %i
design -load orig design -load orig
dfflibmap -prepare -liberty dfflibmap.lib dfflibmap -prepare -liberty dfflibmap.lib
select -assert-count 9 t:$_NOT_ select -assert-count 11 t:$_NOT_
select -assert-count 1 t:$_DFF_N_ select -assert-count 1 t:$_DFF_N_
select -assert-count 4 t:$_DFFSR_PPP_ select -assert-count 4 t:$_DFFSR_PPP_
select -assert-none t:$_DFF_N_ t:$_DFFSR_PPP_ t:$_NOT_ %% %n t:* %i select -assert-count 1 t:$_DFFE_NP_
select -assert-none t:$_DFF_N_ t:$_DFFSR_PPP_ t:$_DFFE_NP_ t:$_NOT_ %% %n t:* %i
design -load orig design -load orig
dfflibmap -map-only -liberty dfflibmap.lib dfflibmap -map-only -liberty dfflibmap.lib
select -assert-count 5 t:$_NOT_ select -assert-count 6 t:$_NOT_
select -assert-count 0 t:dffn select -assert-count 0 t:dffn
select -assert-count 1 t:dffsr select -assert-count 1 t:dffsr
@ -54,10 +57,11 @@ dfflibmap -prepare -liberty dfflibmap.lib
dfflibmap -map-only -liberty dfflibmap.lib dfflibmap -map-only -liberty dfflibmap.lib
clean clean
select -assert-count 4 t:$_NOT_ select -assert-count 5 t:$_NOT_
select -assert-count 1 t:dffn select -assert-count 1 t:dffn
select -assert-count 4 t:dffsr select -assert-count 4 t:dffsr
select -assert-none t:dffn t:dffsr t:$_NOT_ %% %n t:* %i select -assert-count 1 t:dffe
select -assert-none t:dffn t:dffsr t:dffe t:$_NOT_ %% %n t:* %i
design -load orig design -load orig
dfflibmap -prepare -liberty dfflibmap_dffn.lib -liberty dfflibmap_dffsr.lib dfflibmap -prepare -liberty dfflibmap_dffn.lib -liberty dfflibmap_dffsr.lib
@ -75,3 +79,4 @@ clean
select -assert-count 0 t:dffn select -assert-count 0 t:dffn
select -assert-count 5 t:dffsr select -assert-count 5 t:dffsr
select -assert-count 1 t:dffe