diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-11-12 14:08:10 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-11-12 14:08:10 -0800 |
commit | 30b8c3d4225d66f2eca70513c0f7cd0e00a76159 (patch) | |
tree | 4c11529066945868b12b00071fe656caaec70a06 /src/aig/gia | |
parent | 566c7d715273dc7527440d96989ca5ecc4648b97 (diff) | |
download | abc-30b8c3d4225d66f2eca70513c0f7cd0e00a76159.tar.gz abc-30b8c3d4225d66f2eca70513c0f7cd0e00a76159.tar.bz2 abc-30b8c3d4225d66f2eca70513c0f7cd0e00a76159.zip |
Made print-out of frontier cut an option ('-c') in '&ps'.
Diffstat (limited to 'src/aig/gia')
-rw-r--r-- | src/aig/gia/gia.h | 2 | ||||
-rw-r--r-- | src/aig/gia/giaCexMin.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaCof.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaEquiv.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaFrames.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaMan.c | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index 740cfedf..e24c9c2c 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -856,7 +856,7 @@ extern void Gia_ManSolveProblem( Gia_Man_t * pGia, Emb_Par_t * pP extern Gia_Man_t * Gia_ManStart( int nObjsMax ); extern void Gia_ManStop( Gia_Man_t * p ); extern void Gia_ManStopP( Gia_Man_t ** p ); -extern void Gia_ManPrintStats( Gia_Man_t * p, int fTents, int fSwitch ); +extern void Gia_ManPrintStats( Gia_Man_t * p, int fTents, int fSwitch, int fCut ); extern void Gia_ManPrintStatsShort( Gia_Man_t * p ); extern void Gia_ManPrintMiterStatus( Gia_Man_t * p ); extern void Gia_ManSetRegNum( Gia_Man_t * p, int nRegs ); diff --git a/src/aig/gia/giaCexMin.c b/src/aig/gia/giaCexMin.c index 4c949d11..3249e4cb 100644 --- a/src/aig/gia/giaCexMin.c +++ b/src/aig/gia/giaCexMin.c @@ -331,7 +331,7 @@ Abc_Cex_t * Gia_ManCexMin( Gia_Man_t * p, Abc_Cex_t * pCex, int iFrameStart, int { pNew = Gia_ManCreateUnate( p, pCex, iFrameStart, nRealPis, fUseAll ); printf( "%3d : ", iFrameStart ); - Gia_ManPrintStats( pNew, 0, 0 ); + Gia_ManPrintStats( pNew, 0, 0, 0 ); if ( fVerbose ) Gia_WriteAiger( pNew, "temp.aig", 0, 0 ); Gia_ManStop( pNew ); @@ -342,7 +342,7 @@ Abc_Cex_t * Gia_ManCexMin( Gia_Man_t * p, Abc_Cex_t * pCex, int iFrameStart, int { pNew = Gia_ManCreateUnate( p, pCex, f, -1, fUseAll ); printf( "%3d : ", f ); - Gia_ManPrintStats( pNew, 0, 0 ); + Gia_ManPrintStats( pNew, 0, 0, 0 ); if ( fVerbose ) Gia_WriteAiger( pNew, "temp.aig", 0, 0 ); Gia_ManStop( pNew ); diff --git a/src/aig/gia/giaCof.c b/src/aig/gia/giaCof.c index e9fd6c8b..522589aa 100644 --- a/src/aig/gia/giaCof.c +++ b/src/aig/gia/giaCof.c @@ -863,7 +863,7 @@ Gia_Man_t * Gia_ManDupCofAllInt( Gia_Man_t * p, Vec_Int_t * vSigs, int fVerbose if ( fVerbose ) { printf( "Cofactoring %d signals.\n", Vec_IntSize(vSigs) ); - Gia_ManPrintStats( p, 0, 0 ); + Gia_ManPrintStats( p, 0, 0, 0 ); } if ( Vec_IntSize( vSigs ) > 200 ) { @@ -889,7 +889,7 @@ Gia_Man_t * Gia_ManDupCofAllInt( Gia_Man_t * p, Vec_Int_t * vSigs, int fVerbose if ( fVerbose ) printf( "Cofactored variable %d.\n", iVar ); if ( fVerbose ) - Gia_ManPrintStats( pAig, 0, 0 ); + Gia_ManPrintStats( pAig, 0, 0, 0 ); } Vec_IntFree( vSigsNew ); return pAig; diff --git a/src/aig/gia/giaEquiv.c b/src/aig/gia/giaEquiv.c index 9454fa8e..fc13f87c 100644 --- a/src/aig/gia/giaEquiv.c +++ b/src/aig/gia/giaEquiv.c @@ -1665,7 +1665,7 @@ int Gia_CommandSpecI( Gia_Man_t * pGia, int nFramesInit, int nBTLimitInit, int f } // (spech)* where spech = &srm; restore save3; bmc2 -F 100 -C 25000; &resim Gia_ManCleanMark0( pGia ); - Gia_ManPrintStats( pGia, 0, 0 ); + Gia_ManPrintStats( pGia, 0, 0, 0 ); for ( nIter = 0; ; nIter++ ) { if ( Gia_ManHasNoEquivs(pGia) ) diff --git a/src/aig/gia/giaFrames.c b/src/aig/gia/giaFrames.c index 8bb4a144..a62d17ca 100644 --- a/src/aig/gia/giaFrames.c +++ b/src/aig/gia/giaFrames.c @@ -950,7 +950,7 @@ Gia_Man_t * Gia_ManFramesInitSpecial( Gia_Man_t * pAig, int nFrames, int fVerbos if ( fVerbose && (f % 100 == 0) ) { printf( "%6d : ", f ); - Gia_ManPrintStats( pFrames, 0, 0 ); + Gia_ManPrintStats( pFrames, 0, 0, 0 ); } Gia_ManForEachRo( pAig, pObj, i ) pObj->Value = f ? Gia_ObjRoToRi( pAig, pObj )->Value : 0; diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index 3faaa871..8e1bc7e2 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -292,7 +292,7 @@ void Gia_ManPrintChoiceStats( Gia_Man_t * p ) SeeAlso [] ***********************************************************************/ -void Gia_ManPrintStats( Gia_Man_t * p, int fTents, int fSwitch ) +void Gia_ManPrintStats( Gia_Man_t * p, int fTents, int fSwitch, int fCut ) { if ( p->pName ) printf( "%-8s : ", p->pName ); @@ -303,8 +303,8 @@ void Gia_ManPrintStats( Gia_Man_t * p, int fTents, int fSwitch ) printf( " ff =%7d", Gia_ManRegNum(p) ); printf( " and =%8d", Gia_ManAndNum(p) ); printf( " lev =%5d", Gia_ManLevelNum(p) ); Vec_IntFreeP( &p->vLevels ); - if ( p->nPinTypes == 0 ) - printf( " cut = %d(%d)", Gia_ManCrossCut(p, 0), Gia_ManCrossCut(p, 1) ); + if ( fCut && p->nPinTypes == 0 ) + printf( " cut = %d(%d)", Gia_ManCrossCut(p, 0), Gia_ManCrossCut(p, 1) ); // printf( " mem =%5.2f MB", 1.0*(sizeof(Gia_Obj_t)*p->nObjs + sizeof(int)*(Vec_IntSize(p->vCis) + Vec_IntSize(p->vCos)))/(1<<20) ); printf( " mem =%5.2f MB", 1.0*(sizeof(Gia_Obj_t)*p->nObjsAlloc + sizeof(int)*(Vec_IntCap(p->vCis) + Vec_IntCap(p->vCos)))/(1<<20) ); if ( Gia_ManHasDangling(p) ) |