diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-05-27 14:39:08 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-05-27 14:39:08 -0700 |
| commit | 94356f0d1fa8e671303299717f631ecf0ca2f17e (patch) | |
| tree | f784ecefa687c25873f89f554738616d7946b2e4 /src/base/abci | |
| parent | 755935a6df4c84377aff1c67a5d802062cf925e6 (diff) | |
| download | abc-94356f0d1fa8e671303299717f631ecf0ca2f17e.tar.gz abc-94356f0d1fa8e671303299717f631ecf0ca2f17e.tar.bz2 abc-94356f0d1fa8e671303299717f631ecf0ca2f17e.zip | |
Several small changes to the MFS packages.
Diffstat (limited to 'src/base/abci')
| -rw-r--r-- | src/base/abci/abc.c | 6 | ||||
| -rw-r--r-- | src/base/abci/abcMfs.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 4493c361..d5bcb48f 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -4361,9 +4361,9 @@ int Abc_CommandMfs( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Command line switch \"-M\" should be followed by an integer.\n" ); goto usage; } - pPars->nWinSizeMax = atoi(argv[globalUtilOptind]); + pPars->nWinMax = atoi(argv[globalUtilOptind]); globalUtilOptind++; - if ( pPars->nWinSizeMax < 0 ) + if ( pPars->nWinMax < 0 ) goto usage; break; case 'L': @@ -4450,7 +4450,7 @@ usage: Abc_Print( -2, "\t-W <num> : the number of levels in the TFO cone (0 <= num) [default = %d]\n", pPars->nWinTfoLevs ); Abc_Print( -2, "\t-F <num> : the max number of fanouts to skip (1 <= num) [default = %d]\n", pPars->nFanoutsMax ); Abc_Print( -2, "\t-D <num> : the max depth nodes to try (0 = no limit) [default = %d]\n", pPars->nDepthMax ); - Abc_Print( -2, "\t-M <num> : the max node count of windows to consider (0 = no limit) [default = %d]\n", pPars->nWinSizeMax ); + Abc_Print( -2, "\t-M <num> : the max node count of windows to consider (0 = no limit) [default = %d]\n", pPars->nWinMax ); Abc_Print( -2, "\t-L <num> : the max increase in node level after resynthesis (0 <= num) [default = %d]\n", pPars->nGrowthLevel ); Abc_Print( -2, "\t-C <num> : the max number of conflicts in one SAT run (0 = no limit) [default = %d]\n", pPars->nBTLimit ); Abc_Print( -2, "\t-d : toggle performing redundancy removal [default = %s]\n", pPars->fRrOnly? "yes": "no" ); diff --git a/src/base/abci/abcMfs.c b/src/base/abci/abcMfs.c index 76dfb162..dfd950dc 100644 --- a/src/base/abci/abcMfs.c +++ b/src/base/abci/abcMfs.c @@ -74,9 +74,10 @@ Vec_Ptr_t * Abc_NtkAssignIDs2( Abc_Ntk_t * pNtk ) vNodes = Vec_PtrAlloc( Abc_NtkNodeNum(pNtk) ); Abc_NtkForEachNode( pNtk, pObj, i ) { + pObj->iTemp = Abc_NtkCiNum(pNtk) + Vec_PtrSize(vNodes); Vec_PtrPush( vNodes, pObj ); - pObj->iTemp = Abc_NtkCiNum(pNtk) + i; } + assert( Vec_PtrSize(vNodes) == Abc_NtkNodeNum(pNtk) ); Abc_NtkForEachCo( pNtk, pObj, i ) pObj->iTemp = Abc_NtkCiNum(pNtk) + Vec_PtrSize(vNodes) + i; return vNodes; |