diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2019-09-19 16:49:36 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2019-09-19 16:49:36 -0700 |
| commit | 390adc39caee1cafbeca46a92f73f349ec318e75 (patch) | |
| tree | 09d55fa2b12b6315de4b75ebc0b3d79914528939 /src/aig | |
| parent | 3a1705e8bb336ee373345701f75c94a7a1455304 (diff) | |
| download | abc-390adc39caee1cafbeca46a92f73f349ec318e75.tar.gz abc-390adc39caee1cafbeca46a92f73f349ec318e75.tar.bz2 abc-390adc39caee1cafbeca46a92f73f349ec318e75.zip | |
Making &mfs work with boxes larger than 6 inputs. Adding option &if -w to print delay profile.
Diffstat (limited to 'src/aig')
| -rw-r--r-- | src/aig/gia/giaIf.c | 7 | ||||
| -rw-r--r-- | src/aig/gia/giaMfs.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index 53e1953c..c22a63a7 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -2331,6 +2331,13 @@ Gia_Man_t * Gia_ManPerformMappingInt( Gia_Man_t * p, If_Par_t * pPars ) pNew->pName = Abc_UtilStrsav( p->pName ); pNew->pSpec = Abc_UtilStrsav( p->pSpec ); Gia_ManSetRegNum( pNew, Gia_ManRegNum(p) ); + // print delay trace + if ( pPars->fVerboseTrace ) + { + pNew->pLutLib = pPars->pLutLib; + Gia_ManDelayTraceLutPrint( pNew, 1 ); + pNew->pLutLib = NULL; + } return pNew; } Gia_Man_t * Gia_ManPerformMapping( Gia_Man_t * p, void * pp ) diff --git a/src/aig/gia/giaMfs.c b/src/aig/gia/giaMfs.c index 0ddc00ae..2d9d09e8 100644 --- a/src/aig/gia/giaMfs.c +++ b/src/aig/gia/giaMfs.c @@ -67,7 +67,7 @@ Sfm_Ntk_t * Gia_ManExtractMfs( Gia_Man_t * p ) int nRealPos = nBoxes ? Tim_ManPoNum(pManTime) : Gia_ManPoNum(p); int i, j, k, curCi, curCo, nBoxIns, nBoxOuts; int Id, iFan, nMfsVars, nBbIns = 0, nBbOuts = 0, Counter = 0; - assert( !p->pAigExtra || Gia_ManPiNum(p->pAigExtra) <= 6 ); + //assert( !p->pAigExtra || Gia_ManPiNum(p->pAigExtra) <= 6 ); if ( pManTime ) Tim_ManBlackBoxIoNum( pManTime, &nBbIns, &nBbOuts ); // skip PIs due to box outputs Counter += nBbOuts; @@ -148,7 +148,7 @@ Sfm_Ntk_t * Gia_ManExtractMfs( Gia_Man_t * p ) for ( i = 0; i < nBoxIns; i++ ) Vec_IntPush( vLeaves, Gia_ObjId(p->pAigExtra, Gia_ManCi(p->pAigExtra, i)) ); // iterate through box outputs - if ( !Tim_ManBoxIsBlack(pManTime, k) ) + if ( !Tim_ManBoxIsBlack(pManTime, k) && Tim_ManBoxInputNum(pManTime, k) <= 6 ) { for ( j = 0; j < nBoxOuts; j++ ) { |