diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2014-06-14 19:03:05 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2014-06-14 19:03:05 -0700 |
| commit | cf993a9d90937c2d8d4ff443109c5307dcf1bcc5 (patch) | |
| tree | f96d3566425d92d554f8804dc7a286aa85f7c1f8 /src/aig | |
| parent | 0ac22c9e1d88cc81484773e36d053a186af8f997 (diff) | |
| download | abc-cf993a9d90937c2d8d4ff443109c5307dcf1bcc5.tar.gz abc-cf993a9d90937c2d8d4ff443109c5307dcf1bcc5.tar.bz2 abc-cf993a9d90937c2d8d4ff443109c5307dcf1bcc5.zip | |
Adding more features to the synthesis script &syn2.
Diffstat (limited to 'src/aig')
| -rw-r--r-- | src/aig/gia/gia.h | 2 | ||||
| -rw-r--r-- | src/aig/gia/giaBalance.c | 23 |
2 files changed, 18 insertions, 7 deletions
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index d5e3fbb5..463f11e6 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -969,7 +969,7 @@ extern void Gia_AigerWriteSimple( Gia_Man_t * pInit, char * pFile /*=== giaBalance.c ===========================================================*/ extern Gia_Man_t * Gia_ManBalance( Gia_Man_t * p, int fSimpleAnd, int fVerbose ); extern Gia_Man_t * Gia_ManAreaBalance( Gia_Man_t * p, int fSimpleAnd, int nNewNodesMax, int fVerbose, int fVeryVerbose ); -extern Gia_Man_t * Gia_ManAigSyn2( Gia_Man_t * p, int fVerbose, int fVeryVerbose ); +extern Gia_Man_t * Gia_ManAigSyn2( Gia_Man_t * p, int fOldAlgo, int fCoarsen, int fCutMin, int nRelaxRatio, int fVerbose, int fVeryVerbose ); extern Gia_Man_t * Gia_ManAigSyn3( Gia_Man_t * p, int fVerbose, int fVeryVerbose ); extern Gia_Man_t * Gia_ManAigSyn4( Gia_Man_t * p, int fVerbose, int fVeryVerbose ); /*=== giaBidec.c ===========================================================*/ diff --git a/src/aig/gia/giaBalance.c b/src/aig/gia/giaBalance.c index dfbc6ca6..749a7c1e 100644 --- a/src/aig/gia/giaBalance.c +++ b/src/aig/gia/giaBalance.c @@ -1017,14 +1017,22 @@ void Gia_ManAigTransferPiLevels( Gia_Man_t * pNew, Gia_Man_t * p ) SeeAlso [] ***********************************************************************/ -Gia_Man_t * Gia_ManAigSyn2( Gia_Man_t * p, int fVerbose, int fVeryVerbose ) +Gia_Man_t * Gia_ManAigSyn2( Gia_Man_t * p, int fOldAlgo, int fCoarsen, int fCutMin, int nRelaxRatio, int fVerbose, int fVeryVerbose ) { Gia_Man_t * pNew, * pTemp; Jf_Par_t Pars, * pPars = &Pars; - Lf_ManSetDefaultPars( pPars ); -// pPars->fVerbose = 1; - pPars->fCoarsen = 1; - pPars->nRelaxRatio = 20; + if ( fOldAlgo ) + { + Jf_ManSetDefaultPars( pPars ); + pPars->fCutMin = fCutMin; + } + else + { + Lf_ManSetDefaultPars( pPars ); + pPars->fCoarsen = fCoarsen; + pPars->fCutMin = fCutMin; + pPars->nRelaxRatio = nRelaxRatio; + } if ( fVerbose ) Gia_ManPrintStats( p, NULL ); if ( Gia_ManAndNum(p) == 0 ) return Gia_ManDup(p); @@ -1033,7 +1041,10 @@ Gia_Man_t * Gia_ManAigSyn2( Gia_Man_t * p, int fVerbose, int fVeryVerbose ) if ( fVerbose ) Gia_ManPrintStats( pNew, NULL ); Gia_ManAigTransferPiLevels( pNew, p ); // perform mapping - pNew = Lf_ManPerformMapping( pTemp = pNew, pPars ); + if ( fOldAlgo ) + pNew = Jf_ManPerformMapping( pTemp = pNew, pPars ); + else + pNew = Lf_ManPerformMapping( pTemp = pNew, pPars ); if ( fVerbose ) Gia_ManPrintStats( pNew, NULL ); // Gia_ManStop( pTemp ); // perform balancing |