diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-09 22:57:03 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-09 22:57:03 -0700 |
commit | 908d5e696c7e73f80abcef85ec796511f3bffb0f (patch) | |
tree | 6fb41dd27d8ae48d93f71cda4ed56526092c5302 /src/aig | |
parent | d46c49088d7b9f1725d4d8624717f7209022c632 (diff) | |
download | abc-908d5e696c7e73f80abcef85ec796511f3bffb0f.tar.gz abc-908d5e696c7e73f80abcef85ec796511f3bffb0f.tar.bz2 abc-908d5e696c7e73f80abcef85ec796511f3bffb0f.zip |
Replacing Mb/Gb to be MB/GB.
Diffstat (limited to 'src/aig')
-rw-r--r-- | src/aig/aig/aigCuts.c | 2 | ||||
-rw-r--r-- | src/aig/aig/aigPart.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaAbsGla.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaAbsVta.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaEmbed.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaEquiv.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaEra.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaEra2.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaForce.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaIf.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaMan.c | 6 | ||||
-rw-r--r-- | src/aig/gia/giaSim.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaSim2.c | 4 | ||||
-rw-r--r-- | src/aig/gia/giaSwitch.c | 2 | ||||
-rw-r--r-- | src/aig/gia/giaTsim.c | 2 | ||||
-rw-r--r-- | src/aig/ivy/ivyFraig.c | 2 | ||||
-rw-r--r-- | src/aig/saig/saigBmc2.c | 6 | ||||
-rw-r--r-- | src/aig/saig/saigBmc3.c | 12 | ||||
-rw-r--r-- | src/aig/saig/saigSimFast.c | 6 | ||||
-rw-r--r-- | src/aig/saig/saigSimSeq.c | 2 | ||||
-rw-r--r-- | src/aig/saig/saigStrSim.c | 4 | ||||
-rw-r--r-- | src/aig/saig/saigSwitch.c | 2 |
22 files changed, 38 insertions, 38 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; |