Skip to content

Commit 55dcf0e

Browse files
committed
tests: fix dfflibmap test - false negative conflict multiple -liberty vs enable inference
1 parent 87736a2 commit 55dcf0e

File tree

3 files changed

+52
-27
lines changed

3 files changed

+52
-27
lines changed

tests/techmap/dfflibmap.ys

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,15 @@ select -assert-count 1 t:dffe
6464
select -assert-none t:dffn t:dffsr t:dffe t:$_NOT_ %% %n t:* %i
6565

6666
design -load orig
67-
dfflibmap -prepare -liberty dfflibmap_dffn.lib -liberty dfflibmap_dffsr.lib
68-
dfflibmap -map-only -liberty dfflibmap_dffn.lib -liberty dfflibmap_dffsr.lib
67+
dfflibmap -prepare -liberty dfflibmap_dffn_dffe.lib -liberty dfflibmap_dffsr.lib
68+
dfflibmap -map-only -liberty dfflibmap_dffn_dffe.lib -liberty dfflibmap_dffsr.lib
6969
clean
7070

71-
select -assert-count 4 t:$_NOT_
71+
select -assert-count 5 t:$_NOT_
7272
select -assert-count 1 t:dffn
73+
select -assert-count 1 t:dffe
7374
select -assert-count 4 t:dffsr
74-
select -assert-none t:dffn t:dffsr t:$_NOT_ %% %n t:* %i
75+
select -assert-none t:dffn t:dffsr t:dffe t:$_NOT_ %% %n t:* %i
7576

7677
design -load orig
7778
dfflibmap -liberty dfflibmap.lib -dont_use *ffn

tests/techmap/dfflibmap_dffn.lib

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
library(test) {
2+
cell (dffn) {
3+
area : 6;
4+
ff("IQ", "IQN") {
5+
next_state : "D";
6+
clocked_on : "!CLK";
7+
}
8+
pin(D) {
9+
direction : input;
10+
}
11+
pin(CLK) {
12+
direction : input;
13+
}
14+
pin(Q) {
15+
direction: output;
16+
function : "IQ";
17+
}
18+
pin(QN) {
19+
direction: output;
20+
function : "IQN";
21+
}
22+
}
23+
cell (dffe) {
24+
area : 6;
25+
ff("IQ", "IQN") {
26+
next_state : "(D&EN) | (IQ&!EN)";
27+
clocked_on : "!CLK";
28+
}
29+
pin(D) {
30+
direction : input;
31+
}
32+
pin(EN) {
33+
direction : input;
34+
}
35+
pin(CLK) {
36+
direction : input;
37+
}
38+
pin(Q) {
39+
direction: output;
40+
function : "IQ";
41+
}
42+
pin(QN) {
43+
direction: output;
44+
function : "IQN";
45+
}
46+
}
47+
}

0 commit comments

Comments
 (0)