caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix AC-3 algorithm

Browse Source 
Signed-off-by: Maciej Dudek <mdudek@antmicro.com>
This commit is contained in:
Maciej Dudek 2021-09-21 20:48:50 +02:00
parent b12119d8e8
commit 44def159cc
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fpga_interchange/arch_pack_clusters.cc
View File

@ -505,23 +505,28 @@ bool reduce(uint32_t x, uint32_t y, const ClusterPOD *cluster, dict<uint32_t, po
for (const auto &x_cell : domain[x]){ for (const auto &x_cell : domain[x]){
bool found = false; bool found = false;
for (const auto &y_cell : domain[y]){ for (const auto &y_cell : domain[y]){
found = true;
for (const auto edge : cluster->connection_graph[x].connections[counter].edges){ for (const auto edge : cluster->connection_graph[x].connections[counter].edges){
if (!x_cell->ports.count(IdString(edge.cell_pin)) || !y_cell->ports.count(IdString(edge.other_cell_pin))) if (!x_cell->ports.count(IdString(edge.cell_pin)) || !y_cell->ports.count(IdString(edge.other_cell_pin))){
found = false;
break; break;
}
const auto x_net = x_cell->ports[IdString(edge.cell_pin)].net; const auto x_net = x_cell->ports[IdString(edge.cell_pin)].net;
const auto y_net = y_cell->ports[IdString(edge.other_cell_pin)].net; const auto y_net = y_cell->ports[IdString(edge.other_cell_pin)].net;
if (x_net != y_net) if (x_net != y_net){
found = false;
break; break;
}
bool x_driver = x_net->driver.cell == x_cell; bool x_driver = x_net->driver.cell == x_cell;
bool y_driver = y_net->driver.cell == y_cell; bool y_driver = y_net->driver.cell == y_cell;
if ((edge.dir != 0 || !y_driver) && (edge.dir != 1 || !x_driver) && (edge.dir != 2 || y_driver || x_driver)) if ((edge.dir != 0 || !y_driver) && (edge.dir != 1 || !x_driver) && (edge.dir != 2 || y_driver || x_driver)){
found = false;
break; break;
found = true; }
} }
if (found){ if (found)
break; break;
}
} }
if (!found) if (!found)
remove_cell.push_back(x_cell); remove_cell.push_back(x_cell);
@ -544,9 +549,12 @@ void binary_constraint_check(const ClusterPOD *cluster,
uint32_t x,y; uint32_t x,y;
x = arc.first; y = arc.second; x = arc.first; y = arc.second;
if (reduce(x, y, cluster, idx_to_cells, ctx)){ if (reduce(x, y, cluster, idx_to_cells, ctx)){
for (const auto &connection : cluster->connection_graph[arc.first].connections) for (const auto &node : cluster->connection_graph){
if (connection.target_idx != y) if (node.idx != arc.first)
workqueue.push(std::pair<uint32_t, uint32_t>(arc.first, connection.target_idx)); for (const auto &connection : node.connections)
if (connection.target_idx == arc.first)
workqueue.push(std::pair<uint32_t, uint32_t>(node.idx, arc.first));
}
} }
} }
} }