diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-02-25 07:50:11 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-02-25 07:50:11 -0800 |
| commit | 9005c6bfe2b2bfd491002f17045af8c1e8feb12e (patch) | |
| tree | 240c48138245d812914288d9ec0e2ec0c9143277 /src | |
| parent | 7e0f7eba792e7fc854345d45f6f49bb562e63d3a (diff) | |
| download | abc-9005c6bfe2b2bfd491002f17045af8c1e8feb12e.tar.gz abc-9005c6bfe2b2bfd491002f17045af8c1e8feb12e.tar.bz2 abc-9005c6bfe2b2bfd491002f17045af8c1e8feb12e.zip | |
Changes to LUT mappers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/if/if.h | 2 | ||||
| -rw-r--r-- | src/map/if/ifDsd.c | 12 | ||||
| -rw-r--r-- | src/map/if/ifMap.c | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/map/if/if.h b/src/map/if/if.h index 37728fcb..8821d06f 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -516,7 +516,7 @@ extern int If_CluCheckExt3( void * p, word * pTruth, int nVars, int /*=== ifDsd.c =============================================================*/ extern If_DsdMan_t * If_DsdManAlloc( int nLutSize ); extern void If_DsdManDump( If_DsdMan_t * p ); -extern void If_DsdManPrint( If_DsdMan_t * p, char * pFileName ); +extern void If_DsdManPrint( If_DsdMan_t * p, char * pFileName, int fVerbose ); extern void If_DsdManFree( If_DsdMan_t * p ); extern int If_DsdManCompute( If_DsdMan_t * p, word * pTruth, int nLeaves, unsigned char * pPerm ); /*=== ifLib.c =============================================================*/ diff --git a/src/map/if/ifDsd.c b/src/map/if/ifDsd.c index 923e188a..90874b87 100644 --- a/src/map/if/ifDsd.c +++ b/src/map/if/ifDsd.c @@ -275,8 +275,8 @@ void If_DsdManFree( If_DsdMan_t * p ) { int fVerbose = 0; // If_DsdManDump( p ); - If_DsdManPrint( p, NULL ); - Vec_MemDumpTruthTables( p->vTtMem, NULL, p->nVars ); + If_DsdManPrint( p, NULL, 0 ); + Vec_MemDumpTruthTables( p->vTtMem, "dumpdsd", p->nVars ); if ( fVerbose ) { Abc_PrintTime( 1, "Time begin ", p->timeBeg ); @@ -343,7 +343,7 @@ void If_DsdManPrintOne( FILE * pFile, If_DsdMan_t * p, int iObjId, unsigned char fprintf( pFile, "\n" ); assert( nSupp == If_DsdVecObjSuppSize(p->vObjs, iObjId) ); } -void If_DsdManPrint( If_DsdMan_t * p, char * pFileName ) +void If_DsdManPrint( If_DsdMan_t * p, char * pFileName, int fVerbose ) { If_DsdObj_t * pObj; int CountNonDsd = 0, CountNonDsdStr = 0; @@ -372,6 +372,8 @@ void If_DsdManPrint( If_DsdMan_t * p, char * pFileName ) // If_DsdManHashProfile( p ); // If_DsdManDump( p ); // return; + if ( !fVerbose ) + return; If_DsdVecForEachObj( p->vObjs, pObj, i ) { // if ( i == 50 ) @@ -844,8 +846,10 @@ int If_DsdManAddDsd( If_DsdMan_t * p, char * pDsd, word * pTruth, unsigned char int iRes = -1, fCompl = 0; if ( *pDsd == '!' ) pDsd++, fCompl = 1; - if ( Dau_DsdIsConst(pDsd) ) + if ( Dau_DsdIsConst0(pDsd) ) iRes = 0; + else if ( Dau_DsdIsConst1(pDsd) ) + iRes = 1; else if ( Dau_DsdIsVar(pDsd) ) { pPerm[(*pnSupp)++] = Dau_DsdReadVar(pDsd); diff --git a/src/map/if/ifMap.c b/src/map/if/ifMap.c index 2c9319fe..c22d8604 100644 --- a/src/map/if/ifMap.c +++ b/src/map/if/ifMap.c @@ -251,7 +251,7 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep } } } - if ( p->pPars->fUseDsd ) + if ( p->pPars->fUseDsd && Abc_Lit2Var(pCut->iCutFunc) == Vec_MemEntryNum(p->vTtMem)-1 ) pCut->iCutDsd = If_DsdManCompute( p->pIfDsdMan, If_CutTruthW(p, pCut), pCut->nLeaves, (unsigned char *)pCut->pPerm ); // compute the application-specific cost and depth |