From 1647addf5e3ce4f82cc35cd4983bc5f7b9730290 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Sat, 14 Jul 2007 08:01:00 -0700 Subject: Version abc70714 --- src/base/abci/abc.c | 2 +- src/base/abci/abcDar.c | 12 +++++++++++- src/base/abci/abcRewrite.c | 4 ++++ src/base/abci/abcTiming.c | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) (limited to 'src/base/abci') diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 6b305033..c9761783 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -1532,7 +1532,7 @@ int Abc_CommandPrintDsd( Abc_Frame_t * pAbc, int argc, char ** argv ) // set defaults nCofLevel = 1; - fCofactor = 1; + fCofactor = 0; Extra_UtilGetoptReset(); while ( ( c = Extra_UtilGetopt( argc, argv, "Nch" ) ) != EOF ) { diff --git a/src/base/abci/abcDar.c b/src/base/abci/abcDar.c index c4020127..ba0705ed 100644 --- a/src/base/abci/abcDar.c +++ b/src/base/abci/abcDar.c @@ -521,14 +521,24 @@ Abc_Ntk_t * Abc_NtkCSweep( Abc_Ntk_t * pNtk, int nCutsMax, int nLeafMax, int fVe ***********************************************************************/ Abc_Ntk_t * Abc_NtkDRewrite( Abc_Ntk_t * pNtk, Dar_Par_t * pPars ) { - Aig_Man_t * pMan; + Aig_Man_t * pMan, * pTemp; Abc_Ntk_t * pNtkAig; + int clk; assert( Abc_NtkIsStrash(pNtk) ); pMan = Abc_NtkToDar( pNtk ); if ( pMan == NULL ) return NULL; // Aig_ManPrintStats( pMan ); + Dar_ManRewrite( pMan, pPars ); +// pMan = Dar_ManBalance( pTemp = pMan, pPars->fUpdateLevel ); +// Aig_ManStop( pTemp ); + +clk = clock(); + pMan = Aig_ManDup( pTemp = pMan, 0 ); + Aig_ManStop( pTemp ); +PRT( "time", clock() - clk ); + // Aig_ManPrintStats( pMan ); pNtkAig = Abc_NtkFromDar( pNtk, pMan ); Aig_ManStop( pMan ); diff --git a/src/base/abci/abcRewrite.c b/src/base/abci/abcRewrite.c index 7760b2d1..613741a8 100644 --- a/src/base/abci/abcRewrite.c +++ b/src/base/abci/abcRewrite.c @@ -155,7 +155,11 @@ Rwr_ManAddTimeTotal( pManRwr, clock() - clkStart ); } // put the nodes into the DFS order and reassign their IDs + { +// int clk = clock(); Abc_NtkReassignIds( pNtk ); +// PRT( "time", clock() - clk ); + } // Abc_AigCheckFaninOrder( pNtk->pManFunc ); // fix the levels if ( fUpdateLevel ) diff --git a/src/base/abci/abcTiming.c b/src/base/abci/abcTiming.c index fd54f519..5d5e6e93 100644 --- a/src/base/abci/abcTiming.c +++ b/src/base/abci/abcTiming.c @@ -811,7 +811,7 @@ void Abc_NtkUpdateLevel( Abc_Obj_t * pObjNew, Vec_Vec_t * vLevels ) pTemp->fMarkA = 0; assert( Abc_ObjLevel(pTemp) == Lev ); Abc_ObjSetLevel( pTemp, Abc_ObjLevelNew(pTemp) ); - // if the level did not change, to need to check the fanout levels + // if the level did not change, no need to check the fanout levels if ( Abc_ObjLevel(pTemp) == Lev ) continue; // schedule fanout for level update @@ -858,7 +858,7 @@ void Abc_NtkUpdateReverseLevel( Abc_Obj_t * pObjNew, Vec_Vec_t * vLevels ) LevelOld = Abc_ObjReverseLevel(pTemp); assert( LevelOld == Lev ); Abc_ObjSetReverseLevel( pTemp, Abc_ObjReverseLevelNew(pTemp) ); - // if the level did not change, to need to check the fanout levels + // if the level did not change, no need to check the fanout levels if ( Abc_ObjReverseLevel(pTemp) == Lev ) continue; // schedule fanins for level update -- cgit v1.2.3