summaryrefslogtreecommitdiffstats
path: root/src/aig/saig
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2012-07-09 22:57:03 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2012-07-09 22:57:03 -0700
commit908d5e696c7e73f80abcef85ec796511f3bffb0f (patch)
tree6fb41dd27d8ae48d93f71cda4ed56526092c5302 /src/aig/saig
parentd46c49088d7b9f1725d4d8624717f7209022c632 (diff)
downloadabc-908d5e696c7e73f80abcef85ec796511f3bffb0f.tar.gz
abc-908d5e696c7e73f80abcef85ec796511f3bffb0f.tar.bz2
abc-908d5e696c7e73f80abcef85ec796511f3bffb0f.zip
Replacing Mb/Gb to be MB/GB.
Diffstat (limited to 'src/aig/saig')
-rw-r--r--src/aig/saig/saigBmc2.c6
-rw-r--r--src/aig/saig/saigBmc3.c12
-rw-r--r--src/aig/saig/saigSimFast.c6
-rw-r--r--src/aig/saig/saigSimSeq.c2
-rw-r--r--src/aig/saig/saigStrSim.c4
-rw-r--r--src/aig/saig/saigSwitch.c2
6 files changed, 16 insertions, 16 deletions
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;