diff options
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abci/abc.c | 6 | ||||
| -rw-r--r-- | src/base/abci/abcCut.c | 2 | ||||
| -rw-r--r-- | src/base/abci/abcIvy.c | 31 | ||||
| -rw-r--r-- | src/base/abci/abcPrint.c | 3 |
4 files changed, 30 insertions, 12 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 64ee4596..02f74f30 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -4647,9 +4647,11 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv ) // Ivy_TruthTest(); - pNtkRes = Abc_NtkIvy( pNtk ); + Ivy_TruthEstimateNodesTest(); + +// pNtkRes = Abc_NtkIvy( pNtk ); // pNtkRes = Abc_NtkPlayer( pNtk, nLevels, 0 ); -// pNtkRes = NULL; + pNtkRes = NULL; if ( pNtkRes == NULL ) { fprintf( pErr, "Command has failed.\n" ); diff --git a/src/base/abci/abcCut.c b/src/base/abci/abcCut.c index f5fe2629..135e35d2 100644 --- a/src/base/abci/abcCut.c +++ b/src/base/abci/abcCut.c @@ -110,7 +110,7 @@ Cut_Man_t * Abc_NtkCuts( Abc_Ntk_t * pNtk, Cut_Params_t * pParams ) Vec_PtrFree( vNodes ); Vec_IntFree( vChoices ); PRT( "Total", clock() - clk ); -//Abc_NtkPrintCuts_( p, pNtk, 0 ); +//Abc_NtkPrintCuts( p, pNtk, 0 ); // Cut_ManPrintStatsToFile( p, pNtk->pSpec, clock() - clk ); // temporary printout of stats diff --git a/src/base/abci/abcIvy.c b/src/base/abci/abcIvy.c index a04f3d9c..f69982a8 100644 --- a/src/base/abci/abcIvy.c +++ b/src/base/abci/abcIvy.c @@ -53,7 +53,7 @@ extern char * Mio_GateReadSop( void * pGate ); ***********************************************************************/ Abc_Ntk_t * Abc_NtkIvy( Abc_Ntk_t * pNtk ) { - Ivy_Man_t * pMan; + Ivy_Man_t * pMan, * pTemp = NULL; Abc_Ntk_t * pNtkAig; int fCleanup = 1; int nNodes; @@ -74,7 +74,6 @@ Abc_Ntk_t * Abc_NtkIvy( Abc_Ntk_t * pNtk ) // convert to the AIG manager pMan = Abc_NtkToAig( pNtk ); - if ( !Ivy_ManCheck( pMan ) ) { printf( "AIG check has failed.\n" ); @@ -82,13 +81,29 @@ Abc_Ntk_t * Abc_NtkIvy( Abc_Ntk_t * pNtk ) return NULL; } - // Ivy_MffcTest( pMan ); - Ivy_ManPrintStats( pMan ); +// Ivy_ManPrintStats( pMan ); + +// pMan = Ivy_ManBalance( pTemp = pMan, 1 ); +// Ivy_ManStop( pTemp ); + // Ivy_ManSeqRewrite( pMan, 0, 0 ); // Ivy_ManTestCutsAlg( pMan ); - Ivy_ManTestCutsBool( pMan ); - Ivy_ManPrintStats( pMan ); +// Ivy_ManTestCutsBool( pMan ); +// Ivy_ManRewriteAlg( pMan, 1, 1 ); + +// pMan = Ivy_ManResyn( pTemp = pMan, 1 ); +// Ivy_ManStop( pTemp ); + +// Ivy_ManTestCutsAll( pMan ); + +// Ivy_ManPrintStats( pMan ); + +// Ivy_ManPrintStats( pMan ); +// Ivy_ManRewritePre( pMan, 1, 0, 0 ); +// Ivy_ManPrintStats( pMan ); + +// Ivy_ManRequiredLevels( pMan ); // convert from the AIG manager pNtkAig = Abc_NtkFromAig( pNtk, pMan ); @@ -191,9 +206,9 @@ Ivy_Man_t * Abc_NtkToAig( Abc_Ntk_t * pNtkOld ) // create the manager assert( Abc_NtkHasSop(pNtkOld) || Abc_NtkHasAig(pNtkOld) ); if ( Abc_NtkHasSop(pNtkOld) ) - pMan = Ivy_ManStart( Abc_NtkCiNum(pNtkOld), Abc_NtkCoNum(pNtkOld), 3 * Abc_NtkGetLitNum(pNtkOld) + 10 ); + pMan = Ivy_ManStart( Abc_NtkCiNum(pNtkOld), Abc_NtkCoNum(pNtkOld), Abc_NtkGetLitNum(pNtkOld) + 1000 ); else - pMan = Ivy_ManStart( Abc_NtkCiNum(pNtkOld), Abc_NtkCoNum(pNtkOld), 3 * Abc_NtkNodeNum(pNtkOld) + 10 ); + pMan = Ivy_ManStart( Abc_NtkCiNum(pNtkOld), Abc_NtkCoNum(pNtkOld), Abc_NtkNodeNum(pNtkOld) + 1000 ); // create the PIs Abc_NtkConst1(pNtkOld)->pCopy = (Abc_Obj_t *)Ivy_ManConst1(pMan); Abc_NtkForEachCi( pNtkOld, pObj, i ) diff --git a/src/base/abci/abcPrint.c b/src/base/abci/abcPrint.c index 48b9eeda..a3cd227d 100644 --- a/src/base/abci/abcPrint.c +++ b/src/base/abci/abcPrint.c @@ -135,7 +135,7 @@ void Abc_NtkPrintStats( FILE * pFile, Abc_Ntk_t * pNtk, int fFactored ) } */ - +/* // print the statistic into a file { FILE * pTable; @@ -146,6 +146,7 @@ void Abc_NtkPrintStats( FILE * pFile, Abc_Ntk_t * pNtk, int fFactored ) fprintf( pTable, "\n" ); fclose( pTable ); } +*/ /* // print the statistic into a file |