From 7143ad4d877544709de64cd6386bc9596132dab7 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Tue, 12 Feb 2019 16:45:16 -0800 Subject: Adding switch -x to &ps to disable color printout. --- src/aig/gia/gia.h | 1 + src/aig/gia/giaMan.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'src/aig') diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h index 2e888130..d386f8ba 100644 --- a/src/aig/gia/gia.h +++ b/src/aig/gia/gia.h @@ -246,6 +246,7 @@ struct Gps_Par_t_ int fMiter; int fSkipMap; int fSlacks; + int fNoColor; char * pDumpFile; }; diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index 25355fe3..38fb9817 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -450,6 +450,13 @@ void Gia_ManPrintStats( Gia_Man_t * p, Gps_Par_t * pPars ) Gia_ManPrintStatsMiter( p, 0 ); return; } + if ( pPars->fNoColor ) + { + if ( p->pName ) + Abc_Print( 1, "%-8s : ", p->pName ); + } + else + { #ifdef WIN32 SetConsoleTextAttribute( GetStdHandle(STD_OUTPUT_HANDLE), 15 ); // bright if ( p->pName ) @@ -459,6 +466,7 @@ void Gia_ManPrintStats( Gia_Man_t * p, Gps_Par_t * pPars ) if ( p->pName ) Abc_Print( 1, "%s%-8s%s : ", "\033[1;37m", p->pName, "\033[0m" ); // bright #endif + } Abc_Print( 1, "i/o =%7d/%7d", Gia_ManPiNum(p) - Gia_ManBoxCiNum(p) - Gia_ManRegBoxNum(p), Gia_ManPoNum(p) - Gia_ManBoxCoNum(p) - Gia_ManRegBoxNum(p) ); @@ -468,7 +476,14 @@ void Gia_ManPrintStats( Gia_Man_t * p, Gps_Par_t * pPars ) Abc_Print( 1, " ff =%7d", Gia_ManRegNum(p) ); if ( Gia_ManRegBoxNum(p) ) Abc_Print( 1, " boxff =%d(%d)", Gia_ManRegBoxNum(p), Gia_ManClockDomainNum(p) ); - + if ( pPars->fNoColor ) + { + Abc_Print( 1, " %s =%8d", p->pMuxes? "nod" : "and", Gia_ManAndNum(p) ); + Abc_Print( 1, " lev =%5d", Gia_ManLevelNum(p) ); + Abc_Print( 1, " (%.2f)", Gia_ManLevelAve(p) ); + } + else + { #ifdef WIN32 { HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); @@ -484,6 +499,7 @@ void Gia_ManPrintStats( Gia_Man_t * p, Gps_Par_t * pPars ) Abc_Print( 1, " %slev =%5d%s", "\033[1;35m", Gia_ManLevelNum(p), "\033[0m" ); // magenta Abc_Print( 1, " %s(%.2f)%s", "\033[1;35m", Gia_ManLevelAve(p), "\033[0m" ); #endif + } Vec_IntFreeP( &p->vLevels ); if ( pPars && pPars->fCut ) Abc_Print( 1, " cut = %d(%d)", Gia_ManCrossCut(p, 0), Gia_ManCrossCut(p, 1) ); -- cgit v1.2.3