diff options
| -rw-r--r-- | src/base/abci/abc.c | 7 | ||||
| -rw-r--r-- | src/map/if/ifDsd.c | 11 |
2 files changed, 15 insertions, 3 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 57263ed4..15bfc76b 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -15426,6 +15426,11 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "LUT size (%d) is more than the number of variables in the DSD manager (%d).\n", pPars->nLutSize, If_DsdManVarNum(pDsdMan) ); return 1; } + if ( pPars->fDeriveLuts && If_DsdManGetCellStr(pDsdMan) == NULL ) + { + Abc_Print( -1, "DSD manager is not matched with any particular cell.\n" ); + return 1; + } pPars->fCutMin = 1; pPars->fUseDsd = 1; If_DsdManSetNewAsUseless( pDsdMan ); @@ -16143,7 +16148,7 @@ int Abc_CommandDsdMatch( Abc_Frame_t * pAbc, int argc, char ** argv ) char * pStructCur = If_DsdManGetCellStr( pDsdMan ); if ( pStructCur && strcmp(pStructCur, pStruct) ) { - Abc_Print( -1, "DSD manager matched with cell %s needs to be cleaned before matching with cell %s.\n", pStructCur, pStruct ); + Abc_Print( -1, "DSD manager matched with cell %s should be cleaned by \"dsd_filter -m\" before matching with cell %s.\n", pStructCur, pStruct ); return 0; } Id_DsdManTuneStr( pDsdMan, pStruct, nConfls, nProcs, fVerbose ); diff --git a/src/map/if/ifDsd.c b/src/map/if/ifDsd.c index c71df9e7..90e30287 100644 --- a/src/map/if/ifDsd.c +++ b/src/map/if/ifDsd.c @@ -1160,13 +1160,13 @@ If_DsdMan_t * If_DsdManLoad( char * pFileName ) } ABC_FREE( pTruth ); RetValue = fread( &Num, 4, 1, pFile ); - if ( Num ) + if ( RetValue && Num ) { p->vPerms = Vec_WrdStart( Num ); RetValue = fread( Vec_WrdArray(p->vPerms), sizeof(word)*Num, 1, pFile ); } RetValue = fread( &Num, 4, 1, pFile ); - if ( Num ) + if ( RetValue && Num ) { p->pCellStr = ABC_CALLOC( char, Num + 1 ); RetValue = fread( p->pCellStr, sizeof(char)*Num, 1, pFile ); @@ -1196,6 +1196,8 @@ void If_DsdManMerge( If_DsdMan_t * p, If_DsdMan_t * pNew ) vMap = Vec_IntAlloc( Vec_PtrSize(&pNew->vObjs) ); Vec_IntPush( vMap, 0 ); Vec_IntPush( vMap, 1 ); + if ( p->vPerms && pNew->vPerms ) + Vec_WrdFillExtra( p->vPerms, Vec_PtrSize(&p->vObjs) + Vec_PtrSize(&pNew->vObjs), 0 ); If_DsdVecForEachNode( &pNew->vObjs, pObj, i ) { If_DsdObjForEachFaninLit( &pNew->vObjs, pObj, iFanin, k ) @@ -1203,10 +1205,14 @@ void If_DsdManMerge( If_DsdMan_t * p, If_DsdMan_t * pNew ) Id = If_DsdObjFindOrAdd( p, pObj->Type, pFanins, pObj->nFans, pObj->Type == IF_DSD_PRIME ? If_DsdObjTruth(pNew, pObj) : NULL ); if ( pObj->fMark ) If_DsdVecObjSetMark( &p->vObjs, Id ); + if ( p->vPerms && pNew->vPerms && i < Vec_WrdSize(pNew->vPerms) ) + Vec_WrdFillExtra( p->vPerms, Id, Vec_WrdEntry(pNew->vPerms, i) ); Vec_IntPush( vMap, Id ); } assert( Vec_IntSize(vMap) == Vec_PtrSize(&pNew->vObjs) ); Vec_IntFree( vMap ); + if ( p->vPerms && pNew->vPerms ) + Vec_WrdShrink( p->vPerms, Vec_PtrSize(&p->vObjs) ); } void If_DsdManCleanOccur( If_DsdMan_t * p, int fVerbose ) { @@ -1220,6 +1226,7 @@ void If_DsdManCleanMarks( If_DsdMan_t * p, int fVerbose ) If_DsdObj_t * pObj; int i; ABC_FREE( p->pCellStr ); + Vec_WrdFreeP( &p->vPerms ); If_DsdVecForEachObj( &p->vObjs, pObj, i ) pObj->fMark = 0; } |