diff options
Diffstat (limited to 'src/opt/cut')
-rw-r--r-- | src/opt/cut/cut.h | 2 | ||||
-rw-r--r-- | src/opt/cut/cutInt.h | 12 | ||||
-rw-r--r-- | src/opt/cut/cutMan.c | 2 | ||||
-rw-r--r-- | src/opt/cut/cutNode.c | 30 | ||||
-rw-r--r-- | src/opt/cut/cutOracle.c | 6 | ||||
-rw-r--r-- | src/opt/cut/cutPre22.c | 28 | ||||
-rw-r--r-- | src/opt/cut/cutSeq.c | 6 |
7 files changed, 43 insertions, 43 deletions
diff --git a/src/opt/cut/cut.h b/src/opt/cut/cut.h index 64d3108a..9d4e223b 100644 --- a/src/opt/cut/cut.h +++ b/src/opt/cut/cut.h @@ -124,7 +124,7 @@ extern int Cut_CutCountList( Cut_Cut_t * pList ); extern Cut_Man_t * Cut_ManStart( Cut_Params_t * pParams ); extern void Cut_ManStop( Cut_Man_t * p ); extern void Cut_ManPrintStats( Cut_Man_t * p ); -extern void Cut_ManPrintStatsToFile( Cut_Man_t * p, char * pFileName, clock_t TimeTotal ); +extern void Cut_ManPrintStatsToFile( Cut_Man_t * p, char * pFileName, abctime TimeTotal ); extern void Cut_ManSetFanoutCounts( Cut_Man_t * p, Vec_Int_t * vFanCounts ); extern void Cut_ManSetNodeAttrs( Cut_Man_t * p, Vec_Int_t * vFanCounts ); extern int Cut_ManReadVarsMax( Cut_Man_t * p ); diff --git a/src/opt/cut/cutInt.h b/src/opt/cut/cutInt.h index 754779a3..957cf2c2 100644 --- a/src/opt/cut/cutInt.h +++ b/src/opt/cut/cutInt.h @@ -92,12 +92,12 @@ struct Cut_ManStruct_t_ int nNodesDag; int nNodesNoCuts; // runtime - clock_t timeMerge; - clock_t timeUnion; - clock_t timeTruth; - clock_t timeFilter; - clock_t timeHash; - clock_t timeMap; + abctime timeMerge; + abctime timeUnion; + abctime timeTruth; + abctime timeFilter; + abctime timeHash; + abctime timeMap; }; // iterator through all the cuts of the list diff --git a/src/opt/cut/cutMan.c b/src/opt/cut/cutMan.c index ea3d73bb..2a82d8bb 100644 --- a/src/opt/cut/cutMan.c +++ b/src/opt/cut/cutMan.c @@ -201,7 +201,7 @@ void Cut_ManPrintStats( Cut_Man_t * p ) SeeAlso [] ***********************************************************************/ -void Cut_ManPrintStatsToFile( Cut_Man_t * p, char * pFileName, clock_t TimeTotal ) +void Cut_ManPrintStatsToFile( Cut_Man_t * p, char * pFileName, abctime TimeTotal ) { FILE * pTable; pTable = fopen( "cut_stats.txt", "a+" ); diff --git a/src/opt/cut/cutNode.c b/src/opt/cut/cutNode.c index 4f94011a..11810c33 100644 --- a/src/opt/cut/cutNode.c +++ b/src/opt/cut/cutNode.c @@ -370,7 +370,7 @@ Cut_Cut_t * Cut_NodeComputeCuts( Cut_Man_t * p, int Node, int Node0, int Node1, { Cut_List_t Super, * pSuper = &Super; Cut_Cut_t * pList, * pCut; - clock_t clk; + abctime clk; // start the number of cuts at the node p->nNodes++; p->nNodeCuts = 0; @@ -381,11 +381,11 @@ Cut_Cut_t * Cut_NodeComputeCuts( Cut_Man_t * p, int Node, int Node0, int Node1, Cut_CutNumberList( Cut_NodeReadCutsNew(p, Node1) ); } // compute the cuts -clk = clock(); +clk = Abc_Clock(); Cut_ListStart( pSuper ); Cut_NodeDoComputeCuts( p, pSuper, Node, fCompl0, fCompl1, Cut_NodeReadCutsNew(p, Node0), Cut_NodeReadCutsNew(p, Node1), fTriv, TreeCode ); pList = Cut_ListFinish( pSuper ); -p->timeMerge += clock() - clk; +p->timeMerge += Abc_Clock() - clk; // verify the result of cut computation // Cut_CutListVerify( pList ); // performing the recording @@ -414,12 +414,12 @@ p->timeMerge += clock() - clk; ///// Cut_NodeWriteCutsNew( p, Node, pList ); // filter the cuts -//clk = clock(); +//clk = Abc_Clock(); // if ( p->pParams->fFilter ) // Cut_CutFilter( p, pList0 ); -//p->timeFilter += clock() - clk; +//p->timeFilter += Abc_Clock() - clk; // perform mapping of this node with these cuts -clk = clock(); +clk = Abc_Clock(); if ( p->pParams->fMap && !p->pParams->fSeq ) { // int Delay1, Delay2; @@ -428,7 +428,7 @@ clk = clock(); // assert( Delay1 >= Delay2 ); Cut_NodeMapping( p, pList, Node, Node0, Node1 ); } -p->timeMap += clock() - clk; +p->timeMap += Abc_Clock() - clk; return pList; } @@ -681,7 +681,7 @@ Cut_Cut_t * Cut_NodeUnionCuts( Cut_Man_t * p, Vec_Int_t * vNodes ) Cut_Cut_t * pList, * pListStart, * pCut, * pCut2; Cut_Cut_t * pTop = NULL; // Suppress "might be used uninitialized" int i, k, Node, Root, Limit = p->pParams->nVarsMax; - clock_t clk = clock(); + abctime clk = Abc_Clock(); // start the new list Cut_ListStart( pSuper ); @@ -771,12 +771,12 @@ finish : assert( Cut_NodeReadCutsNew(p, Root) == NULL ); pList = Cut_ListFinish( pSuper ); Cut_NodeWriteCutsNew( p, Root, pList ); -p->timeUnion += clock() - clk; +p->timeUnion += Abc_Clock() - clk; // filter the cuts -//clk = clock(); +//clk = Abc_Clock(); // if ( p->pParams->fFilter ) // Cut_CutFilter( p, pList ); -//p->timeFilter += clock() - clk; +//p->timeFilter += Abc_Clock() - clk; p->nNodes -= vNodes->nSize - 1; return pList; } @@ -797,7 +797,7 @@ Cut_Cut_t * Cut_NodeUnionCutsSeq( Cut_Man_t * p, Vec_Int_t * vNodes, int CutSetN Cut_List_t Super, * pSuper = &Super; Cut_Cut_t * pList, * pListStart, * pCut, * pCut2, * pTop; int i, k, Node, Root, Limit = p->pParams->nVarsMax; - clock_t clk = clock(); + abctime clk = Abc_Clock(); // start the new list Cut_ListStart( pSuper ); @@ -953,12 +953,12 @@ finish : Cut_NodeWriteCutsNew( p, Root, pList ); } -p->timeUnion += clock() - clk; +p->timeUnion += Abc_Clock() - clk; // filter the cuts -//clk = clock(); +//clk = Abc_Clock(); // if ( p->pParams->fFilter ) // Cut_CutFilter( p, pList ); -//p->timeFilter += clock() - clk; +//p->timeFilter += Abc_Clock() - clk; // if ( fFirst ) // p->nNodes -= vNodes->nSize - 1; return pList; diff --git a/src/opt/cut/cutOracle.c b/src/opt/cut/cutOracle.c index 5b740da5..59d823c8 100644 --- a/src/opt/cut/cutOracle.c +++ b/src/opt/cut/cutOracle.c @@ -46,7 +46,7 @@ struct Cut_OracleStruct_t_ int EntrySize; int nTruthWords; // stats - clock_t timeTotal; + abctime timeTotal; int nCuts; int nCutsTriv; }; @@ -322,7 +322,7 @@ Cut_Cut_t * Cut_OracleComputeCuts( Cut_Oracle_t * p, int Node, int Node0, int No Cut_Cut_t * pList = NULL, ** ppTail = &pList; Cut_Cut_t * pCut, * pCut0, * pCut1, * pList0, * pList1; int iCutStart, nCuts, i, Entry; - clock_t clk = clock(); + abctime clk = Abc_Clock(); // get the cuts of the children pList0 = (Cut_Cut_t *)Vec_PtrEntry( p->vCutsNew, Node0 ); @@ -367,7 +367,7 @@ Cut_Cut_t * Cut_OracleComputeCuts( Cut_Oracle_t * p, int Node, int Node0, int No // write the new cut assert( Vec_PtrEntry( p->vCutsNew, Node ) == NULL ); Vec_PtrWriteEntry( p->vCutsNew, Node, pList ); -p->timeTotal += clock() - clk; +p->timeTotal += Abc_Clock() - clk; return pList; } diff --git a/src/opt/cut/cutPre22.c b/src/opt/cut/cutPre22.c index 0eeea66b..ea1ab64f 100644 --- a/src/opt/cut/cutPre22.c +++ b/src/opt/cut/cutPre22.c @@ -69,9 +69,9 @@ struct Cut_CMan_t_ int nVarCounts[CUT_CELL_MVAR+1]; int nSymGroups[CUT_CELL_MVAR+1]; int nSymGroupsE[CUT_CELL_MVAR+1]; - clock_t timeCanon; - clock_t timeSupp; - clock_t timeTable; + abctime timeCanon; + abctime timeSupp; + abctime timeTable; int nCellFound; int nCellNotFound; }; @@ -235,7 +235,7 @@ void Cut_CellPrecompute() Cut_CMan_t * p; Cut_Cell_t * pCell, * pTemp; int i1, i2, i3, i, j, k, c; - clock_t clk = clock(); //, clk2 = clock(); + abctime clk = Abc_Clock(); //, clk2 = Abc_Clock(); p = Cut_CManStart(); @@ -402,7 +402,7 @@ void Cut_CellPrecompute() } printf( "BASIC: Total = %d. Good = %d. Entry = %d. ", (int)p->nTotal, (int)p->nGood, (int)sizeof(Cut_Cell_t) ); - ABC_PRT( "Time", clock() - clk ); + ABC_PRT( "Time", Abc_Clock() - clk ); printf( "Cells: " ); for ( i = 0; i <= 9; i++ ) printf( "%d=%d ", i, p->nVarCounts[i] ); @@ -438,16 +438,16 @@ void Cut_CellPrecompute() pCell->CrossBarPhase = c; Cut_CellCrossBar( pCell ); // minimize the support -//clk2 = clock(); +//clk2 = Abc_Clock(); Cut_CellSuppMin( pCell ); -//p->timeSupp += clock() - clk2; +//p->timeSupp += Abc_Clock() - clk2; // canonicize -//clk2 = clock(); +//clk2 = Abc_Clock(); pCell->CanonPhase = Extra_TruthSemiCanonicize( pCell->uTruth, p->puAux, pCell->nVars, pCell->CanonPerm, pCell->Store ); -//p->timeCanon += clock() - clk2; +//p->timeCanon += Abc_Clock() - clk2; // add to the table -//clk2 = clock(); +//clk2 = Abc_Clock(); p->nTotal++; if ( Cut_CellTableLookup( p, pCell ) ) // already exists Extra_MmFixedEntryRecycle( p->pMem, (char *)pCell ); @@ -482,11 +482,11 @@ void Cut_CellPrecompute() } */ } -//p->timeTable += clock() - clk2; +//p->timeTable += Abc_Clock() - clk2; } printf( "VAR %d: Total = %d. Good = %d. Entry = %d. ", k, p->nTotal, p->nGood, (int)sizeof(Cut_Cell_t) ); - ABC_PRT( "Time", clock() - clk ); + ABC_PRT( "Time", Abc_Clock() - clk ); printf( "Cells: " ); for ( i = 0; i <= 9; i++ ) printf( "%d=%d ", i, p->nVarCounts[i] ); @@ -841,7 +841,7 @@ void Cut_CellDumpToFile() int NumUsed[10][5] = {{0}}; int BoxUsed[22][5] = {{0}}; int i, k, Counter; - clock_t clk = clock(); + abctime clk = Abc_Clock(); if ( p == NULL ) { @@ -920,7 +920,7 @@ void Cut_CellDumpToFile() printf( "Library composed of %d functions is written into file \"%s\". ", Counter, pFileName ); - ABC_PRT( "Time", clock() - clk ); + ABC_PRT( "Time", Abc_Clock() - clk ); } diff --git a/src/opt/cut/cutSeq.c b/src/opt/cut/cutSeq.c index e1df2c95..d4f2d85f 100644 --- a/src/opt/cut/cutSeq.c +++ b/src/opt/cut/cutSeq.c @@ -73,7 +73,7 @@ void Cut_NodeComputeCutsSeq( Cut_Man_t * p, int Node, int Node0, int Node1, int { Cut_List_t Super, * pSuper = &Super; Cut_Cut_t * pListNew; - clock_t clk; + abctime clk; // get the number of cuts at the node p->nNodeCuts = Cut_CutCountList( Cut_NodeReadCutsOld(p, Node) ); @@ -110,13 +110,13 @@ void Cut_NodeComputeCutsSeq( Cut_Man_t * p, int Node, int Node0, int Node1, int p->pCompareNew = Cut_NodeReadCutsNew( p, Node ); // merge the old and the new -clk = clock(); +clk = Abc_Clock(); Cut_ListStart( pSuper ); Cut_NodeDoComputeCuts( p, pSuper, Node, fCompl0, fCompl1, p->pStore0[0], p->pStore1[1], 0, 0 ); Cut_NodeDoComputeCuts( p, pSuper, Node, fCompl0, fCompl1, p->pStore0[1], p->pStore1[0], 0, 0 ); Cut_NodeDoComputeCuts( p, pSuper, Node, fCompl0, fCompl1, p->pStore0[1], p->pStore1[1], fTriv, 0 ); pListNew = Cut_ListFinish( pSuper ); -p->timeMerge += clock() - clk; +p->timeMerge += Abc_Clock() - clk; // shift the cuts by as many latches and recompute signatures if ( Node == Node0 || Node == Node1 || Node0 == Node1 ) |