diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 10:44:34 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 10:44:34 -0700 |
| commit | 8b881d235a90e67282fa2e91bbfec8c4e6685878 (patch) | |
| tree | 1ab26419ca1ec1bd8639f9b12df6a4f5eb996012 /src/aig | |
| parent | 31d85e732b2648049171abfb906216dfe31449f3 (diff) | |
| download | abc-8b881d235a90e67282fa2e91bbfec8c4e6685878.tar.gz abc-8b881d235a90e67282fa2e91bbfec8c4e6685878.tar.bz2 abc-8b881d235a90e67282fa2e91bbfec8c4e6685878.zip | |
Making 'pdr', &gla, &vta print correctly in batch mode.
Diffstat (limited to 'src/aig')
| -rw-r--r-- | src/aig/gia/giaAbsGla.c | 4 | ||||
| -rw-r--r-- | src/aig/gia/giaAbsVta.c | 3 | ||||
| -rw-r--r-- | src/aig/gia/giaMan.c | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/aig/gia/giaAbsGla.c b/src/aig/gia/giaAbsGla.c index cdfc7712..970ff26b 100644 --- a/src/aig/gia/giaAbsGla.c +++ b/src/aig/gia/giaAbsGla.c @@ -1618,6 +1618,8 @@ Vec_Int_t * Gla_ManUnsatCore( Gla_Man_t * p, int f, Vec_Int_t * vCla2Obj, sat_so ***********************************************************************/ void Gla_ManAbsPrintFrame( Gla_Man_t * p, int nCoreSize, int nFrames, int nConfls, int nCexes, int Time ) { + if ( Abc_FrameIsBatchMode() && nCoreSize <= 0 ) + return; Abc_Print( 1, "%3d :", nFrames-1 ); Abc_Print( 1, "%4d", Abc_MinInt(100, 100 * Gia_GlaAbsCount(p, 0, 0) / (p->nObjs - Gia_ManPoNum(p->pGia) + Gia_ManCoNum(p->pGia) + 1)) ); Abc_Print( 1, "%6d", Gia_GlaAbsCount(p, 0, 0) ); @@ -1820,7 +1822,7 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta ) pCex = p->pGia->pCexSeq; p->pGia->pCexSeq = NULL; break; } - } + } Gia_GlaAddToAbs( p, vPPis, 1 ); Gia_GlaAddOneSlice( p, f, vPPis ); Vec_IntFree( vPPis ); diff --git a/src/aig/gia/giaAbsVta.c b/src/aig/gia/giaAbsVta.c index e7e5e7a6..91e609c5 100644 --- a/src/aig/gia/giaAbsVta.c +++ b/src/aig/gia/giaAbsVta.c @@ -1226,6 +1226,9 @@ int Vta_ManAbsPrintFrame( Vta_Man_t * p, Vec_Int_t * vCore, int nFrames, int nCo return fChanges; } + if ( Abc_FrameIsBatchMode() && !vCore ) + return fChanges; + // Abc_Print( 1, "%5d%5d", pCountAll[0], pCountUni[0] ); Abc_Print( 1, "%3d :", nFrames-1 ); Abc_Print( 1, "%4d", Abc_MinInt(100, 100 * p->nSeenGla / (Gia_ManRegNum(p->pGia) + Gia_ManAndNum(p->pGia) + 1)) ); diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index 0ab6c091..61283e09 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -412,7 +412,8 @@ void Gia_ManPrintStats( Gia_Man_t * p, int fTents, int fSwitch ) printf( " and =%8d", Gia_ManAndNum(p) ); printf( " lev =%5d", Gia_ManLevelNum(p) ); printf( " cut =%5d", Gia_ManCrossCut(p) ); - printf( " mem =%5.2f Mb", 12.0*Gia_ManObjNum(p)/(1<<20) ); + 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) ) printf( " ch =%5d", Gia_ManEquivCountClasses(p) ); if ( fSwitch ) |