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

Merge pull request #845 from YosysHQ/gatecat/mlab-cluster-fix

Browse Source 
mistral: Fix MLAB clustering
This commit is contained in:
gatecat 2021-10-11 21:07:41 +01:00 committed by GitHub
commit 4e1f2d7deb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mistral/lab.cc
View File

@ -492,6 +492,12 @@ void Arch::update_alm_input_count(uint32_t lab, uint8_t alm)
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (!luts[i]) if (!luts[i])
continue; continue;
// MLAB that has been clustered with other MLABs (due to shared read port) costs no extra inputs
if (luts[i]->combInfo.mlab_group != -1 && luts[i]->constr_z > 2) {
alm_data.unique_input_count = 0;
return;
}
total_lut_inputs += luts[i]->combInfo.used_lut_input_count - luts[i]->combInfo.chain_shared_input_count; total_lut_inputs += luts[i]->combInfo.used_lut_input_count - luts[i]->combInfo.chain_shared_input_count;
} }
int shared_lut_inputs = 0; int shared_lut_inputs = 0;

5
mistral/pack.cc
View File

@ -367,8 +367,9 @@ struct MistralPacker
CellInfo *ci = group.at(i); CellInfo *ci = group.at(i);
CellInfo *base = group.at((i / cluster_size) * cluster_size); CellInfo *base = group.at((i / cluster_size) * cluster_size);
int cell_index = int(i) % cluster_size; int cell_index = int(i) % cluster_size;
int alm = i / 2; int alm = cell_index / 2;
int alm_cell = i % 2; int alm_cell = cell_index % 2;
ci->cluster = base->name;
ci->constr_abs_z = true; ci->constr_abs_z = true;
ci->constr_z = alm * 6 + alm_cell; ci->constr_z = alm * 6 + alm_cell;
if (cell_index != 0) { if (cell_index != 0) {