diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 17:46:54 -0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-07-07 17:46:54 -0700 |
commit | 3aab7245738a69f1dd4d898493d5dabf6596ea61 (patch) | |
tree | 16a23107ca27a250e82c492dcdd1a2bea640cff6 /src/opt/nwk | |
parent | 16d96fcf533fb77ff4a45992991e38ac7ea74bb3 (diff) | |
download | abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.tar.gz abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.tar.bz2 abc-3aab7245738a69f1dd4d898493d5dabf6596ea61.zip |
Fixing time primtouts throughout the code.
Diffstat (limited to 'src/opt/nwk')
-rw-r--r-- | src/opt/nwk/nwkBidec.c | 2 | ||||
-rw-r--r-- | src/opt/nwk/nwkFlow.c | 4 | ||||
-rw-r--r-- | src/opt/nwk/nwkMap.c | 3 | ||||
-rw-r--r-- | src/opt/nwk/nwkMerge.c | 5 | ||||
-rw-r--r-- | src/opt/nwk/nwkUtil.c | 3 |
5 files changed, 10 insertions, 7 deletions
diff --git a/src/opt/nwk/nwkBidec.c b/src/opt/nwk/nwkBidec.c index 1b6439d2..2f1c0366 100644 --- a/src/opt/nwk/nwkBidec.c +++ b/src/opt/nwk/nwkBidec.c @@ -133,7 +133,7 @@ void Nwk_ManBidecResyn( Nwk_Man_t * pNtk, int fVerbose ) Nwk_Obj_t * pObj; Vec_Int_t * vTruth; int i, nGainTotal = 0, nNodes1, nNodes2; - int clk = clock(); + clock_t clk = clock(); pPars->nVarsMax = Nwk_ManGetFaninMax( pNtk ); pPars->fVerbose = fVerbose; if ( pPars->nVarsMax < 2 ) diff --git a/src/opt/nwk/nwkFlow.c b/src/opt/nwk/nwkFlow.c index 3961e5c2..50a4787f 100644 --- a/src/opt/nwk/nwkFlow.c +++ b/src/opt/nwk/nwkFlow.c @@ -444,7 +444,7 @@ Vec_Ptr_t * Nwk_ManRetimeCutForward( Nwk_Man_t * pMan, int nLatches, int fVerbos Vec_Ptr_t * vNodes; Nwk_Obj_t * pObj; int i, RetValue, Counter = 0, Counter2 = 0; - int clk = clock(); + clock_t clk = clock(); // set the sequential parameters pMan->nLatches = nLatches; pMan->nTruePis = Nwk_ManCiNum(pMan) - nLatches; @@ -525,7 +525,7 @@ Vec_Ptr_t * Nwk_ManRetimeCutBackward( Nwk_Man_t * pMan, int nLatches, int fVerbo Vec_Ptr_t * vNodes; Nwk_Obj_t * pObj; int i, RetValue, Counter = 0, Counter2 = 0; - int clk = clock(); + clock_t clk = clock(); // set the sequential parameters pMan->nLatches = nLatches; pMan->nTruePis = Nwk_ManCiNum(pMan) - nLatches; diff --git a/src/opt/nwk/nwkMap.c b/src/opt/nwk/nwkMap.c index 5f08e179..3de55c43 100644 --- a/src/opt/nwk/nwkMap.c +++ b/src/opt/nwk/nwkMap.c @@ -109,7 +109,8 @@ If_Man_t * Nwk_ManToIf( Aig_Man_t * p, If_Par_t * pPars, Vec_Ptr_t * vAigToIf ) If_Man_t * pIfMan; If_Obj_t * pIfObj; Aig_Obj_t * pNode, * pFanin, * pPrev; - int i, clk = clock(); + int i; + clock_t clk = clock(); // set the number of registers (switch activity will be combinational) Aig_ManSetRegNum( p, 0 ); if ( pPars->fPower ) diff --git a/src/opt/nwk/nwkMerge.c b/src/opt/nwk/nwkMerge.c index 2a43bc16..b733e2a3 100644 --- a/src/opt/nwk/nwkMerge.c +++ b/src/opt/nwk/nwkMerge.c @@ -704,7 +704,7 @@ int Nwk_ManLutMergeGraphTest( char * pFileName ) { int nPairs; Nwk_Grf_t * p; - int clk = clock(); + clock_t clk = clock(); p = Nwk_ManLutMergeReadGraph( pFileName ); ABC_PRT( "Reading", clock() - clk ); clk = clock(); @@ -974,7 +974,8 @@ Vec_Int_t * Nwk_ManLutMerge( Nwk_Man_t * pNtk, void * pParsInit ) Vec_Int_t * vResult; Vec_Ptr_t * vStart, * vNext, * vCands1, * vCands2; Nwk_Obj_t * pLut, * pCand; - int i, k, nVertsMax, nCands, clk = clock(); + int i, k, nVertsMax, nCands; + clock_t clk = clock(); // count the number of vertices nVertsMax = 0; Nwk_ManForEachNode( pNtk, pLut, i ) diff --git a/src/opt/nwk/nwkUtil.c b/src/opt/nwk/nwkUtil.c index 9d23c869..cf3e5bf3 100644 --- a/src/opt/nwk/nwkUtil.c +++ b/src/opt/nwk/nwkUtil.c @@ -543,7 +543,8 @@ int Nwk_ManMinimumBaseInt( Nwk_Man_t * pNtk, int fVerbose ) ***********************************************************************/ void Nwk_ManMinimumBaseRec( Nwk_Man_t * pNtk, int fVerbose ) { - int i, clk = clock(); + int i; + clock_t clk = clock(); for ( i = 0; Nwk_ManMinimumBaseInt( pNtk, fVerbose ); i++ ); ABC_PRT( "Minbase", clock() - clk ); } |