From 908d5e696c7e73f80abcef85ec796511f3bffb0f Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Mon, 9 Jul 2012 22:57:03 -0700 Subject: Replacing Mb/Gb to be MB/GB. --- src/aig/aig/aigCuts.c | 2 +- src/aig/aig/aigPart.c | 4 ++-- src/aig/gia/giaAbsGla.c | 2 +- src/aig/gia/giaAbsVta.c | 4 ++-- src/aig/gia/giaEmbed.c | 2 +- src/aig/gia/giaEquiv.c | 2 +- src/aig/gia/giaEra.c | 2 +- src/aig/gia/giaEra2.c | 2 +- src/aig/gia/giaForce.c | 2 +- src/aig/gia/giaIf.c | 2 +- src/aig/gia/giaMan.c | 6 +++--- src/aig/gia/giaSim.c | 4 ++-- src/aig/gia/giaSim2.c | 4 ++-- src/aig/gia/giaSwitch.c | 2 +- src/aig/gia/giaTsim.c | 2 +- src/aig/ivy/ivyFraig.c | 2 +- src/aig/saig/saigBmc2.c | 6 +++--- src/aig/saig/saigBmc3.c | 12 ++++++------ src/aig/saig/saigSimFast.c | 6 +++--- src/aig/saig/saigSimSeq.c | 2 +- src/aig/saig/saigStrSim.c | 4 ++-- src/aig/saig/saigSwitch.c | 2 +- src/base/abc/abcHieNew.c | 4 ++-- src/base/abc/abcNtk.c | 2 +- src/base/abci/abcIf.c | 2 +- src/base/abci/abcPart.c | 4 ++-- src/base/abci/abcPrint.c | 2 +- src/bdd/cas/casDec.c | 2 +- src/bool/bdc/bdcSpfd.c | 2 +- src/map/amap/amapGraph.c | 2 +- src/map/amap/amapLiberty.c | 2 +- src/map/amap/amapMerge.c | 2 +- src/map/if/ifCore.c | 2 +- src/map/if/ifDec16.c | 2 +- src/map/if/ifMan.c | 2 +- src/map/super/superAnd.c | 2 +- src/map/super/superGate.c | 4 ++-- src/misc/bbl/bblif.c | 6 +++--- src/misc/util/abc_global.h | 8 ++++---- src/opt/cut/cutMan.c | 2 +- src/opt/dar/darCore.c | 2 +- src/opt/dar/darMan.c | 2 +- src/opt/fsim/fsimSim.c | 6 +++--- src/opt/fsim/fsimTsim.c | 6 +++--- src/opt/nwk/nwkMerge.c | 2 +- src/proof/cec/cecMan.c | 4 ++-- src/proof/fra/fraMan.c | 2 +- src/proof/fraig/fraigMan.c | 2 +- src/proof/ssw/sswClass.c | 2 +- src/proof/ssw/sswMan.c | 2 +- src/sat/bsat/satInter.c | 2 +- src/sat/bsat/satInterA.c | 2 +- src/sat/bsat/satInterB.c | 2 +- src/sat/bsat/satInterP.c | 2 +- src/sat/bsat/satProof.c | 6 +++--- src/sat/bsat/satSolver2.c | 2 +- src/sat/bsat/satUtil.c | 2 +- src/sat/bsat/satVec.h | 2 +- src/sat/proof/pr.c | 2 +- 59 files changed, 90 insertions(+), 90 deletions(-) diff --git a/src/aig/aig/aigCuts.c b/src/aig/aig/aigCuts.c index da20c4d9..1ab117f8 100644 --- a/src/aig/aig/aigCuts.c +++ b/src/aig/aig/aigCuts.c @@ -650,7 +650,7 @@ Aig_ManCut_t * Aig_ComputeCuts( Aig_Man_t * pAig, int nCutsMax, int nLeafMax, in nCuts = Aig_ManCutCount( p, &nCutsK ); printf( "Nodes = %6d. Total cuts = %6d. %d-input cuts = %6d.\n", Aig_ManObjNum(pAig), nCuts, nLeafMax, nCutsK ); - printf( "Cut size = %2d. Truth size = %2d. Total mem = %5.2f Mb ", + printf( "Cut size = %2d. Truth size = %2d. Total mem = %5.2f MB ", p->nCutSize, 4*p->nTruthWords, 1.0*Aig_MmFixedReadMemUsage(p->pMemCuts)/(1<<20) ); ABC_PRT( "Runtime", clock() - clk ); /* diff --git a/src/aig/aig/aigPart.c b/src/aig/aig/aigPart.c index 4ca12041..d2d92b82 100644 --- a/src/aig/aig/aigPart.c +++ b/src/aig/aig/aigPart.c @@ -32,7 +32,7 @@ ABC_NAMESPACE_IMPL_START typedef struct Part_Man_t_ Part_Man_t; struct Part_Man_t_ { - int nChunkSize; // the size of one chunk of memory (~1 Mb) + int nChunkSize; // the size of one chunk of memory (~1 MB) int nStepSize; // the step size in saving memory (~64 bytes) char * pFreeBuf; // the pointer to free memory int nFreeSize; // the size of remaining free memory @@ -334,7 +334,7 @@ Vec_Ptr_t * Aig_ManSupports( Aig_Man_t * pMan ) } assert( 0 ); } -//printf( "Memory usage = %d Mb.\n", Vec_PtrSize(p->vMemory) * p->nChunkSize / (1<<20) ); +//printf( "Memory usage = %d MB.\n", Vec_PtrSize(p->vMemory) * p->nChunkSize / (1<<20) ); Part_ManStop( p ); // sort supports by size Vec_VecSort( (Vec_Vec_t *)vSupports, 1 ); diff --git a/src/aig/gia/giaAbsGla.c b/src/aig/gia/giaAbsGla.c index 017c9407..75aacc7d 100644 --- a/src/aig/gia/giaAbsGla.c +++ b/src/aig/gia/giaAbsGla.c @@ -1644,7 +1644,7 @@ void Gla_ManAbsPrintFrame( Gla_Man_t * p, int nCoreSize, int nFrames, int nConfl Abc_Print( 1, " %9d", sat_solver2_nvars(p->pSat) ); Abc_Print( 1, " %6d", nCoreSize > 0 ? nCoreSize : 0 ); Abc_Print( 1, "%9.2f sec", 1.0*Time/CLOCKS_PER_SEC ); - Abc_Print( 1, "%5.1f Gb", (sat_solver2_memory_proof(p->pSat) + sat_solver2_memory(p->pSat, 0)) / (1<<30) ); + Abc_Print( 1, "%5.1f GB", (sat_solver2_memory_proof(p->pSat) + sat_solver2_memory(p->pSat, 0)) / (1<<30) ); Abc_Print( 1, "%s", nCoreSize > 0 ? "\n" : "\r" ); fflush( stdout ); } diff --git a/src/aig/gia/giaAbsVta.c b/src/aig/gia/giaAbsVta.c index 2fdf484c..d32c1a2e 100644 --- a/src/aig/gia/giaAbsVta.c +++ b/src/aig/gia/giaAbsVta.c @@ -1247,7 +1247,7 @@ int Vta_ManAbsPrintFrame( Vta_Man_t * p, Vec_Int_t * vCore, int nFrames, int nCo for ( k = 0; k < 7; k++ ) Abc_Print( 1, " " ); Abc_Print( 1, "%9.2f sec", 1.0*Time/CLOCKS_PER_SEC ); - Abc_Print( 1, "%5.1f Gb", (sat_solver2_memory_proof(p->pSat) + sat_solver2_memory(p->pSat, 0)) / (1<<30) ); + Abc_Print( 1, "%5.1f GB", (sat_solver2_memory_proof(p->pSat) + sat_solver2_memory(p->pSat, 0)) / (1<<30) ); Abc_Print( 1, "\r" ); } else @@ -1269,7 +1269,7 @@ int Vta_ManAbsPrintFrame( Vta_Man_t * p, Vec_Int_t * vCore, int nFrames, int nCo Abc_Print( 1, " " ); } Abc_Print( 1, "%9.2f sec", 1.0*Time/CLOCKS_PER_SEC ); - Abc_Print( 1, "%5.1f Gb", (sat_solver2_memory_proof(p->pSat) + sat_solver2_memory(p->pSat, 0)) / (1<<30) ); + Abc_Print( 1, "%5.1f GB", (sat_solver2_memory_proof(p->pSat) + sat_solver2_memory(p->pSat, 0)) / (1<<30) ); Abc_Print( 1, "\n" ); } fflush( stdout ); diff --git a/src/aig/gia/giaEmbed.c b/src/aig/gia/giaEmbed.c index 871def74..17f80707 100644 --- a/src/aig/gia/giaEmbed.c +++ b/src/aig/gia/giaEmbed.c @@ -630,7 +630,7 @@ void Emb_ManPrintStats( Emb_Man_t * p ) printf( "obj =%8d ", Emb_ManObjNum(p) ); // printf( "lev =%5d ", Emb_ManLevelNum(p) ); // printf( "cut =%5d ", Emb_ManCrossCut(p) ); - printf( "mem =%5.2f Mb", 4.0*p->nObjData/(1<<20) ); + printf( "mem =%5.2f MB", 4.0*p->nObjData/(1<<20) ); // printf( "obj =%5d ", Emb_ManObjNum(p) ); printf( "\n" ); diff --git a/src/aig/gia/giaEquiv.c b/src/aig/gia/giaEquiv.c index 28e4901e..62ef03a4 100644 --- a/src/aig/gia/giaEquiv.c +++ b/src/aig/gia/giaEquiv.c @@ -340,7 +340,7 @@ void Gia_ManEquivPrintClasses( Gia_Man_t * p, int fVerbose, float Mem ) } CounterX -= Gia_ManCoNum(p); nLits = Gia_ManCiNum(p) + Gia_ManAndNum(p) - Counter - CounterX; - printf( "cst =%8d cls =%7d lit =%8d unused =%8d proof =%6d mem =%5.2f Mb\n", + printf( "cst =%8d cls =%7d lit =%8d unused =%8d proof =%6d mem =%5.2f MB\n", Counter0, Counter, nLits, CounterX, Proved, (Mem == 0.0) ? 8.0*Gia_ManObjNum(p)/(1<<20) : Mem ); // printf( "cst =%8d cls =%7d lit =%8d\n", // Counter0, Counter, nLits ); diff --git a/src/aig/gia/giaEra.c b/src/aig/gia/giaEra.c index 335a1299..21a693da 100644 --- a/src/aig/gia/giaEra.c +++ b/src/aig/gia/giaEra.c @@ -540,7 +540,7 @@ int Gia_ManCollectReachable( Gia_Man_t * pAig, int nStatesMax, int fMiter, int f } if ( fVerbose && p->iCurState % 5000 == 0 ) { - printf( "States =%10d. Reached =%10d. R = %5.3f. Depth =%6d. Mem =%9.2f Mb. ", + printf( "States =%10d. Reached =%10d. R = %5.3f. Depth =%6d. Mem =%9.2f MB. ", p->iCurState, Vec_PtrSize(p->vStates), 1.0*p->iCurState/Vec_PtrSize(p->vStates), Gia_ManCountDepth(p), (1.0/(1<<20))*(1.0*Vec_PtrSize(p->vStates)*(sizeof(Gia_ObjEra_t) + sizeof(unsigned) * p->nWordsDat) + 1.0*p->nBins*sizeof(unsigned) + 1.0*p->vStates->nCap * sizeof(void*)) ); diff --git a/src/aig/gia/giaEra2.c b/src/aig/gia/giaEra2.c index a05411fb..b0823ee8 100644 --- a/src/aig/gia/giaEra2.c +++ b/src/aig/gia/giaEra2.c @@ -1675,7 +1675,7 @@ int Gia_ManAreDeriveNexts( Gia_ManAre_t * p, Gia_PtrAre_t Sta ) ***********************************************************************/ void Gia_ManArePrintReport( Gia_ManAre_t * p, clock_t Time, int fFinal ) { - printf( "States =%10d. Reached =%10d. R = %5.3f. Depth =%6d. Mem =%9.2f Mb. ", + printf( "States =%10d. Reached =%10d. R = %5.3f. Depth =%6d. Mem =%9.2f MB. ", p->iStaCur, p->nStas, 1.0*p->iStaCur/p->nStas, Gia_ManAreDepth(p, p->iStaCur), (sizeof(Gia_ManAre_t) + 4.0*Gia_ManRegNum(p->pAig) + 8.0*MAX_PAGE_NUM + 4.0*p->nStaPages*p->nSize*MAX_ITEM_NUM + 16.0*p->nObjPages*MAX_ITEM_NUM)/(1<<20) ); diff --git a/src/aig/gia/giaForce.c b/src/aig/gia/giaForce.c index 32edb28f..a32e71b4 100644 --- a/src/aig/gia/giaForce.c +++ b/src/aig/gia/giaForce.c @@ -565,7 +565,7 @@ void Frc_ManPrintStats( Frc_Man_t * p ) printf( "obj =%8d ", Frc_ManObjNum(p) ); // printf( "lev =%5d ", Frc_ManLevelNum(p) ); // printf( "cut =%5d ", Frc_ManCrossCut(p) ); - printf( "mem =%5.2f Mb", 4.0*p->nObjData/(1<<20) ); + printf( "mem =%5.2f MB", 4.0*p->nObjData/(1<<20) ); // printf( "obj =%5d ", Frc_ManObjNum(p) ); printf( "\n" ); } diff --git a/src/aig/gia/giaIf.c b/src/aig/gia/giaIf.c index b4e4c565..3fc5c04e 100644 --- a/src/aig/gia/giaIf.c +++ b/src/aig/gia/giaIf.c @@ -318,7 +318,7 @@ void Gia_ManPrintMappingStats( Gia_Man_t * p ) Abc_Print( 1, "lut =%7d ", nLuts ); Abc_Print( 1, "edge =%8d ", nFanins ); Abc_Print( 1, "lev =%5d ", LevelMax ); - Abc_Print( 1, "mem =%5.2f Mb", 4.0*(Gia_ManObjNum(p) + 2*nLuts + nFanins)/(1<<20) ); + Abc_Print( 1, "mem =%5.2f MB", 4.0*(Gia_ManObjNum(p) + 2*nLuts + nFanins)/(1<<20) ); Abc_Print( 1, "\n" ); } diff --git a/src/aig/gia/giaMan.c b/src/aig/gia/giaMan.c index 60337988..556ddb9a 100644 --- a/src/aig/gia/giaMan.c +++ b/src/aig/gia/giaMan.c @@ -413,8 +413,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", 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) ); + 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 ) @@ -471,7 +471,7 @@ void Gia_ManPrintStatsShort( Gia_Man_t * p ) printf( "ff =%7d ", Gia_ManRegNum(p) ); printf( "and =%8d ", Gia_ManAndNum(p) ); printf( "lev =%5d ", Gia_ManLevelNum(p) ); -// printf( "mem =%5.2f Mb", 12.0*Gia_ManObjNum(p)/(1<<20) ); +// printf( "mem =%5.2f MB", 12.0*Gia_ManObjNum(p)/(1<<20) ); printf( "\n" ); } diff --git a/src/aig/gia/giaSim.c b/src/aig/gia/giaSim.c index 3f11679d..8d22e699 100644 --- a/src/aig/gia/giaSim.c +++ b/src/aig/gia/giaSim.c @@ -235,7 +235,7 @@ Gia_ManSim_t * Gia_ManSimCreate( Gia_Man_t * pAig, Gia_ParSim_t * pPars ) p->pDataSimCos = ABC_ALLOC( unsigned, p->nWords * Gia_ManCoNum(p->pAig) ); if ( !p->pDataSim || !p->pDataSimCis || !p->pDataSimCos ) { - Abc_Print( 1, "Simulator could not allocate %.2f Gb for simulation info.\n", + Abc_Print( 1, "Simulator could not allocate %.2f GB for simulation info.\n", 4.0 * p->nWords * (p->pAig->nFront + Gia_ManCiNum(p->pAig) + Gia_ManCoNum(p->pAig)) / (1<<30) ); Gia_ManSimDelete( p ); return NULL; @@ -244,7 +244,7 @@ Gia_ManSim_t * Gia_ManSimCreate( Gia_Man_t * pAig, Gia_ParSim_t * pPars ) Vec_IntForEachEntry( pAig->vCis, Entry, i ) Vec_IntPush( p->vCis2Ids, i ); // do we need p->vCis2Ids? if ( pPars->fVerbose ) - Abc_Print( 1, "AIG = %7.2f Mb. Front mem = %7.2f Mb. Other mem = %7.2f Mb.\n", + Abc_Print( 1, "AIG = %7.2f MB. Front mem = %7.2f MB. Other mem = %7.2f MB.\n", 12.0*Gia_ManObjNum(p->pAig)/(1<<20), 4.0*p->nWords*p->pAig->nFront/(1<<20), 4.0*p->nWords*(Gia_ManCiNum(p->pAig) + Gia_ManCoNum(p->pAig))/(1<<20) ); diff --git a/src/aig/gia/giaSim2.c b/src/aig/gia/giaSim2.c index 5ac1392f..897eff98 100644 --- a/src/aig/gia/giaSim2.c +++ b/src/aig/gia/giaSim2.c @@ -88,7 +88,7 @@ Gia_Sim2_t * Gia_Sim2Create( Gia_Man_t * pAig, Gia_ParSim_t * pPars ) p->pDataSim = ABC_ALLOC( unsigned, p->nWords * Gia_ManObjNum(p->pAig) ); if ( !p->pDataSim ) { - Abc_Print( 1, "Simulator could not allocate %.2f Gb for simulation info.\n", + Abc_Print( 1, "Simulator could not allocate %.2f GB for simulation info.\n", 4.0 * p->nWords * Gia_ManObjNum(p->pAig) / (1<<30) ); Gia_Sim2Delete( p ); return NULL; @@ -96,7 +96,7 @@ Gia_Sim2_t * Gia_Sim2Create( Gia_Man_t * pAig, Gia_ParSim_t * pPars ) p->vClassOld = Vec_IntAlloc( 100 ); p->vClassNew = Vec_IntAlloc( 100 ); if ( pPars->fVerbose ) - Abc_Print( 1, "Memory: AIG = %7.2f Mb. SimInfo = %7.2f Mb.\n", + Abc_Print( 1, "Memory: AIG = %7.2f MB. SimInfo = %7.2f MB.\n", 12.0*Gia_ManObjNum(p->pAig)/(1<<20), 4.0*p->nWords*Gia_ManObjNum(p->pAig)/(1<<20) ); // prepare AIG Gia_ManSetPhase( pAig ); diff --git a/src/aig/gia/giaSwitch.c b/src/aig/gia/giaSwitch.c index 73dff345..63c1ff9f 100644 --- a/src/aig/gia/giaSwitch.c +++ b/src/aig/gia/giaSwitch.c @@ -570,7 +570,7 @@ Vec_Int_t * Gia_ManSwiSimulate( Gia_Man_t * pAig, Gia_ParSwi_t * pPars ) { printf( "Obj = %8d (%8d). F = %6d. ", pAig->nObjs, Gia_ManCiNum(pAig) + Gia_ManAndNum(pAig), p->pAig->nFront ); - printf( "AIG = %7.2f Mb. F-mem = %7.2f Mb. Other = %7.2f Mb. ", + printf( "AIG = %7.2f MB. F-mem = %7.2f MB. Other = %7.2f MB. ", 12.0*Gia_ManObjNum(p->pAig)/(1<<20), 4.0*p->nWords*p->pAig->nFront/(1<<20), 4.0*p->nWords*(Gia_ManCiNum(p->pAig) + Gia_ManCoNum(p->pAig))/(1<<20) ); diff --git a/src/aig/gia/giaTsim.c b/src/aig/gia/giaTsim.c index 2f5e0293..4a3d5342 100644 --- a/src/aig/gia/giaTsim.c +++ b/src/aig/gia/giaTsim.c @@ -679,7 +679,7 @@ Gia_ManTer_t * Gia_ManTerSimulate( Gia_Man_t * pAig, int fVerbose ) { printf( "Obj = %8d (%8d). F = %6d. ", pAig->nObjs, Gia_ManCiNum(pAig) + Gia_ManAndNum(pAig), p->pAig->nFront ); - printf( "AIG = %7.2f Mb. F-mem = %7.2f Mb. Other = %7.2f Mb. ", + printf( "AIG = %7.2f MB. F-mem = %7.2f MB. Other = %7.2f MB. ", 12.0*Gia_ManObjNum(p->pAig)/(1<<20), 4.0*Abc_BitWordNum(2 * p->pAig->nFront)/(1<<20), 4.0*Abc_BitWordNum(2 * (Gia_ManCiNum(pAig) + Gia_ManCoNum(pAig)))/(1<<20) ); diff --git a/src/aig/ivy/ivyFraig.c b/src/aig/ivy/ivyFraig.c index 9874a93c..234f403a 100644 --- a/src/aig/ivy/ivyFraig.c +++ b/src/aig/ivy/ivyFraig.c @@ -645,7 +645,7 @@ void Ivy_FraigPrint( Ivy_FraigMan_t * p ) { double nMemory; nMemory = (double)Ivy_ManObjNum(p->pManAig)*p->nSimWords*sizeof(unsigned)/(1<<20); - printf( "SimWords = %d. Rounds = %d. Mem = %0.2f Mb. ", p->nSimWords, p->nSimRounds, nMemory ); + printf( "SimWords = %d. Rounds = %d. Mem = %0.2f MB. ", p->nSimWords, p->nSimRounds, nMemory ); printf( "Classes: Beg = %d. End = %d.\n", p->nClassesBeg, p->nClassesEnd ); // printf( "Limits: BTNode = %d. BTMiter = %d.\n", p->pParams->nBTLimitNode, p->pParams->nBTLimitMiter ); printf( "Proof = %d. Counter-example = %d. Fail = %d. FailReal = %d. Zero = %d.\n", diff --git a/src/aig/saig/saigBmc2.c b/src/aig/saig/saigBmc2.c index 8da8095a..4729dab9 100644 --- a/src/aig/saig/saigBmc2.c +++ b/src/aig/saig/saigBmc2.c @@ -229,7 +229,7 @@ Vec_Ptr_t * Abs_ManTernarySimulate( Aig_Man_t * p, int nFramesMax, int fVerbose { if ( fVerbose ) { - printf( "Ternary sim found non-zero output in frame %d. Used %5.2f Mb. ", + printf( "Ternary sim found non-zero output in frame %d. Used %5.2f MB. ", f, 0.25 * (f+1) * Aig_ManObjNum(p) / (1<<20) ); ABC_PRT( "Time", clock() - clk ); } @@ -238,7 +238,7 @@ Vec_Ptr_t * Abs_ManTernarySimulate( Aig_Man_t * p, int nFramesMax, int fVerbose } if ( fVerbose ) { - printf( "Ternary sim proved all outputs in the first %d frames. Used %5.2f Mb. ", + printf( "Ternary sim proved all outputs in the first %d frames. Used %5.2f MB. ", nFramesLimit, 0.25 * nFramesLimit * Aig_ManObjNum(p) / (1<<20) ); ABC_PRT( "Time", clock() - clk ); } @@ -790,7 +790,7 @@ int Saig_BmcPerform( Aig_Man_t * pAig, int nStart, int nFramesMax, int nNodesMax { printf( "%4d : F =%5d. O =%4d. And =%8d. Var =%8d. Conf =%7d. ", Iter, p->iFrameLast, p->iOutputLast, Aig_ManNodeNum(p->pFrm), p->nSatVars, (int)p->pSat->stats.conflicts ); - printf( "%4.0f Mb", 4.0*(p->iFrameLast+1)*p->nObjs/(1<<20) ); + printf( "%4.0f MB", 4.0*(p->iFrameLast+1)*p->nObjs/(1<<20) ); printf( "%9.2f sec", (float)(clock() - clkTotal)/(float)(CLOCKS_PER_SEC) ); printf( "\n" ); fflush( stdout ); diff --git a/src/aig/saig/saigBmc3.c b/src/aig/saig/saigBmc3.c index 05246a26..fde874df 100644 --- a/src/aig/saig/saigBmc3.c +++ b/src/aig/saig/saigBmc3.c @@ -700,7 +700,7 @@ Gia_ManBmc_t * Saig_Bmc3ManStart( Aig_Man_t * pAig ) p->nWordNum = Abc_BitWordNum( 2 * Aig_ManObjNumMax(pAig) ); // hash table p->nTable = 1000003; - p->pTable = ABC_CALLOC( int, 6 * p->nTable ); // 2.4 Mb + p->pTable = ABC_CALLOC( int, 6 * p->nTable ); // 2.4 MB return p; } @@ -1385,8 +1385,8 @@ clkOther += clock() - clk2; printf( "Conf =%7.0f. ", (double)p->pSat->stats.conflicts ); printf( "Imp =%10.0f. ", (double)p->pSat->stats.propagations ); // ABC_PRT( "Time", clock() - clk ); - printf( "%4.0f Mb", 4.25*(f+1)*p->nObjNums /(1<<20) ); - printf( "%4.0f Mb", 1.0*sat_solver_memory(p->pSat)/(1<<20) ); + printf( "%4.0f MB", 4.25*(f+1)*p->nObjNums /(1<<20) ); + printf( "%4.0f MB", 1.0*sat_solver_memory(p->pSat)/(1<<20) ); printf( "%9.2f sec ", (float)(clock() - clkTotal)/(float)(CLOCKS_PER_SEC) ); // printf( "\n" ); // ABC_PRMn( "Id2Var", (f+1)*p->nObjNums*4 ); @@ -1448,9 +1448,9 @@ clkOther += clock() - clk2; printf( "Conf =%7.0f. ",(double)p->pSat->stats.conflicts ); printf( "Imp =%10.0f. ", (double)p->pSat->stats.propagations ); // ABC_PRT( "Time", clock() - clk ); -// printf( "%4.0f Mb", 4.0*Vec_IntSize(p->vVisited) /(1<<20) ); - printf( "%4.0f Mb", 4.0*(f+1)*p->nObjNums /(1<<20) ); - printf( "%4.0f Mb", 1.0*sat_solver_memory(p->pSat)/(1<<20) ); +// printf( "%4.0f MB", 4.0*Vec_IntSize(p->vVisited) /(1<<20) ); + printf( "%4.0f MB", 4.0*(f+1)*p->nObjNums /(1<<20) ); + printf( "%4.0f MB", 1.0*sat_solver_memory(p->pSat)/(1<<20) ); printf( "%9.2f sec ", 1.0*(clock() - clkTotal)/CLOCKS_PER_SEC ); // printf( "\n" ); // ABC_PRMn( "Id2Var", (f+1)*p->nObjNums*4 ); diff --git a/src/aig/saig/saigSimFast.c b/src/aig/saig/saigSimFast.c index 6b669eb9..39456c63 100644 --- a/src/aig/saig/saigSimFast.c +++ b/src/aig/saig/saigSimFast.c @@ -114,7 +114,7 @@ Faig_Man_t * Faig_ManAlloc( Aig_Man_t * pAig ) // assert( Faig_ManIsCorrect(pAig) ); nWords = 2 * Aig_ManNodeNum(pAig) + Aig_ManCoNum(pAig); p = (Faig_Man_t *)ABC_ALLOC( char, sizeof(Faig_Man_t) + sizeof(int) * nWords ); -//printf( "Allocating %7.2f Mb.\n", 1.0 * (sizeof(Faig_Man_t) + sizeof(int) * nWords)/(1<<20) ); +//printf( "Allocating %7.2f MB.\n", 1.0 * (sizeof(Faig_Man_t) + sizeof(int) * nWords)/(1<<20) ); memset( p, 0, sizeof(Faig_Man_t) ); p->nPis = Aig_ManCiNum(pAig) - Aig_ManRegNum(pAig); p->nPos = Aig_ManCoNum(pAig) - Aig_ManRegNum(pAig); @@ -255,8 +255,8 @@ int * Faig_ManSimulateFrames( Faig_Man_t * p, int nFrames, int nPref, int fTrans int * pNumOnes = ABC_CALLOC( int, p->nObjs ); unsigned * pSimInfo = ABC_ALLOC( unsigned, p->nObjs ); int f, i; -//printf( "Allocating %7.2f Mb.\n", 1.0 * 4 * p->nObjs/(1<<20) ); -//printf( "Allocating %7.2f Mb.\n", 1.0 * 4 * p->nObjs/(1<<20) ); +//printf( "Allocating %7.2f MB.\n", 1.0 * 4 * p->nObjs/(1<<20) ); +//printf( "Allocating %7.2f MB.\n", 1.0 * 4 * p->nObjs/(1<<20) ); // set constant 1 pSimInfo[0] = ~0; for ( f = 0; f < nFrames; f++ ) diff --git a/src/aig/saig/saigSimSeq.c b/src/aig/saig/saigSimSeq.c index f71b74cb..d92461c8 100644 --- a/src/aig/saig/saigSimSeq.c +++ b/src/aig/saig/saigSimSeq.c @@ -499,7 +499,7 @@ int Raig_ManSimulate( Aig_Man_t * pAig, int nWords, int nIters, int TimeLimit, i } if ( fVerbose ) { - printf( "Maxcut = %8d. AigMem = %7.2f Mb. SimMem = %7.2f Mb. ", + printf( "Maxcut = %8d. AigMem = %7.2f MB. SimMem = %7.2f MB. ", p->nMemsMax, 1.0*(p->nObjs * 16)/(1<<20), 1.0*(p->nMemsMax * 4 * (nWords+1))/(1<<20) ); diff --git a/src/aig/saig/saigStrSim.c b/src/aig/saig/saigStrSim.c index 85297abc..bc54aa9e 100644 --- a/src/aig/saig/saigStrSim.c +++ b/src/aig/saig/saigStrSim.c @@ -910,9 +910,9 @@ Vec_Int_t * Saig_StrSimPerformMatching( Aig_Man_t * p0, Aig_Man_t * p1, int nDis Saig_StrSimSetInitMatching( pPart0, pPart1 ); if ( fVerbose ) { - printf( "Allocated %6.2f Mb to simulate the first AIG.\n", + printf( "Allocated %6.2f MB to simulate the first AIG.\n", 1.0 * Aig_ManObjNumMax(pPart0) * SAIG_WORDS * sizeof(unsigned) / (1<<20) ); - printf( "Allocated %6.2f Mb to simulate the second AIG.\n", + printf( "Allocated %6.2f MB to simulate the second AIG.\n", 1.0 * Aig_ManObjNumMax(pPart1) * SAIG_WORDS * sizeof(unsigned) / (1<<20) ); } // iterate matching diff --git a/src/aig/saig/saigSwitch.c b/src/aig/saig/saigSwitch.c index b7e6ba8f..9217dd53 100644 --- a/src/aig/saig/saigSwitch.c +++ b/src/aig/saig/saigSwitch.c @@ -69,7 +69,7 @@ Saig_SimObj_t * Saig_ManCreateMan( Aig_Man_t * p ) Aig_Obj_t * pObj; int i; pAig = ABC_CALLOC( Saig_SimObj_t, Aig_ManObjNumMax(p)+1 ); -// printf( "Allocating %7.2f Mb.\n", 1.0 * sizeof(Saig_SimObj_t) * (Aig_ManObjNumMax(p)+1)/(1<<20) ); +// printf( "Allocating %7.2f MB.\n", 1.0 * sizeof(Saig_SimObj_t) * (Aig_ManObjNumMax(p)+1)/(1<<20) ); Aig_ManForEachObj( p, pObj, i ) { pEntry = pAig + i; diff --git a/src/base/abc/abcHieNew.c b/src/base/abc/abcHieNew.c index 2bdc7f28..d98b4fc8 100644 --- a/src/base/abc/abcHieNew.c +++ b/src/base/abc/abcHieNew.c @@ -290,7 +290,7 @@ void Au_NtkPrintStats( Au_Ntk_t * p ) // printf( " max =%7d", Au_NtkObjNumMax(p) ); // printf( " use =%7d", p->nObjsUsed ); printf( " %5.1f %%", 100.0 * (Au_NtkObjNumMax(p) - Au_NtkObjNum(p)) / Au_NtkObjNumMax(p) ); - printf( " %6.1f Mb", 1.0 * Au_NtkMemUsage(p) / (1 << 20) ); + printf( " %6.1f MB", 1.0 * Au_NtkMemUsage(p) / (1 << 20) ); printf( " %5.1f %%", 100.0 * (p->nObjsAlloc - p->nObjsUsed) / p->nObjsAlloc ); printf( "\n" ); } @@ -399,7 +399,7 @@ void Au_ManPrintStats( Au_Man_t * p ) Au_ManForEachNtk( p, pNtk, i ) Au_NtkPrintStats( pNtk ); printf( "Different functions = %d. ", p->pFuncs ? Abc_NamObjNumMax(p->pFuncs) : 0 ); - printf( "Memory = %.1f Mb", 1.0 * Au_ManMemUsage(p) / (1 << 20) ); + printf( "Memory = %.1f MB", 1.0 * Au_ManMemUsage(p) / (1 << 20) ); printf( " %5.1f %%", 100.0 * (Au_ManMemUsage(p) - Au_ManMemUsageUseful(p)) / Au_ManMemUsage(p) ); printf( "\n" ); // if ( p->pFuncs ) diff --git a/src/base/abc/abcNtk.c b/src/base/abc/abcNtk.c index d7f14810..74bdf125 100644 --- a/src/base/abc/abcNtk.c +++ b/src/base/abc/abcNtk.c @@ -1094,7 +1094,7 @@ void Abc_NtkDelete( Abc_Ntk_t * pNtk ) TotalMemory = 0; TotalMemory += pNtk->pMmObj? Mem_FixedReadMemUsage(pNtk->pMmObj) : 0; TotalMemory += pNtk->pMmStep? Mem_StepReadMemUsage(pNtk->pMmStep) : 0; -// fprintf( stdout, "The total memory allocated internally by the network = %0.2f Mb.\n", ((double)TotalMemory)/(1<<20) ); +// fprintf( stdout, "The total memory allocated internally by the network = %0.2f MB.\n", ((double)TotalMemory)/(1<<20) ); // free the storage if ( pNtk->pMmObj ) Mem_FixedStop( pNtk->pMmObj, 0 ); diff --git a/src/base/abci/abcIf.c b/src/base/abci/abcIf.c index 01d156e1..9d6ed12e 100644 --- a/src/base/abci/abcIf.c +++ b/src/base/abci/abcIf.c @@ -202,7 +202,7 @@ If_Man_t * Abc_NtkToIf( Abc_Ntk_t * pNtk, If_Par_t * pPars ) // print warning about excessive memory usage if ( 1.0 * Abc_NtkObjNum(pNtk) * pIfMan->nObjBytes / (1<<30) > 1.0 ) - printf( "Warning: The mapper will allocate %.1f Gb for to represent the subject graph with %d AIG nodes.\n", + printf( "Warning: The mapper will allocate %.1f GB for to represent the subject graph with %d AIG nodes.\n", 1.0 * Abc_NtkObjNum(pNtk) * pIfMan->nObjBytes / (1<<30), Abc_NtkObjNum(pNtk) ); // create PIs and remember them in the old nodes diff --git a/src/base/abci/abcPart.c b/src/base/abci/abcPart.c index a92decc1..779c5c7e 100644 --- a/src/base/abci/abcPart.c +++ b/src/base/abci/abcPart.c @@ -32,7 +32,7 @@ ABC_NAMESPACE_IMPL_START typedef struct Supp_Man_t_ Supp_Man_t; struct Supp_Man_t_ { - int nChunkSize; // the size of one chunk of memory (~1 Mb) + int nChunkSize; // the size of one chunk of memory (~1 MB) int nStepSize; // the step size in saving memory (~64 bytes) char * pFreeBuf; // the pointer to free memory int nFreeSize; // the size of remaining free memory @@ -385,7 +385,7 @@ Vec_Ptr_t * Abc_NtkComputeSupportsSmart( Abc_Ntk_t * pNtk ) assert( 0 ); } Vec_PtrFree( vNodes ); -//printf( "Memory usage = %d Mb.\n", Vec_PtrSize(p->vMemory) * p->nChunkSize / (1<<20) ); +//printf( "Memory usage = %d MB.\n", Vec_PtrSize(p->vMemory) * p->nChunkSize / (1<<20) ); Supp_ManStop( p ); // sort supports by size Vec_VecSort( (Vec_Vec_t *)vSupports, 1 ); diff --git a/src/base/abci/abcPrint.c b/src/base/abci/abcPrint.c index 0ec73fde..3244a196 100644 --- a/src/base/abci/abcPrint.c +++ b/src/base/abci/abcPrint.c @@ -373,7 +373,7 @@ void Abc_NtkPrintStats( Abc_Ntk_t * pNtk, int fFactored, int fSaveBest, int fDum s_TotalNodes += Abc_NtkNodeNum(pNtk); - printf( "Total nodes = %6d %6.2f Mb Changes = %6d.\n", + printf( "Total nodes = %6d %6.2f MB Changes = %6d.\n", s_TotalNodes, s_TotalNodes * 20.0 / (1<<20), s_TotalChanges ); */ diff --git a/src/bdd/cas/casDec.c b/src/bdd/cas/casDec.c index cfcc9f2a..06ce04ea 100644 --- a/src/bdd/cas/casDec.c +++ b/src/bdd/cas/casDec.c @@ -345,7 +345,7 @@ printf( "Stage %3d: In = %3d InP = %3d Cols = %5d Multi = %2d Simple = %2d printf( "LUTs: Total = %5d. Final = %5d. Simple = %5d. (%6.2f %%) ", nLutsTotal, nLutOutputs, nLutsTotal-nLutOutputs, 100.0*(nLutsTotal-nLutOutputs)/nLutsTotal ); if ( fVerbose ) - printf( "Memory = %6.2f Mb\n", 1.0*nLutOutputs*(1<pPars->fVerbose ) { if ( 1.0 * Aig_ManObjNum(pAig) * sizeof(Amap_Obj_t) / (1<<30) > 0.1 ) - printf( "Warning: Mapper allocates %.3f Gb for subject graph with %d objects.\n", + printf( "Warning: Mapper allocates %.3f GB for subject graph with %d objects.\n", 1.0 * Aig_ManObjNum(pAig) * sizeof(Amap_Obj_t) / (1<<30), Aig_ManObjNum(pAig) ); } // create PIs and remember them in the old nodes diff --git a/src/map/amap/amapLiberty.c b/src/map/amap/amapLiberty.c index c1798f09..34bd5303 100644 --- a/src/map/amap/amapLiberty.c +++ b/src/map/amap/amapLiberty.c @@ -913,7 +913,7 @@ int Amap_LibertyParse( char * pFileName, char * pFileGenlib, int fVerbose ) } if ( fVerbose ) { - printf( "Memory = %7.2f Mb. ", 1.0*(p->nContents+p->nItermAlloc*sizeof(Amap_Item_t))/(1<<20) ); + printf( "Memory = %7.2f MB. ", 1.0*(p->nContents+p->nItermAlloc*sizeof(Amap_Item_t))/(1<<20) ); ABC_PRT( "Time", clock() - clk ); } Amap_LibertyStop( p ); diff --git a/src/map/amap/amapMerge.c b/src/map/amap/amapMerge.c index 85a1713c..b4aaca9d 100644 --- a/src/map/amap/amapMerge.c +++ b/src/map/amap/amapMerge.c @@ -522,7 +522,7 @@ void Amap_ManMerge( Amap_Man_t * p ) if ( p->pPars->fVerbose ) { printf( "AIG object is %d bytes. ", (int)sizeof(Amap_Obj_t) ); - printf( "Internal AIG = %5.2f Mb. Cuts = %5.2f Mb.\n", + printf( "Internal AIG = %5.2f MB. Cuts = %5.2f MB.\n", 1.0*Amap_ManObjNum(p)*sizeof(Amap_Obj_t)/(1<<20), 1.0*p->nBytesUsed/(1<<20) ); printf( "Node =%6d. Try =%9d. Try3 =%10d. Used =%7d. R =%6.2f. ", Amap_ManNodeNum(p), p->nCutsTried, p->nCutsTried3, p->nCutsUsed, diff --git a/src/map/if/ifCore.c b/src/map/if/ifCore.c index f42c29eb..afaccfe9 100644 --- a/src/map/if/ifCore.c +++ b/src/map/if/ifCore.c @@ -131,7 +131,7 @@ int If_ManPerformMappingComb( If_Man_t * p ) if ( p->pPars->fVerbose ) { -// Abc_Print( 1, "Total memory = %7.2f Mb. Peak cut memory = %7.2f Mb. ", +// Abc_Print( 1, "Total memory = %7.2f MB. Peak cut memory = %7.2f MB. ", // 1.0 * (p->nObjBytes + 2*sizeof(void *)) * If_ManObjNum(p) / (1<<20), // 1.0 * p->nSetBytes * Mem_FixedReadMaxEntriesUsed(p->pMemSet) / (1<<20) ); Abc_PrintTime( 1, "Total time", clock() - clkTotal ); diff --git a/src/map/if/ifDec16.c b/src/map/if/ifDec16.c index 42383a0d..cc1a06f3 100644 --- a/src/map/if/ifDec16.c +++ b/src/map/if/ifDec16.c @@ -31,7 +31,7 @@ ABC_NAMESPACE_IMPL_START #define CLU_VAR_MAX 16 #define CLU_WRD_MAX (1 << ((CLU_VAR_MAX)-6)) -#define CLU_MEM_MAX 1000 // 1 Gb +#define CLU_MEM_MAX 1000 // 1 GB #define CLU_UNUSED 0xff // decomposition diff --git a/src/map/if/ifMan.c b/src/map/if/ifMan.c index 9b834906..3028e370 100644 --- a/src/map/if/ifMan.c +++ b/src/map/if/ifMan.c @@ -604,7 +604,7 @@ void If_ManSetupSetAll( If_Man_t * p, int nCrossCut ) if ( p->pPars->fVerbose ) { - Abc_Print( 1, "Node = %7d. Ch = %5d. Total mem = %7.2f Mb. Peak cut mem = %7.2f Mb.\n", + Abc_Print( 1, "Node = %7d. Ch = %5d. Total mem = %7.2f MB. Peak cut mem = %7.2f MB.\n", If_ManAndNum(p), p->nChoices, 1.0 * (p->nObjBytes + 2*sizeof(void *)) * If_ManObjNum(p) / (1<<20), 1.0 * p->nSetBytes * nCrossCut / (1<<20) ); diff --git a/src/map/super/superAnd.c b/src/map/super/superAnd.c index b6a30025..9f3996b9 100644 --- a/src/map/super/superAnd.c +++ b/src/map/super/superAnd.c @@ -499,7 +499,7 @@ ABC_PRT( "Sorting", clock() - clk ); fclose( pFile ); printf( "The supergates are written into file \"%s\" ", FileName ); - printf( "(%0.2f Mb).\n", ((double)Extra_FileSize(FileName))/(1<<20) ); + printf( "(%0.2f MB).\n", ((double)Extra_FileSize(FileName))/(1<<20) ); } /**Function************************************************************* diff --git a/src/map/super/superGate.c b/src/map/super/superGate.c index 380065d3..53f3da35 100644 --- a/src/map/super/superGate.c +++ b/src/map/super/superGate.c @@ -1186,7 +1186,7 @@ void Super_WriteLibrary( Super_Man_t * pMan ) if ( pMan->fVerbose ) { printf( "The supergates are written using old format \"%s\" ", FileName ); - printf( "(%0.3f Mb).\n", ((double)Extra_FileSize(FileName))/(1<<20) ); + printf( "(%0.3f MB).\n", ((double)Extra_FileSize(FileName))/(1<<20) ); } ABC_FREE( FileName ); @@ -1324,7 +1324,7 @@ void Super_WriteLibraryTree( Super_Man_t * pMan ) if ( pMan->fVerbose ) { printf( "The supergates are written using new format \"%s\" ", FileName ); - printf( "(%0.3f Mb).\n", ((double)Extra_FileSize(FileName))/(1<<20) ); + printf( "(%0.3f MB).\n", ((double)Extra_FileSize(FileName))/(1<<20) ); } ABC_FREE( FileName ); diff --git a/src/misc/bbl/bblif.c b/src/misc/bbl/bblif.c index 4ed1ef1f..1f0dbaeb 100644 --- a/src/misc/bbl/bblif.c +++ b/src/misc/bbl/bblif.c @@ -756,9 +756,9 @@ void Bbl_ManPrintStats( Bbl_Man_t * p ) Bbl_ManForEachFnc_int( p->pFncs, pFnc, h ) nFuncs++; printf( "Total objects = %7d. Total nodes = %7d. Unique functions = %7d.\n", nObjs, nNodes, nFuncs ); - printf( "Name manager = %5.2f Mb\n", 1.0*Vec_StrSize(p->pName)/(1 << 20) ); - printf( "Objs manager = %5.2f Mb\n", 1.0*Vec_StrSize(p->pObjs)/(1 << 20) ); - printf( "Fncs manager = %5.2f Mb\n", 1.0*Vec_StrSize(p->pFncs)/(1 << 20) ); + printf( "Name manager = %5.2f MB\n", 1.0*Vec_StrSize(p->pName)/(1 << 20) ); + printf( "Objs manager = %5.2f MB\n", 1.0*Vec_StrSize(p->pObjs)/(1 << 20) ); + printf( "Fncs manager = %5.2f MB\n", 1.0*Vec_StrSize(p->pFncs)/(1 << 20) ); } /**Fnction************************************************************* diff --git a/src/misc/util/abc_global.h b/src/misc/util/abc_global.h index a383644b..ea214d86 100644 --- a/src/misc/util/abc_global.h +++ b/src/misc/util/abc_global.h @@ -209,10 +209,10 @@ typedef ABC_UINT64_T word; #define ABC_PRTr(a,t) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%9.2f sec\r", 1.0*(t)/(CLOCKS_PER_SEC))) #define ABC_PRTn(a,t) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%9.2f sec ", 1.0*(t)/(CLOCKS_PER_SEC))) #define ABC_PRTP(a,t,T) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%9.2f sec (%6.2f %%)\n", 1.0*(t)/(CLOCKS_PER_SEC), (T)? 100.0*(t)/(T) : 0.0)) -#define ABC_PRM(a,f) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%10.3f Mb\n", 1.0*(f)/(1<<20))) -#define ABC_PRMr(a,f) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%10.3f Mb\r", 1.0*(f)/(1<<20))) -#define ABC_PRMn(a,f) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%10.3f Mb ", 1.0*(f)/(1<<20))) -#define ABC_PRMP(a,f,F) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%10.3f Mb (%6.2f %%)\n", (1.0*(f)/(1<<20)), ((F)? 100.0*(f)/(F) : 0.0) ) ) +#define ABC_PRM(a,f) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%10.3f MB\n", 1.0*(f)/(1<<20))) +#define ABC_PRMr(a,f) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%10.3f MB\r", 1.0*(f)/(1<<20))) +#define ABC_PRMn(a,f) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%10.3f MB ", 1.0*(f)/(1<<20))) +#define ABC_PRMP(a,f,F) (Abc_Print(1, "%s =", (a)), Abc_Print(1, "%10.3f MB (%6.2f %%)\n", (1.0*(f)/(1<<20)), ((F)? 100.0*(f)/(F) : 0.0) ) ) #define ABC_ALLOC(type, num) ((type *) malloc(sizeof(type) * (num))) #define ABC_CALLOC(type, num) ((type *) calloc((num), sizeof(type))) diff --git a/src/opt/cut/cutMan.c b/src/opt/cut/cutMan.c index 12c65935..ea3d73bb 100644 --- a/src/opt/cut/cutMan.c +++ b/src/opt/cut/cutMan.c @@ -168,7 +168,7 @@ void Cut_ManPrintStats( Cut_Man_t * p ) printf( "Nodes saturated = %8d. (Max cuts = %d.)\n", p->nCutsLimit, p->pParams->nKeepMax ); printf( "Cuts per node = %8.1f\n", ((float)(p->nCutsCur-p->nCutsTriv))/p->nNodes ); printf( "The cut size = %8d bytes.\n", p->EntrySize ); - printf( "Peak memory = %8.2f Mb.\n", (float)p->nCutsPeak * p->EntrySize / (1<<20) ); + printf( "Peak memory = %8.2f MB.\n", (float)p->nCutsPeak * p->EntrySize / (1<<20) ); printf( "Total nodes = %8d.\n", p->nNodes ); if ( p->pParams->fDag || p->pParams->fTree ) { diff --git a/src/opt/dar/darCore.c b/src/opt/dar/darCore.c index ba945f77..bbcb385e 100644 --- a/src/opt/dar/darCore.c +++ b/src/opt/dar/darCore.c @@ -317,7 +317,7 @@ Aig_MmFixed_t * Dar_ManComputeCuts( Aig_Man_t * pAig, int nCutsMax, int fSkipTtM nCuts = Dar_ManCutCount( pAig, &nCutsK ); printf( "Nodes = %6d. Total cuts = %6d. 4-input cuts = %6d.\n", Aig_ManObjNum(pAig), nCuts, nCutsK ); - printf( "Cut size = %2d. Truth size = %2d. Total mem = %5.2f Mb ", + printf( "Cut size = %2d. Truth size = %2d. Total mem = %5.2f MB ", (int)sizeof(Dar_Cut_t), (int)4, 1.0*Aig_MmFixedReadMemUsage(p->pMemCuts)/(1<<20) ); ABC_PRT( "Runtime", clock() - clk ); /* diff --git a/src/opt/dar/darMan.c b/src/opt/dar/darMan.c index dc81e759..e1094267 100644 --- a/src/opt/dar/darMan.c +++ b/src/opt/dar/darMan.c @@ -97,7 +97,7 @@ void Dar_ManPrintStats( Dar_Man_t * p ) extern void Kit_DsdPrintFromTruth( unsigned * pTruth, int nVars ); Gain = p->nNodesInit - Aig_ManNodeNum(p->pAig); - printf( "Tried = %8d. Beg = %8d. End = %8d. Gain = %6d. (%6.2f %%). Cut mem = %d Mb\n", + printf( "Tried = %8d. Beg = %8d. End = %8d. Gain = %6d. (%6.2f %%). Cut mem = %d MB\n", p->nNodesTried, p->nNodesInit, Aig_ManNodeNum(p->pAig), Gain, 100.0*Gain/p->nNodesInit, p->nCutMemUsed ); printf( "Cuts = %8d. Tried = %8d. Used = %8d. Bad = %5d. Skipped = %5d. Ave = %.2f.\n", p->nCutsAll, p->nCutsTried, p->nCutsUsed, p->nCutsBad, p->nCutsSkipped, diff --git a/src/opt/fsim/fsimSim.c b/src/opt/fsim/fsimSim.c index 5a3fffb0..14583638 100644 --- a/src/opt/fsim/fsimSim.c +++ b/src/opt/fsim/fsimSim.c @@ -495,7 +495,7 @@ int Fsim_ManSimulate( Aig_Man_t * pAig, Fsim_ParSim_t * pPars ) p->nWords = pPars->nWords; if ( pPars->fVerbose ) { - printf( "Obj = %8d (%8d). Cut = %6d. Front = %6d. FrtMem = %7.2f Mb. ", + printf( "Obj = %8d (%8d). Cut = %6d. Front = %6d. FrtMem = %7.2f MB. ", p->nObjs, p->nCis + p->nNodes, p->nCrossCutMax, p->nFront, 4.0*p->nWords*(p->nFront)/(1<<20) ); ABC_PRT( "Time", clock() - clk ); @@ -505,7 +505,7 @@ int Fsim_ManSimulate( Aig_Man_t * pAig, Fsim_ParSim_t * pPars ) Fsim_ManFront( p, pPars->fCompressAig ); if ( pPars->fVerbose ) { - printf( "Max ID = %8d. Log max ID = %2d. AigMem = %7.2f Mb (%5.2f byte/obj). ", + printf( "Max ID = %8d. Log max ID = %2d. AigMem = %7.2f MB (%5.2f byte/obj). ", p->iNumber, Aig_Base2Log(p->iNumber), 1.0*(p->pDataCur-p->pDataAig)/(1<<20), 1.0*(p->pDataCur-p->pDataAig)/p->nObjs ); @@ -545,7 +545,7 @@ int Fsim_ManSimulate( Aig_Man_t * pAig, Fsim_ParSim_t * pPars ) printf( "No bug detected after %d frames with time limit %d seconds.\n", i+1, pPars->TimeLimit ); if ( pPars->fVerbose ) { - printf( "Maxcut = %8d. AigMem = %7.2f Mb. SimMem = %7.2f Mb. ", + printf( "Maxcut = %8d. AigMem = %7.2f MB. SimMem = %7.2f MB. ", p->nCrossCutMax, p->pDataAig2? 12.0*p->nObjs/(1<<20) : 1.0*(p->pDataCur-p->pDataAig)/(1<<20), 4.0*p->nWords*(p->nFront+p->nCis+p->nCos)/(1<<20) ); diff --git a/src/opt/fsim/fsimTsim.c b/src/opt/fsim/fsimTsim.c index 78db166f..dfdd1741 100644 --- a/src/opt/fsim/fsimTsim.c +++ b/src/opt/fsim/fsimTsim.c @@ -349,7 +349,7 @@ Vec_Ptr_t * Fsim_ManTerSimulate( Aig_Man_t * pAig, int fVerbose ) p = Fsim_ManCreate( pAig ); if ( fVerbose ) { - printf( "Obj = %8d (%8d). Cut = %6d. Front = %6d. FrtMem = %7.2f Mb. ", + printf( "Obj = %8d (%8d). Cut = %6d. Front = %6d. FrtMem = %7.2f MB. ", p->nObjs, p->nCis + p->nNodes, p->nCrossCutMax, p->nFront, 4.0*Aig_BitWordNum(2 * p->nFront)/(1<<20) ); ABC_PRT( "Time", clock() - clk ); @@ -359,7 +359,7 @@ Vec_Ptr_t * Fsim_ManTerSimulate( Aig_Man_t * pAig, int fVerbose ) Fsim_ManFront( p, 0 ); if ( fVerbose ) { - printf( "Max ID = %8d. Log max ID = %2d. AigMem = %7.2f Mb (%5.2f byte/obj). ", + printf( "Max ID = %8d. Log max ID = %2d. AigMem = %7.2f MB (%5.2f byte/obj). ", p->iNumber, Aig_Base2Log(p->iNumber), 1.0*(p->pDataCur-p->pDataAig)/(1<<20), 1.0*(p->pDataCur-p->pDataAig)/p->nObjs ); @@ -395,7 +395,7 @@ Vec_Ptr_t * Fsim_ManTerSimulate( Aig_Man_t * pAig, int fVerbose ) } if ( fVerbose ) { - printf( "Maxcut = %8d. AigMem = %7.2f Mb. SimMem = %7.2f Mb. ", + printf( "Maxcut = %8d. AigMem = %7.2f MB. SimMem = %7.2f MB. ", p->nCrossCutMax, p->pDataAig2? 12.0*p->nObjs/(1<<20) : 1.0*(p->pDataCur-p->pDataAig)/(1<<20), 4.0*(Aig_BitWordNum(2 * p->nFront)+Aig_BitWordNum(2 * p->nCis)+Aig_BitWordNum(2 * p->nCos))/(1<<20) ); diff --git a/src/opt/nwk/nwkMerge.c b/src/opt/nwk/nwkMerge.c index b733e2a3..c913e0d1 100644 --- a/src/opt/nwk/nwkMerge.c +++ b/src/opt/nwk/nwkMerge.c @@ -100,7 +100,7 @@ void Nwk_ManGraphReportMemoryUsage( Nwk_Grf_t * p ) p->nMemBytes2 = sizeof(Nwk_Vrt_t) * p->nVerts + sizeof(int) * 2 * p->nEdges; - printf( "Memory usage stats: Preprocessing = %.2f Mb. Solving = %.2f Mb.\n", + printf( "Memory usage stats: Preprocessing = %.2f MB. Solving = %.2f MB.\n", 1.0 * p->nMemBytes1 / (1<<20), 1.0 * p->nMemBytes2 / (1<<20) ); } diff --git a/src/proof/cec/cecMan.c b/src/proof/cec/cecMan.c index f03ec701..1d32b99e 100644 --- a/src/proof/cec/cecMan.c +++ b/src/proof/cec/cecMan.c @@ -149,10 +149,10 @@ Cec_ManPat_t * Cec_ManPatStart() ***********************************************************************/ void Cec_ManPatPrintStats( Cec_ManPat_t * p ) { - Abc_Print( 1, "Latest: P = %8d. L = %10d. Lm = %10d. Ave = %6.1f. MEM =%6.2f Mb\n", + Abc_Print( 1, "Latest: P = %8d. L = %10d. Lm = %10d. Ave = %6.1f. MEM =%6.2f MB\n", p->nPats, p->nPatLits, p->nPatLitsMin, 1.0 * p->nPatLitsMin/p->nPats, 1.0*(Vec_StrSize(p->vStorage)-p->iStart)/(1<<20) ); - Abc_Print( 1, "Total: P = %8d. L = %10d. Lm = %10d. Ave = %6.1f. MEM =%6.2f Mb\n", + Abc_Print( 1, "Total: P = %8d. L = %10d. Lm = %10d. Ave = %6.1f. MEM =%6.2f MB\n", p->nPatsAll, p->nPatLitsAll, p->nPatLitsMinAll, 1.0 * p->nPatLitsMinAll/p->nPatsAll, 1.0*Vec_StrSize(p->vStorage)/(1<<20) ); Abc_PrintTimeP( 1, "Finding ", p->timeFind, p->timeTotal ); diff --git a/src/proof/fra/fraMan.c b/src/proof/fra/fraMan.c index 5ffbc778..194a7eb7 100644 --- a/src/proof/fra/fraMan.c +++ b/src/proof/fra/fraMan.c @@ -278,7 +278,7 @@ void Fra_ManStop( Fra_Man_t * p ) void Fra_ManPrint( Fra_Man_t * p ) { double nMemory = 1.0*Aig_ManObjNumMax(p->pManAig)*(p->pSml->nWordsTotal*sizeof(unsigned)+6*sizeof(void*))/(1<<20); - printf( "SimWord = %d. Round = %d. Mem = %0.2f Mb. LitBeg = %d. LitEnd = %d. (%6.2f %%).\n", + printf( "SimWord = %d. Round = %d. Mem = %0.2f MB. LitBeg = %d. LitEnd = %d. (%6.2f %%).\n", p->pPars->nSimWords, p->pSml->nSimRounds, nMemory, p->nLitsBeg, p->nLitsEnd, 100.0*p->nLitsEnd/(p->nLitsBeg?p->nLitsBeg:1) ); printf( "Proof = %d. Cex = %d. Fail = %d. FailReal = %d. C-lim = %d. ImpRatio = %6.2f %%\n", p->nSatProof, p->nSatCallsSat, p->nSatFails, p->nSatFailsReal, p->pPars->nBTLimitNode, Fra_ImpComputeStateSpaceRatio(p) ); diff --git a/src/proof/fraig/fraigMan.c b/src/proof/fraig/fraigMan.c index bc7c423d..c55ec1ba 100644 --- a/src/proof/fraig/fraigMan.c +++ b/src/proof/fraig/fraigMan.c @@ -352,7 +352,7 @@ void Fraig_ManPrintStats( Fraig_Man_t * p ) double nMemory; nMemory = ((double)(p->vInputs->nSize + p->vNodes->nSize) * (sizeof(Fraig_Node_t) + sizeof(unsigned)*(p->nWordsRand + p->nWordsDyna) /*+ p->nSuppWords*sizeof(unsigned)*/))/(1<<20); - printf( "Words: Random = %d. Dynamic = %d. Used = %d. Memory = %0.2f Mb.\n", + printf( "Words: Random = %d. Dynamic = %d. Used = %d. Memory = %0.2f MB.\n", p->nWordsRand, p->nWordsDyna, p->iWordPerm, nMemory ); printf( "Proof = %d. Counter-example = %d. Fail = %d. FailReal = %d. Zero = %d.\n", p->nSatProof, p->nSatCounter, p->nSatFails, p->nSatFailsReal, p->nSatZeros ); diff --git a/src/proof/ssw/sswClass.c b/src/proof/ssw/sswClass.c index 28c4947a..0b5c0ab1 100644 --- a/src/proof/ssw/sswClass.c +++ b/src/proof/ssw/sswClass.c @@ -622,7 +622,7 @@ clk = clock(); pSml = Ssw_SmlSimulateSeq( pAig, 0, nFrames, nWords ); if ( fVerbose ) { - printf( "Allocated %.2f Mb to store simulation information.\n", + printf( "Allocated %.2f MB to store simulation information.\n", 1.0*(sizeof(unsigned) * Aig_ManObjNumMax(pAig) * nFrames * nWords)/(1<<20) ); printf( "Initial simulation of %d frames with %d words. ", nFrames, nWords ); ABC_PRT( "Time", clock() - clk ); diff --git a/src/proof/ssw/sswMan.c b/src/proof/ssw/sswMan.c index e09e0904..a982c0c5 100644 --- a/src/proof/ssw/sswMan.c +++ b/src/proof/ssw/sswMan.c @@ -105,7 +105,7 @@ void Ssw_ManPrintStats( Ssw_Man_t * p ) { double nMemory = 1.0*Aig_ManObjNumMax(p->pAig)*p->nFrames*(2*sizeof(int)+2*sizeof(void*))/(1<<20); - printf( "Parameters: F = %d. AddF = %d. C-lim = %d. Constr = %d. MaxLev = %d. Mem = %0.2f Mb.\n", + printf( "Parameters: F = %d. AddF = %d. C-lim = %d. Constr = %d. MaxLev = %d. Mem = %0.2f MB.\n", p->pPars->nFramesK, p->pPars->nFramesAddSim, p->pPars->nBTLimit, Saig_ManConstrNum(p->pAig), p->pPars->nMaxLevs, nMemory ); printf( "AIG : PI = %d. PO = %d. Latch = %d. Node = %d. Ave SAT vars = %d.\n", Saig_ManPiNum(p->pAig), Saig_ManPoNum(p->pAig), Saig_ManRegNum(p->pAig), Aig_ManNodeNum(p->pAig), diff --git a/src/sat/bsat/satInter.c b/src/sat/bsat/satInter.c index 6f564225..6bd07fb7 100644 --- a/src/sat/bsat/satInter.c +++ b/src/sat/bsat/satInter.c @@ -1057,7 +1057,7 @@ int Int_ManInterpolate( Int_Man_t * p, Sto_Man_t * pCnf, int fVerbose, unsigned if ( fVerbose ) { - printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f Mb\n", + printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f MB\n", p->pCnf->nVars, p->pCnf->nRoots, p->pCnf->nClauses-p->pCnf->nRoots, p->Counter, 1.0*(p->Counter-p->pCnf->nRoots)/(p->pCnf->nClauses-p->pCnf->nRoots), 1.0*Sto_ManMemoryReport(p->pCnf)/(1<<20) ); diff --git a/src/sat/bsat/satInterA.c b/src/sat/bsat/satInterA.c index 39385026..a4a06439 100644 --- a/src/sat/bsat/satInterA.c +++ b/src/sat/bsat/satInterA.c @@ -1009,7 +1009,7 @@ void * Inta_ManInterpolate( Inta_Man_t * p, Sto_Man_t * pCnf, void * vVarsAB, in if ( fVerbose ) { // ABC_PRT( "Interpo", clock() - clkTotal ); - printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f Mb\n", + printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f MB\n", p->pCnf->nVars, p->pCnf->nRoots, p->pCnf->nClauses-p->pCnf->nRoots, p->Counter, 1.0*(p->Counter-p->pCnf->nRoots)/(p->pCnf->nClauses-p->pCnf->nRoots), 1.0*Sto_ManMemoryReport(p->pCnf)/(1<<20) ); diff --git a/src/sat/bsat/satInterB.c b/src/sat/bsat/satInterB.c index 3f7cbf4c..07edf7a8 100644 --- a/src/sat/bsat/satInterB.c +++ b/src/sat/bsat/satInterB.c @@ -1045,7 +1045,7 @@ void * Intb_ManInterpolate( Intb_Man_t * p, Sto_Man_t * pCnf, void * vVarsAB, in if ( fVerbose ) { // ABC_PRT( "Interpo", clock() - clkTotal ); - printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f Mb\n", + printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f MB\n", p->pCnf->nVars, p->pCnf->nRoots, p->pCnf->nClauses-p->pCnf->nRoots, p->Counter, 1.0*(p->Counter-p->pCnf->nRoots)/(p->pCnf->nClauses-p->pCnf->nRoots), 1.0*Sto_ManMemoryReport(p->pCnf)/(1<<20) ); diff --git a/src/sat/bsat/satInterP.c b/src/sat/bsat/satInterP.c index ebcdc82f..404d5503 100644 --- a/src/sat/bsat/satInterP.c +++ b/src/sat/bsat/satInterP.c @@ -1022,7 +1022,7 @@ void * Intp_ManUnsatCore( Intp_Man_t * p, Sto_Man_t * pCnf, int fVerbose ) if ( fVerbose ) { ABC_PRT( "Core", clock() - clkTotal ); - printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f Mb\n", + printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f MB\n", p->pCnf->nVars, p->pCnf->nRoots, p->pCnf->nClauses-p->pCnf->nRoots, p->Counter, 1.0*(p->Counter-p->pCnf->nRoots)/(p->pCnf->nClauses-p->pCnf->nRoots), 1.0*Sto_ManMemoryReport(p->pCnf)/(1<<20) ); diff --git a/src/sat/bsat/satProof.c b/src/sat/bsat/satProof.c index ca8f3716..eaadf71d 100644 --- a/src/sat/bsat/satProof.c +++ b/src/sat/bsat/satProof.c @@ -354,7 +354,7 @@ void Sat_ProofReduce2( sat_solver2 * s ) if ( fVerbose ) { printf( "\n" ); - printf( "The proof was reduced from %6.2f Mb to %6.2f Mb (by %6.2f %%) ", + printf( "The proof was reduced from %6.2f MB to %6.2f MB (by %6.2f %%) ", 1.0 * Vec_SetMemory(vProof) / (1<<20), 1.0 * Vec_SetMemoryS(vProof) / (1<<20), 100.0 * (Vec_SetMemory(vProof) - Vec_SetMemoryS(vProof)) / Vec_SetMemory(vProof) ); TimeTotal += clock() - clk; @@ -423,7 +423,7 @@ void Sat_ProofReduce( sat_solver2 * s ) if ( fVerbose ) { printf( "\n" ); - printf( "The proof was reduced from %6.2f Mb to %6.2f Mb (by %6.2f %%) ", + printf( "The proof was reduced from %6.2f MB to %6.2f MB (by %6.2f %%) ", 1.0 * Vec_SetMemory(vProof) / (1<<20), 1.0 * Vec_SetMemoryS(vProof) / (1<<20), 100.0 * (Vec_SetMemory(vProof) - Vec_SetMemoryS(vProof)) / Vec_SetMemory(vProof) ); TimeTotal += clock() - clk; @@ -555,7 +555,7 @@ void Sat_ProofCheck( sat_solver2 * s ) // clean the proof Proof_CleanCollected( vProof, vUsed ); // compare the final clause - printf( "Used %6.2f Mb for resolvents.\n", 1.0 * Vec_SetMemory(vResolves) / (1<<20) ); + printf( "Used %6.2f MB for resolvents.\n", 1.0 * Vec_SetMemory(vResolves) / (1<<20) ); if ( pSet0->nEnts > 0 ) printf( "Derived clause with %d lits instead of the empty clause. ", pSet0->nEnts ); else diff --git a/src/sat/bsat/satSolver2.c b/src/sat/bsat/satSolver2.c index af03c70d..0e456f46 100644 --- a/src/sat/bsat/satSolver2.c +++ b/src/sat/bsat/satSolver2.c @@ -1251,7 +1251,7 @@ void sat_solver2_delete(sat_solver2* s) } // report statistics -// Abc_Print(1, "Used %6.2f Mb for proof-logging. Unit clauses = %d.\n", 1.0 * Vec_ReportMemory(&s->Proofs) / (1<<20), s->nUnits ); +// Abc_Print(1, "Used %6.2f MB for proof-logging. Unit clauses = %d.\n", 1.0 * Vec_ReportMemory(&s->Proofs) / (1<<20), s->nUnits ); // delete vectors veci_delete(&s->order); diff --git a/src/sat/bsat/satUtil.c b/src/sat/bsat/satUtil.c index 67f45b16..1694ae01 100644 --- a/src/sat/bsat/satUtil.c +++ b/src/sat/bsat/satUtil.c @@ -211,7 +211,7 @@ void Sat_Solver2PrintStats( FILE * pFile, sat_solver2 * s ) printf( "propagations : %10d\n", (int)s->stats.propagations ); // printf( "inspects : %10d\n", (int)s->stats.inspects ); // printf( "inspects2 : %10d\n", (int)s->stats.inspects2 ); - printf( "memory for variables %.1f Mb (free %6.2f %%) and clauses %.1f Mb (free %6.2f %%)\n", + printf( "memory for variables %.1f MB (free %6.2f %%) and clauses %.1f MB (free %6.2f %%)\n", 1.0 * Sat_Solver2GetVarMem(s) * s->size / (1<<20), 100.0 * (s->cap - s->size) / s->cap, 4.0 * (s->clauses.cap + s->learnts.cap) / (1<<20), diff --git a/src/sat/bsat/satVec.h b/src/sat/bsat/satVec.h index 35cd3cb4..8a711007 100644 --- a/src/sat/bsat/satVec.h +++ b/src/sat/bsat/satVec.h @@ -58,7 +58,7 @@ static inline void veci_push (veci* v, int e) v->ptr = ABC_REALLOC( int, v->ptr, newsize ); if ( v->ptr == NULL ) { - printf( "Failed to realloc memory from %.1f Mb to %.1f Mb.\n", + printf( "Failed to realloc memory from %.1f MB to %.1f MB.\n", 1.0 * v->cap / (1<<20), 1.0 * newsize / (1<<20) ); fflush( stdout ); } diff --git a/src/sat/proof/pr.c b/src/sat/proof/pr.c index 7fbe3803..2727997a 100644 --- a/src/sat/proof/pr.c +++ b/src/sat/proof/pr.c @@ -1244,7 +1244,7 @@ p->timeRead = clock() - clk; 1.0*(p->Counter-p->nRoots)/(p->nClauses-p->nRoots), nUsed, 1.0*nUsed/(p->nClauses-p->nRoots) ); */ - printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f Mb\n", + printf( "Vars = %d. Roots = %d. Learned = %d. Resol steps = %d. Ave = %.2f. Mem = %.2f MB\n", p->nVars, p->nRoots, p->nClauses-p->nRoots, p->Counter, 1.0*(p->Counter-p->nRoots)/(p->nClauses-p->nRoots), 1.0*Pr_ManMemoryReport(p)/(1<<20) ); -- cgit v1.2.3