riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1294 from YosysHQ/revert-1288-eddie/fix_1284 

Revert "Since $_ANDNOT_ is not symmetric, do not sort leaves"
This commit is contained in:
Eddie Hung 2019-08-14 10:42:18 -07:00 committed by GitHub
parent 19d6b8846f 0e128510c0
commit e2797f1308
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
passes/techmap/extract_fa.cc
View File

@ -153,10 +153,12 @@ struct ExtractFaWorker
}
}
void check_partition(SigBit root, const pool<SigBit> &leaves)
void check_partition(SigBit root, pool<SigBit> &leaves)
{
if (config.enable_ha && GetSize(leaves) == 2)
{
leaves.sort();
SigBit A = SigSpec(leaves)[0];
SigBit B = SigSpec(leaves)[1];
@ -194,6 +196,8 @@ struct ExtractFaWorker
if (config.enable_fa && GetSize(leaves) == 3)
{
leaves.sort();
SigBit A = SigSpec(leaves)[0];
SigBit B = SigSpec(leaves)[1];
SigBit C = SigSpec(leaves)[2];
@ -233,7 +237,7 @@ struct ExtractFaWorker
}
}
void find_partitions(SigBit root, const pool<SigBit> &leaves, pool<const pool<SigBit>> &cache, int maxdepth, int maxbreadth)
void find_partitions(SigBit root, pool<SigBit> &leaves, pool<pool<SigBit>> &cache, int maxdepth, int maxbreadth)
{
if (cache.count(leaves))
return;
@ -289,8 +293,8 @@ struct ExtractFaWorker
continue;
SigBit root = it.first;
const pool<SigBit> leaves = { root };
pool<const pool<SigBit>> cache;
pool<SigBit> leaves = { root };
pool<pool<SigBit>> cache;
if (config.verbose)
log(" checking %s\n", log_signal(it.first));