From 2b98b81837011f26d130ad0f44d4bc7b298f9cd7 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Tue, 29 Apr 2008 08:01:00 -0700 Subject: Version abc80429 --- src/aig/nwk/nwkDfs.c | 4 ++-- src/aig/nwk/nwkMan.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/aig/nwk') diff --git a/src/aig/nwk/nwkDfs.c b/src/aig/nwk/nwkDfs.c index ed19f71a..90bab0dc 100644 --- a/src/aig/nwk/nwkDfs.c +++ b/src/aig/nwk/nwkDfs.c @@ -267,8 +267,8 @@ Vec_Vec_t * Nwk_ManLevelize( Nwk_Man_t * pNtk ) vLevels = Vec_VecStart( nLevels + 1 ); Nwk_ManForEachNode( pNtk, pObj, i ) { - assert( (int)pObj->tArrival <= nLevels ); - Vec_VecPush( vLevels, (int)pObj->tArrival, pObj ); + assert( Nwk_ObjLevel(pObj) <= nLevels ); + Vec_VecPush( vLevels, Nwk_ObjLevel(pObj), pObj ); } return vLevels; } diff --git a/src/aig/nwk/nwkMan.c b/src/aig/nwk/nwkMan.c index aeebac3f..55c5354c 100644 --- a/src/aig/nwk/nwkMan.c +++ b/src/aig/nwk/nwkMan.c @@ -118,6 +118,7 @@ void Nwk_ManPrintLutSizes( Nwk_Man_t * p, If_Lib_t * pLutLib ) int Nwk_ManCompareAndSaveBest( Nwk_Man_t * pNtk, void * pNtl ) { extern void Ioa_WriteBlifLogic( Nwk_Man_t * pNtk, void * pNtl, char * pFileName ); + extern void Nwk_ManDumpBlif( Nwk_Man_t * pNtk, char * pFileName, Vec_Ptr_t * vPiNames, Vec_Ptr_t * vPoNames ); static struct ParStruct { char * pName; // name of the best saved network int Depth; // depth of the best saved network @@ -154,6 +155,7 @@ int Nwk_ManCompareAndSaveBest( Nwk_Man_t * pNtk, void * pNtl ) ParsBest.nPos = ParsNew.nPos; // writ the network Ioa_WriteBlifLogic( pNtk, pNtl, "best.blif" ); +// Nwk_ManDumpBlif( pNtk, "best_map.blif", NULL, NULL ); return 1; } return 0; @@ -211,6 +213,8 @@ void Nwk_ManPrintStats( Nwk_Man_t * pNtk, If_Lib_t * pLutLib, int fSaveBest, int char * pNameGen = pNtk->pSpec? Nwk_FileNameGeneric( pNtk->pSpec ) : "nameless_"; sprintf( Buffer, "%s_dump.blif", pNameGen ); Ioa_WriteBlifLogic( pNtk, pNtl, Buffer ); +// sprintf( Buffer, "%s_dump_map.blif", pNameGen ); +// Nwk_ManDumpBlif( pNtk, Buffer, NULL, NULL ); if ( pNtk->pSpec ) free( pNameGen ); } -- cgit v1.2.3