luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #523 from fxreichl/master 

Improve support for -D 3 together with -X
This commit is contained in:
alanminko 2026-07-02 12:55:08 +07:00 committed by GitHub
parent a082d1ba3a feaf7a773d
commit bcfdf59228
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/opt/eslim/eslimCirMan.cpp
View File

@ -506,6 +506,22 @@ namespace eSLIM {
fan1negated = (fan1negated != is_node_negated[(pe->fanins[0])->node_id]);
fan2negated = (fan2negated != is_node_negated[(pe->fanins[1])->node_id]);
// We need to remove gates with duplicate fanins.
// We do not use simplifyDuplicateFanins as it does not propagate duplicate fanins.
if (fan1 == fan2) {
if ((fan1negated != fan2negated ) || is_xor) {
assert (!negate_and);
node_ids[node_id] = const_false_id;
is_node_negated[node_id] = negate_and;
return const_false_id;
} else {
node_ids[node_id] = fan1;
// Gates are assumed to be normal -> x = !a && !a (x = !a || !a) is not possible.
is_node_negated[node_id] = is_node_negated[(pe->fanins[1])->node_id];
return fan1;
}
}
int id;
if (is_xor) {
id = Gia_ManAppendXor(pGia, Abc_LitNotCond(fan1, fan1negated), Abc_LitNotCond(fan2, fan2negated));
@ -523,7 +539,7 @@ namespace eSLIM {
Gia_Man_t* eSLIMCirMan::eSLIMCirManToGia() {
simplifyDuplicateFanins();
// simplifyDuplicateFanins();
Gia_Man_t * pNew = Gia_ManStart( getNofObjs() );
std::vector<int> node_ids(nodes.size(), 0);
@ -536,15 +552,6 @@ namespace eSLIM {
}
for (int i = nof_pis + 1; i < nodes.size() - nof_pos; i++) {
// It is possible (but rather unlikley) that a gate has only a single fanin
// For instance it is possible that internally a gate has duplicate fanins.
// simplifyDuplicateFanins removes duplicate fanins
if (nodes[i]->getNFanins() == 1) {
eSLIMCirObj* pe = getpObj(i);
node_ids[i] = node_ids[(pe->fanins[0])->node_id];
is_node_negated[i] = pe->tt == 1;
continue;
}
assert(nodes[i]->getNFanins() == 2);
addGiaGate( pNew, i, node_ids, is_node_negated );
}

7
src/opt/eslim/relationSynthesiser.cpp
View File

@ -532,7 +532,12 @@ namespace eSLIM {
std::vector<int> clause (gate_output_variables[i].begin(), gate_output_variables[i].end());
clause.reserve(max_size - i + 1);
for (int j = i + 1; j < max_size; j++) {
clause.push_back(selection_variables[j][subcir.inputs.size() + i]);
// clause.push_back(selection_variables[j][subcir.inputs.size() + i]);
int isused = getNewVariable();
// The gate is used by another (active) gate.
solver.addClause({-isused, selection_variables[j][subcir.inputs.size() + i]});
solver.addClause({-isused, gate_activation_variables[j]});
clause.push_back(isused);
}
clause.push_back(-gate_activation_variables[i]);
solver.addClause(clause);