diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-03-06 21:48:15 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-03-06 21:48:15 -0800 |
| commit | a8a08035f575545d660612ae77b58ef620fba67f (patch) | |
| tree | c02e2317f4c87ec51db46b08f35c95c81263c7cd /src/aig/gia | |
| parent | 839632140e675c628e08a00dc904b6d7cb877ba0 (diff) | |
| download | abc-a8a08035f575545d660612ae77b58ef620fba67f.tar.gz abc-a8a08035f575545d660612ae77b58ef620fba67f.tar.bz2 abc-a8a08035f575545d660612ae77b58ef620fba67f.zip | |
Changes to LUT mappers.
Diffstat (limited to 'src/aig/gia')
| -rw-r--r-- | src/aig/gia/giaIf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index f5982ea4..b2c2622f 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -1298,7 +1298,7 @@ Gia_Man_t * Gia_ManFromIfLogic( If_Man_t * pIfMan ) If_CutForEachLeaf( pIfMan, pCutBest, pIfLeaf, k ) Vec_IntPush( vLeaves, pIfLeaf->iCopy ); // perform one of the two types of mapping: with and without structures - if ( pIfMan->pPars->fUseDsd ) + if ( pIfMan->pPars->fUseDsd && pIfMan->pPars->pLutStruct ) { if ( pSat == NULL ) pSat = (sat_solver *)If_ManSatBuildXY( (int)(pIfMan->pPars->pLutStruct[0] - '0') ); @@ -1308,7 +1308,7 @@ Gia_Man_t * Gia_ManFromIfLogic( If_Man_t * pIfMan ) pIfObj->iCopy = Gia_ManFromIfLogicCreateLut( pNew, If_CutTruthW(pIfMan, pCutBest), vLeaves, vCover, vMapping, vMapping2 ); pIfObj->iCopy = Abc_LitNotCond( pIfObj->iCopy, pCutBest->fCompl ); } - else if ( pIfMan->pPars->fDeriveLuts && pIfMan->pPars->fTruth ) + else if ( (pIfMan->pPars->fDeriveLuts && pIfMan->pPars->fTruth) || pIfMan->pPars->fUseDsd ) { // perform decomposition of the cut pIfObj->iCopy = Gia_ManFromIfLogicNode( pIfMan, pNew, i, vLeaves, vLeaves2, If_CutTruthW(pIfMan, pCutBest), pIfMan->pPars->pLutStruct, vCover, vMapping, vMapping2, vPacking, (pIfMan->pPars->fEnableCheck75 || pIfMan->pPars->fEnableCheck75u), pIfMan->pPars->fEnableCheck07 ); @@ -1528,7 +1528,7 @@ Gia_Man_t * Gia_ManPerformMapping( Gia_Man_t * p, void * pp, int fNormalized ) If_Man_t * pIfMan; If_Par_t * pPars = (If_Par_t *)pp; // disable cut minimization when GIA strucure is needed - if ( !pPars->fDelayOpt && !pPars->fUserRecLib && ((!pPars->fDeriveLuts && !pPars->fUseDsd) || !pPars->pLutStruct) ) + if ( !pPars->fDelayOpt && !pPars->fUserRecLib && !pPars->fDeriveLuts && !pPars->fUseDsd ) pPars->fCutMin = 0; // reconstruct GIA according to the hierarchy manager |