diff options
| -rw-r--r-- | src/aig/gia/giaScript.c | 10 | ||||
| -rw-r--r-- | src/base/abci/abc.c | 13 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/aig/gia/giaScript.c b/src/aig/gia/giaScript.c index 91a8bc8a..b7879e27 100644 --- a/src/aig/gia/giaScript.c +++ b/src/aig/gia/giaScript.c @@ -491,13 +491,13 @@ void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, in SeeAlso [] ***********************************************************************/ -void Gia_ManPerformFlow2( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fBalance, int fMinAve, int fVerbose ) +void Gia_ManPerformFlow2( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fBalance, int fMinAve, int fUseMfs, int fVerbose ) { char Comm1[100], Comm2[100], Comm3[100], Comm4[100]; - sprintf( Comm1, "&synch2 -K %d; &if -m%s -K %d -C %d; &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum ); - sprintf( Comm2, "&dch -f; &if -m%s -K %d -C %d; &save", fMinAve?"t":"", nLutSize, nCutNum+4 ); - sprintf( Comm3, "&synch2 -K %d; &lf -m%s -E 5 -K %d -C %d; &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum ); - sprintf( Comm4, "&dch -f; &lf -m%sk -E 5 -K %d -C %d; &save", fMinAve?"t":"", nLutSize, nCutNum+4 ); + sprintf( Comm1, "&synch2 -K %d; &if -m%s -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum, fUseMfs ? "&put; mfs2; &get -m;":"" ); + sprintf( Comm2, "&dch -f; &if -m%s -K %d -C %d; %s &save", fMinAve?"t":"", nLutSize, nCutNum+4, fUseMfs ? "&put; mfs2; &get -m;":"" ); + sprintf( Comm3, "&synch2 -K %d; &lf -m%s -E 5 -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum, fUseMfs ? "&put; mfs2; &get -m;":"" ); + sprintf( Comm4, "&dch -f; &lf -m%sk -E 5 -K %d -C %d; %s &save", fMinAve?"t":"", nLutSize, nCutNum+4, fUseMfs ? "&put; mfs2; &get -m;":"" ); // perform synthesis if ( fVerbose ) diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index a418febd..6fc70f16 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -30997,14 +30997,15 @@ usage: ***********************************************************************/ int Abc_CommandAbc9Flow2( Abc_Frame_t * pAbc, int argc, char ** argv ) { - extern void Gia_ManPerformFlow2( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fBalance, int fMinAve, int fVerbose ); + extern void Gia_ManPerformFlow2( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fBalance, int fMinAve, int fUseMfs, int fVerbose ); int nLutSize = 6; int nCutNum = 8; int fBalance = 0; int fMinAve = 0; + int fUseMfs = 0; int c, fVerbose = 0; Extra_UtilGetoptReset(); - while ( ( c = Extra_UtilGetopt( argc, argv, "KCbtvh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "KCbtmvh" ) ) != EOF ) { switch ( c ) { @@ -31036,6 +31037,9 @@ int Abc_CommandAbc9Flow2( Abc_Frame_t * pAbc, int argc, char ** argv ) case 't': fMinAve ^= 1; break; + case 'm': + fUseMfs ^= 1; + break; case 'v': fVerbose ^= 1; break; @@ -31050,16 +31054,17 @@ int Abc_CommandAbc9Flow2( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Abc_CommandAbc9Flow2(): There is no AIG.\n" ); return 1; } - Gia_ManPerformFlow2( Gia_ManHasMapping(pAbc->pGia), Gia_ManAndNum(pAbc->pGia), Gia_ManLevelNum(pAbc->pGia), nLutSize, nCutNum, fBalance, fMinAve, fVerbose ); + Gia_ManPerformFlow2( Gia_ManHasMapping(pAbc->pGia), Gia_ManAndNum(pAbc->pGia), Gia_ManLevelNum(pAbc->pGia), nLutSize, nCutNum, fBalance, fMinAve, fUseMfs, fVerbose ); return 0; usage: - Abc_Print( -2, "usage: &flow2 [-KC num] [-btvh]\n" ); + Abc_Print( -2, "usage: &flow2 [-KC num] [-btmvh]\n" ); Abc_Print( -2, "\t integration optimization and mapping flow\n" ); Abc_Print( -2, "\t-K num : the number of LUT inputs (LUT size) [default = %d]\n", nLutSize ); Abc_Print( -2, "\t-C num : the number of cuts at a node [default = %d]\n", nCutNum ); Abc_Print( -2, "\t-b : toggle using SOP balancing during synthesis [default = %s]\n", fBalance? "yes": "no" ); Abc_Print( -2, "\t-t : toggle minimizing average (not maximum) level [default = %s]\n", fMinAve? "yes": "no" ); + Abc_Print( -2, "\t-m : toggle using \"mfs2\" in the script [default = %s]\n", fUseMfs? "yes": "no" ); Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", fVerbose? "yes": "no" ); Abc_Print( -2, "\t-h : print the command usage\n"); return 1; |