diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2009-02-15 08:01:00 -0800 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2009-02-15 08:01:00 -0800 |
commit | 0871bffae307e0553e0c5186336189e8b55cf6a6 (patch) | |
tree | 4571d1563fe33a53a57fea1c35fb668b9d33265f /src/opt/sim/simMan.c | |
parent | f936cc0680c98ffe51b3a1716c996072d5dbf76c (diff) | |
download | abc-0871bffae307e0553e0c5186336189e8b55cf6a6.tar.gz abc-0871bffae307e0553e0c5186336189e8b55cf6a6.tar.bz2 abc-0871bffae307e0553e0c5186336189e8b55cf6a6.zip |
Version abc90215
Diffstat (limited to 'src/opt/sim/simMan.c')
-rw-r--r-- | src/opt/sim/simMan.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/opt/sim/simMan.c b/src/opt/sim/simMan.c index 139a1a05..6a86e25f 100644 --- a/src/opt/sim/simMan.c +++ b/src/opt/sim/simMan.c @@ -45,7 +45,7 @@ Sym_Man_t * Sym_ManStart( Abc_Ntk_t * pNtk, int fVerbose ) Sym_Man_t * p; int i, v; // start the manager - p = ALLOC( Sym_Man_t, 1 ); + p = ABC_ALLOC( Sym_Man_t, 1 ); memset( p, 0, sizeof(Sym_Man_t) ); p->pNtk = pNtk; p->vNodes = Abc_NtkDfs( pNtk, 0 ); @@ -66,9 +66,9 @@ Sym_Man_t * Sym_ManStart( Abc_Ntk_t * pNtk, int fVerbose ) p->vMatrNonSymms->pArray[i] = Extra_BitMatrixStart( p->nInputs ); } // temporary patterns - p->uPatRand = ALLOC( unsigned, p->nSimWords ); - p->uPatCol = ALLOC( unsigned, p->nSimWords ); - p->uPatRow = ALLOC( unsigned, p->nSimWords ); + p->uPatRand = ABC_ALLOC( unsigned, p->nSimWords ); + p->uPatCol = ABC_ALLOC( unsigned, p->nSimWords ); + p->uPatRow = ABC_ALLOC( unsigned, p->nSimWords ); p->vVarsU = Vec_IntStart( 100 ); p->vVarsV = Vec_IntStart( 100 ); // compute supports @@ -77,7 +77,7 @@ Sym_Man_t * Sym_ManStart( Abc_Ntk_t * pNtk, int fVerbose ) for ( i = 0; i < p->nOutputs; i++ ) for ( v = 0; v < p->nInputs; v++ ) if ( Sim_SuppFunHasVar( p->vSuppFun, i, v ) ) - Vec_VecPush( p->vSupports, i, (void *)(PORT_PTRUINT_T)v ); + Vec_VecPush( p->vSupports, i, (void *)(ABC_PTRUINT_T)v ); return p; } @@ -112,10 +112,10 @@ void Sym_ManStop( Sym_Man_t * p ) Vec_IntFree( p->vPairsTotal ); Vec_IntFree( p->vPairsSym ); Vec_IntFree( p->vPairsNonSym ); - FREE( p->uPatRand ); - FREE( p->uPatCol ); - FREE( p->uPatRow ); - free( p ); + ABC_FREE( p->uPatRand ); + ABC_FREE( p->uPatCol ); + ABC_FREE( p->uPatRow ); + ABC_FREE( p ); } /**Function************************************************************* @@ -139,13 +139,13 @@ void Sym_ManPrintStats( Sym_Man_t * p ) printf( "Total var pairs = %8d.\n", p->nPairsTotal ); printf( "Sat runs SAT = %8d.\n", p->nSatRunsSat ); printf( "Sat runs UNSAT = %8d.\n", p->nSatRunsUnsat ); - PRT( "Structural ", p->timeStruct ); - PRT( "Simulation ", p->timeSim ); - PRT( "Matrix ", p->timeMatr ); - PRT( "Counting ", p->timeCount ); - PRT( "Fraiging ", p->timeFraig ); - PRT( "SAT ", p->timeSat ); - PRT( "TOTAL ", p->timeTotal ); + ABC_PRT( "Structural ", p->timeStruct ); + ABC_PRT( "Simulation ", p->timeSim ); + ABC_PRT( "Matrix ", p->timeMatr ); + ABC_PRT( "Counting ", p->timeCount ); + ABC_PRT( "Fraiging ", p->timeFraig ); + ABC_PRT( "SAT ", p->timeSat ); + ABC_PRT( "TOTAL ", p->timeTotal ); } @@ -164,7 +164,7 @@ Sim_Man_t * Sim_ManStart( Abc_Ntk_t * pNtk, int fLightweight ) { Sim_Man_t * p; // start the manager - p = ALLOC( Sim_Man_t, 1 ); + p = ABC_ALLOC( Sim_Man_t, 1 ); memset( p, 0, sizeof(Sim_Man_t) ); p->pNtk = pNtk; p->nInputs = Abc_NtkCiNum(p->pNtk); @@ -213,7 +213,7 @@ void Sim_ManStop( Sim_Man_t * p ) if ( p->pMmPat ) Extra_MmFixedStop( p->pMmPat ); if ( p->vFifo ) Vec_PtrFree( p->vFifo ); if ( p->vDiffs ) Vec_IntFree( p->vDiffs ); - free( p ); + ABC_FREE( p ); } /**Function************************************************************* @@ -235,11 +235,11 @@ void Sim_ManPrintStats( Sim_Man_t * p ) printf( "Total struct supps = %8d.\n", Sim_UtilCountSuppSizes(p, 1) ); printf( "Sat runs SAT = %8d.\n", p->nSatRunsSat ); printf( "Sat runs UNSAT = %8d.\n", p->nSatRunsUnsat ); - PRT( "Simulation ", p->timeSim ); - PRT( "Traversal ", p->timeTrav ); - PRT( "Fraiging ", p->timeFraig ); - PRT( "SAT ", p->timeSat ); - PRT( "TOTAL ", p->timeTotal ); + ABC_PRT( "Simulation ", p->timeSim ); + ABC_PRT( "Traversal ", p->timeTrav ); + ABC_PRT( "Fraiging ", p->timeFraig ); + ABC_PRT( "SAT ", p->timeSat ); + ABC_PRT( "TOTAL ", p->timeTotal ); } |