Skip to content

A
abc
Commit 448eec77 by Alan Mishchenko
Options

Improving print-outs of &vta and &gla.

parent db6e7f97
Showing with 27 additions and 9 deletions
src/aig/gia/giaAbsGla.c
...@@ -142,12 +142,21 @@ static inline void Gla_ObjClearRef( Rfn_Obj_t * p ) { ...@@ -142,12 +142,21 @@ static inline void Gla_ObjClearRef( Rfn_Obj_t * p ) {
***********************************************************************/ ***********************************************************************/
static inline void Abc_PrintInt( int i ) static inline void Abc_PrintInt( int i )
{ {
printf( " " );
if ( i > -1000 && i < 1000 ) if ( i > -1000 && i < 1000 )
printf( "%6d", i ); printf( " %4d", i );
else if ( i > -10000 && i < 10000 )
printf( "%4.2fk", (float)i/1000 );
else if ( i > -100000 && i < 100000 )
printf( "%4.1fk", (float)i/1000 );
else if ( i > -1000000 && i < 1000000 ) else if ( i > -1000000 && i < 1000000 )
printf( "%5dk", i/1000 ); printf( "%4.0fk", (float)i/1000 );
else if ( i > -10000000 && i < 10000000 )
printf( "%4.2fm", (float)i/1000000 );
else if ( i > -100000000 && i < 100000000 )
printf( "%4.1fm", (float)i/1000000 );
else if ( i > -1000000000 && i < 1000000000 ) else if ( i > -1000000000 && i < 1000000000 )
printf( "%5dm", i/1000000 ); printf( "%4.0fm", (float)i/1000000 );
} }
/**Function************************************************************* /**Function*************************************************************
...@@ -1837,7 +1846,7 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta ) ...@@ -1837,7 +1846,7 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta )
Abc_Print( 1, "Running gate-level abstraction (GLA) with the following parameters:\n" ); Abc_Print( 1, "Running gate-level abstraction (GLA) with the following parameters:\n" );
Abc_Print( 1, "FrameMax = %d ConfMax = %d LearnMax = %d Timeout = %d RatioMin = %d %%.\n", Abc_Print( 1, "FrameMax = %d ConfMax = %d LearnMax = %d Timeout = %d RatioMin = %d %%.\n",
pPars->nFramesMax, pPars->nConfLimit, pPars->nLearntMax, pPars->nTimeOut, pPars->nRatioMin ); pPars->nFramesMax, pPars->nConfLimit, pPars->nLearntMax, pPars->nTimeOut, pPars->nRatioMin );
Abc_Print( 1, "Frame %% Abs PPI FF LUT Confl Cex Vars Clas Lrns Time Mem\n" ); Abc_Print( 1, "Frame %% Abs PPI FF LUT Confl Cex Vars Clas Lrns Time Mem\n" );
} }
for ( f = i = iPrev = 0; !p->pPars->nFramesMax || f < p->pPars->nFramesMax; f++, iPrev = i ) for ( f = i = iPrev = 0; !p->pPars->nFramesMax || f < p->pPars->nFramesMax; f++, iPrev = i )
{ {
......
src/aig/gia/giaAbsVta.c
...@@ -148,12 +148,21 @@ extern void Vga_ManAddClausesOne( Vta_Man_t * p, int iObj, int iFrame ); ...@@ -148,12 +148,21 @@ extern void Vga_ManAddClausesOne( Vta_Man_t * p, int iObj, int iFrame );
***********************************************************************/ ***********************************************************************/
static inline void Abc_PrintInt( int i ) static inline void Abc_PrintInt( int i )
{ {
printf( " " );
if ( i > -1000 && i < 1000 ) if ( i > -1000 && i < 1000 )
printf( "%6d", i ); printf( " %4d", i );
else if ( i > -10000 && i < 10000 )
printf( "%4.2fk", (float)i/1000 );
else if ( i > -100000 && i < 100000 )
printf( "%4.1fk", (float)i/1000 );
else if ( i > -1000000 && i < 1000000 ) else if ( i > -1000000 && i < 1000000 )
printf( "%5dk", i/1000 ); printf( "%4.0fk", (float)i/1000 );
else if ( i > -10000000 && i < 10000000 )
printf( "%4.2fm", (float)i/1000000 );
else if ( i > -100000000 && i < 100000000 )
printf( "%4.1fm", (float)i/1000000 );
else if ( i > -1000000000 && i < 1000000000 ) else if ( i > -1000000000 && i < 1000000000 )
printf( "%5dm", i/1000000 ); printf( "%4.0fm", (float)i/1000000 );
} }
/**Function************************************************************* /**Function*************************************************************
...@@ -1276,7 +1285,7 @@ int Vta_ManAbsPrintFrame( Vta_Man_t * p, Vec_Int_t * vCore, int nFrames, int nCo ...@@ -1276,7 +1285,7 @@ int Vta_ManAbsPrintFrame( Vta_Man_t * p, Vec_Int_t * vCore, int nFrames, int nCo
} }
else else
{ {
Abc_Print( 1, "%7d", pCountAll[0] ); Abc_PrintInt( pCountAll[0] );
/* /*
if ( nFrames > 7 ) if ( nFrames > 7 )
{ {
...@@ -1599,7 +1608,7 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars ) ...@@ -1599,7 +1608,7 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars )
Abc_Print( 1, "FramePast = %d FrameMax = %d ConfMax = %d LearnMax = %d Timeout = %d RatioMin = %d %%\n", Abc_Print( 1, "FramePast = %d FrameMax = %d ConfMax = %d LearnMax = %d Timeout = %d RatioMin = %d %%\n",
pPars->nFramesPast, pPars->nFramesMax, pPars->nConfLimit, pPars->nLearntMax, pPars->nTimeOut, pPars->nRatioMin ); pPars->nFramesPast, pPars->nFramesMax, pPars->nConfLimit, pPars->nLearntMax, pPars->nTimeOut, pPars->nRatioMin );
// Abc_Print( 1, "Frame %% Abs %% Confl Cex SatVar Core F0 F1 F2 ...\n" ); // Abc_Print( 1, "Frame %% Abs %% Confl Cex SatVar Core F0 F1 F2 ...\n" );
Abc_Print( 1, "Frame %% Abs %% Confl Cex Vars Clas Lrns Core Time Mem\n" ); Abc_Print( 1, "Frame %% Abs %% Confl Cex Vars Clas Lrns Core Time Mem\n" );
} }
assert( Vec_PtrSize(p->vFrames) > 0 ); assert( Vec_PtrSize(p->vFrames) > 0 );
for ( f = i = 0; !p->pPars->nFramesMax || f < p->pPars->nFramesMax; f++ ) for ( f = i = 0; !p->pPars->nFramesMax || f < p->pPars->nFramesMax; f++ )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment