diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2016-03-30 21:51:50 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2016-03-30 21:51:50 -0700 |
| commit | 7724dfcca212ae1fd43cb095d5d85fea85c07608 (patch) | |
| tree | 11a506b57cdcdf9391a398fcd40a70ae90c20fd0 /src/base | |
| parent | 31430043c219a29bc261a28a909ecb284b67de60 (diff) | |
| download | abc-7724dfcca212ae1fd43cb095d5d85fea85c07608.tar.gz abc-7724dfcca212ae1fd43cb095d5d85fea85c07608.tar.bz2 abc-7724dfcca212ae1fd43cb095d5d85fea85c07608.zip | |
Windowing for technology mapping.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abci/abc.c | 15 | ||||
| -rw-r--r-- | src/base/abci/abcCollapse.c | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 056e2c13..a456fc7b 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -34822,10 +34822,10 @@ usage: ***********************************************************************/ int Abc_CommandAbc9SatLut( Abc_Frame_t * pAbc, int argc, char ** argv ) { - extern void Gia_ManLutSat( Gia_Man_t * p, int nNumber, int nConfl, int fVerbose ); - int c, nNumber = 32, nConfl = 0, fVerbose = 0; + extern void Gia_ManLutSat( Gia_Man_t * p, int nNumber, int nConfl, int fReverse, int fVerbose ); + int c, nNumber = 64, nConfl = 500, fReverse = 0, fVerbose = 0; Extra_UtilGetoptReset(); - while ( ( c = Extra_UtilGetopt( argc, argv, "NCvh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "NCrvh" ) ) != EOF ) { switch ( c ) { @@ -34852,6 +34852,9 @@ int Abc_CommandAbc9SatLut( Abc_Frame_t * pAbc, int argc, char ** argv ) nConfl = atoi(argv[globalUtilOptind]); globalUtilOptind++; break; + case 'r': + fReverse ^= 1; + break; case 'v': fVerbose ^= 1; break; @@ -34873,14 +34876,15 @@ int Abc_CommandAbc9SatLut( Abc_Frame_t * pAbc, int argc, char ** argv ) } if ( Gia_ManLutSizeMax(pAbc->pGia) > 4 ) Abc_Print( 0, "Current AIG has mapping into %d-LUTs.\n", Gia_ManLutSizeMax(pAbc->pGia) ); - Gia_ManLutSat( pAbc->pGia, nNumber, nConfl, fVerbose ); + Gia_ManLutSat( pAbc->pGia, nNumber, nConfl, fReverse, fVerbose ); return 0; usage: - Abc_Print( -2, "usage: &satlut [-NC num] [-vh]\n" ); + Abc_Print( -2, "usage: &satlut [-NC num] [-rvh]\n" ); Abc_Print( -2, "\t performs SAT-based remapping of the 4-LUT network\n" ); Abc_Print( -2, "\t-N num : the limit on the number of AIG nodes in the window [default = %d]\n", nNumber ); Abc_Print( -2, "\t-C num : the limit on the number of conflicts [default = %d]\n", nNumber ); + Abc_Print( -2, "\t-r : toggles using reverse search [default = %s]\n", fReverse? "yes": "no" ); Abc_Print( -2, "\t-v : toggles verbose output [default = %s]\n", fVerbose? "yes": "no" ); Abc_Print( -2, "\t-h : prints the command usage\n"); return 1; @@ -40616,7 +40620,6 @@ int Abc_CommandAbc9Test( Abc_Frame_t * pAbc, int argc, char ** argv ) // Gia_ParTest( pAbc->pGia, nWords, nProcs ); Gia_Iso3Test( pAbc->pGia ); // printf( "\nThis command is currently disabled.\n\n" ); - return 0; usage: Abc_Print( -2, "usage: &test [-FW num] [-svh]\n" ); diff --git a/src/base/abci/abcCollapse.c b/src/base/abci/abcCollapse.c index 6a132518..25d78b04 100644 --- a/src/base/abci/abcCollapse.c +++ b/src/base/abci/abcCollapse.c @@ -750,7 +750,7 @@ Vec_Str_t * Abc_NtkClpGiaOne2( Cnf_Dat_t * pCnf, Gia_Man_t * p, int iCo, int nCu Gia_ManForEachCiVec( vSupp, p, pObj, i ) Vec_IntPush( vSuppObjs, Gia_ObjId(p, pObj) ); Gia_ManIncrementTravId( p ); - Gia_ManCollectAnds( p, &iCoObjId, 1, vAnds ); + Gia_ManCollectAnds( p, &iCoObjId, 1, vAnds, NULL ); assert( Vec_IntSize(vAnds) > 0 ); // pSat = Abc_NtkClpDeriveSatSolver( pCnf, iCoObjId, vSuppObjs, vAnds, vMap, &pSat1, &pSat2, &pSat3 ); pSat = Abc_NtkClpDeriveSatSolver( pCnf, iCoObjId, vSuppObjs, vAnds, vMap, NULL, NULL, NULL ); |