luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced printfs with Abc_Print

This commit is contained in:
Niklas Een 2012-10-29 15:27:40 -07:00
parent f21615ecc2
commit c3a773d94f
1 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/proof/ssw/sswClass.c
View File

@ -393,11 +393,11 @@ void Ssw_ClassesPrintOne( Ssw_Cla_t * p, Aig_Obj_t * pRepr )
{ {
Aig_Obj_t * pObj; Aig_Obj_t * pObj;
int i; int i;
printf( "{ " ); Abc_Print( 1, "{ " );
Ssw_ClassForEachNode( p, pRepr, pObj, i ) Ssw_ClassForEachNode( p, pRepr, pObj, i )
printf( "%d(%d,%d,%d) ", pObj->Id, pObj->Level, Abc_Print( 1, "%d(%d,%d,%d) ", pObj->Id, pObj->Level,
Aig_SupportSize(p->pAig,pObj), Aig_NodeMffcSupp(p->pAig,pObj,0,NULL) ); Aig_SupportSize(p->pAig,pObj), Aig_NodeMffcSupp(p->pAig,pObj,0,NULL) );
printf( "}\n" ); Abc_Print( 1, "}\n" );
} }
/**Function************************************************************* /**Function*************************************************************
@ -416,22 +416,22 @@ void Ssw_ClassesPrint( Ssw_Cla_t * p, int fVeryVerbose )
Aig_Obj_t ** ppClass; Aig_Obj_t ** ppClass;
Aig_Obj_t * pObj; Aig_Obj_t * pObj;
int i; int i;
printf( "Equiv classes: Const1 = %5d. Class = %5d. Lit = %5d.\n", Abc_Print( 1, "Equiv classes: Const1 = %5d. Class = %5d. Lit = %5d.\n",
p->nCands1, p->nClasses, p->nCands1+p->nLits ); p->nCands1, p->nClasses, p->nCands1+p->nLits );
if ( !fVeryVerbose ) if ( !fVeryVerbose )
return; return;
printf( "Constants { " ); Abc_Print( 1, "Constants { " );
Aig_ManForEachObj( p->pAig, pObj, i ) Aig_ManForEachObj( p->pAig, pObj, i )
if ( Ssw_ObjIsConst1Cand( p->pAig, pObj ) ) if ( Ssw_ObjIsConst1Cand( p->pAig, pObj ) )
printf( "%d(%d,%d,%d) ", pObj->Id, pObj->Level, Abc_Print( 1, "%d(%d,%d,%d) ", pObj->Id, pObj->Level,
Aig_SupportSize(p->pAig,pObj), Aig_NodeMffcSupp(p->pAig,pObj,0,NULL) ); Aig_SupportSize(p->pAig,pObj), Aig_NodeMffcSupp(p->pAig,pObj,0,NULL) );
printf( "}\n" ); Abc_Print( 1, "}\n" );
Ssw_ManForEachClass( p, ppClass, i ) Ssw_ManForEachClass( p, ppClass, i )
{ {
printf( "%3d (%3d) : ", i, p->pClassSizes[i] ); Abc_Print( 1, "%3d (%3d) : ", i, p->pClassSizes[i] );
Ssw_ClassesPrintOne( p, ppClass[0] ); Ssw_ClassesPrintOne( p, ppClass[0] );
} }
printf( "\n" ); Abc_Print( 1, "\n" );
} }
/**Function************************************************************* /**Function*************************************************************
@ -622,9 +622,9 @@ clk = clock();
pSml = Ssw_SmlSimulateSeq( pAig, 0, nFrames, nWords ); pSml = Ssw_SmlSimulateSeq( pAig, 0, nFrames, nWords );
if ( fVerbose ) if ( fVerbose )
{ {
printf( "Allocated %.2f MB to store simulation information.\n", Abc_Print( 1, "Allocated %.2f MB to store simulation information.\n",
1.0*(sizeof(unsigned) * Aig_ManObjNumMax(pAig) * nFrames * nWords)/(1<<20) ); 1.0*(sizeof(unsigned) * Aig_ManObjNumMax(pAig) * nFrames * nWords)/(1<<20) );
printf( "Initial simulation of %d frames with %d words. ", nFrames, nWords ); Abc_Print( 1, "Initial simulation of %d frames with %d words. ", nFrames, nWords );
ABC_PRT( "Time", clock() - clk ); ABC_PRT( "Time", clock() - clk );
} }
@ -676,7 +676,7 @@ clk = clock();
Ssw_ClassesPrepareRehash( p, vCands, fConstCorr ); Ssw_ClassesPrepareRehash( p, vCands, fConstCorr );
if ( fVerbose ) if ( fVerbose )
{ {
printf( "Collecting candidate equivalence classes. " ); Abc_Print( 1, "Collecting candidate equivalence classes. " );
ABC_PRT( "Time", clock() - clk ); ABC_PRT( "Time", clock() - clk );
} }
@ -701,7 +701,7 @@ clk = clock();
Vec_PtrFree( vCands ); Vec_PtrFree( vCands );
if ( fVerbose ) if ( fVerbose )
{ {
printf( "Simulation of %d frames with %d words (%2d rounds). ", Abc_Print( 1, "Simulation of %d frames with %d words (%2d rounds). ",
nFrames, nWords, i-1 ); nFrames, nWords, i-1 );
ABC_PRT( "Time", clock() - clk ); ABC_PRT( "Time", clock() - clk );
} }
@ -812,7 +812,7 @@ Ssw_Cla_t * Ssw_ClassesPrepareFromReprs( Aig_Man_t * pAig )
p->nLits = nEntries - p->nClasses; p->nLits = nEntries - p->nClasses;
assert( memcmp(pClassSizes, p->pClassSizes, sizeof(int)*Aig_ManObjNumMax(pAig)) == 0 ); assert( memcmp(pClassSizes, p->pClassSizes, sizeof(int)*Aig_ManObjNumMax(pAig)) == 0 );
ABC_FREE( pClassSizes ); ABC_FREE( pClassSizes );
// printf( "After converting:\n" ); // Abc_Print( 1, "After converting:\n" );
// Ssw_ClassesPrint( p, 0 ); // Ssw_ClassesPrint( p, 0 );
return p; return p;
} }
@ -1168,4 +1168,3 @@ int Ssw_ClassesRefineConst1( Ssw_Cla_t * p, int fRecursive )
ABC_NAMESPACE_IMPL_END ABC_NAMESPACE_IMPL_END