diff options
Diffstat (limited to 'src/map/if')
-rw-r--r-- | src/map/if/if.h | 2 | ||||
-rw-r--r-- | src/map/if/ifCore.c | 8 | ||||
-rw-r--r-- | src/map/if/ifCut.c | 8 | ||||
-rw-r--r-- | src/map/if/ifMan.c | 2 | ||||
-rw-r--r-- | src/map/if/ifMap.c | 8 | ||||
-rw-r--r-- | src/map/if/ifReduce.c | 14 | ||||
-rw-r--r-- | src/map/if/ifSeq.c | 12 | ||||
-rw-r--r-- | src/map/if/ifTime.c | 12 |
8 files changed, 33 insertions, 33 deletions
diff --git a/src/map/if/if.h b/src/map/if/if.h index 578866cb..902754dd 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -235,7 +235,7 @@ struct If_Man_t_ void ** pHashTable[2]; // hash table bins Mem_Fixed_t * pMemEntries; // memory manager for hash table entries // statistics -// clock_t timeTruth; +// abctime timeTruth; }; // priority cut diff --git a/src/map/if/ifCore.c b/src/map/if/ifCore.c index 95dc03bf..ff5c3654 100644 --- a/src/map/if/ifCore.c +++ b/src/map/if/ifCore.c @@ -27,7 +27,7 @@ ABC_NAMESPACE_IMPL_START /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// -extern clock_t s_MappingTime; +extern abctime s_MappingTime; //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// @@ -80,7 +80,7 @@ int If_ManPerformMapping( If_Man_t * p ) int If_ManPerformMappingComb( If_Man_t * p ) { If_Obj_t * pObj; - clock_t clkTotal = clock(); + abctime clkTotal = Abc_Clock(); int i; // set arrival times and fanout estimates @@ -134,10 +134,10 @@ int If_ManPerformMappingComb( If_Man_t * p ) // Abc_Print( 1, "Total memory = %7.2f MB. Peak cut memory = %7.2f MB. ", // 1.0 * (p->nObjBytes + 2*sizeof(void *)) * If_ManObjNum(p) / (1<<20), // 1.0 * p->nSetBytes * Mem_FixedReadMaxEntriesUsed(p->pMemSet) / (1<<20) ); - Abc_PrintTime( 1, "Total time", clock() - clkTotal ); + Abc_PrintTime( 1, "Total time", Abc_Clock() - clkTotal ); } // Abc_Print( 1, "Cross cut memory = %d.\n", Mem_FixedReadMaxEntriesUsed(p->pMemSet) ); - s_MappingTime = clock() - clkTotal; + s_MappingTime = Abc_Clock() - clkTotal; // Abc_Print( 1, "Special POs = %d.\n", If_ManCountSpecialPos(p) ); /* diff --git a/src/map/if/ifCut.c b/src/map/if/ifCut.c index ace197fb..78f9ec68 100644 --- a/src/map/if/ifCut.c +++ b/src/map/if/ifCut.c @@ -1525,7 +1525,7 @@ int If_CutGetCones( If_Man_t * p ) { If_Obj_t * pObj; int i, Counter = 0; - clock_t clk = clock(); + abctime clk = Abc_Clock(); If_ManForEachObj( p, pObj, i ) { if ( If_ObjIsAnd(pObj) && pObj->nRefs ) @@ -1535,7 +1535,7 @@ int If_CutGetCones( If_Man_t * p ) } } Abc_Print( 1, "Cound not find boundary for %d nodes.\n", Counter ); - Abc_PrintTime( 1, "Cones", clock() - clk ); + Abc_PrintTime( 1, "Cones", Abc_Clock() - clk ); return 1; } @@ -1578,7 +1578,7 @@ int If_CutCountTotalFanins( If_Man_t * p ) If_Obj_t * pObj; Vec_Int_t * vLeaves; int i, nFaninsTotal = 0, Counter = 0; - clock_t clk = clock(); + abctime clk = Abc_Clock(); vLeaves = Vec_IntAlloc( 100 ); If_ManForEachObj( p, pObj, i ) { @@ -1592,7 +1592,7 @@ int If_CutCountTotalFanins( If_Man_t * p ) } } Abc_Print( 1, "Total cut inputs = %d. Total fanins incremental = %d.\n", nFaninsTotal, Counter ); - Abc_PrintTime( 1, "Fanins", clock() - clk ); + Abc_PrintTime( 1, "Fanins", Abc_Clock() - clk ); Vec_IntFree( vLeaves ); return 1; } diff --git a/src/map/if/ifMan.c b/src/map/if/ifMan.c index b0a70a32..e483a54d 100644 --- a/src/map/if/ifMan.c +++ b/src/map/if/ifMan.c @@ -32,7 +32,7 @@ static If_Obj_t * If_ManSetupObj( If_Man_t * p ); static void If_ManCutSetRecycle( If_Man_t * p, If_Set_t * pSet ) { pSet->pNext = p->pFreeList; p->pFreeList = pSet; } static If_Set_t * If_ManCutSetFetch( If_Man_t * p ) { If_Set_t * pTemp = p->pFreeList; p->pFreeList = p->pFreeList->pNext; return pTemp; } -extern clock_t s_TimeComp[4]; +extern abctime s_TimeComp[4]; //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// diff --git a/src/map/if/ifMap.c b/src/map/if/ifMap.c index 8fb2962e..220570e1 100644 --- a/src/map/if/ifMap.c +++ b/src/map/if/ifMap.c @@ -259,10 +259,10 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep pCut->fCompl = 0; if ( p->pPars->fTruth ) { -// clock_t clk = clock(); +// abctime clk = Abc_Clock(); // int RetValue = If_CutComputeTruth( p, pCut, pCut0, pCut1, pObj->fCompl0, pObj->fCompl1 ); int RetValue = If_CutComputeTruth2( p, pCut, pCut0, pCut1, pObj->fCompl0, pObj->fCompl1 ); -// p->timeTruth += clock() - clk; +// p->timeTruth += Abc_Clock() - clk; pCut->fUseless = 0; if ( p->pPars->pFuncCell && RetValue < 2 ) @@ -491,7 +491,7 @@ int If_ManPerformMappingRound( If_Man_t * p, int nCutsUsed, int Mode, int fPrepr // ProgressBar * pProgress; If_Obj_t * pObj; int i; - clock_t clk = clock(); + abctime clk = Abc_Clock(); float arrTime; assert( Mode >= 0 && Mode <= 2 ); // set the sorting function @@ -561,7 +561,7 @@ int If_ManPerformMappingRound( If_Man_t * p, int nCutsUsed, int Mode, int fPrepr char Symb = fPreprocess? 'P' : ((Mode == 0)? 'D' : ((Mode == 1)? 'F' : 'A')); Abc_Print( 1, "%c: Del = %7.2f. Ar = %9.1f. Edge = %8d. Switch = %7.2f. Cut = %8d. ", Symb, p->RequiredGlo, p->AreaGlo, p->nNets, p->dPower, p->nCutsMerged ); - Abc_PrintTime( 1, "T", clock() - clk ); + Abc_PrintTime( 1, "T", Abc_Clock() - clk ); // Abc_Print( 1, "Max number of cuts = %d. Average number of cuts = %5.2f.\n", // p->nCutsMax, 1.0 * p->nCutsMerged / If_ManAndNum(p) ); } diff --git a/src/map/if/ifReduce.c b/src/map/if/ifReduce.c index 65e321c0..838a1b08 100644 --- a/src/map/if/ifReduce.c +++ b/src/map/if/ifReduce.c @@ -51,38 +51,38 @@ static void If_ManImproveNodeFaninCompact( If_Man_t * p, If_Obj_t * pObj, int nL ***********************************************************************/ void If_ManImproveMapping( If_Man_t * p ) { - clock_t clk; + abctime clk; - clk = clock(); + clk = Abc_Clock(); If_ManImproveExpand( p, p->pPars->nLutSize ); If_ManComputeRequired( p ); if ( p->pPars->fVerbose ) { Abc_Print( 1, "E: Del = %7.2f. Ar = %9.1f. Edge = %8d. Switch = %7.2f. Cut = %8d. ", p->RequiredGlo, p->AreaGlo, p->nNets, p->dPower, p->nCutsMerged ); - Abc_PrintTime( 1, "T", clock() - clk ); + Abc_PrintTime( 1, "T", Abc_Clock() - clk ); } /* - clk = clock(); + clk = Abc_Clock(); If_ManImproveReduce( p, p->pPars->nLutSize ); If_ManComputeRequired( p, 0 ); if ( p->pPars->fVerbose ) { Abc_Print( 1, "R: Del = %6.2f. Area = %8.2f. Nets = %6d. Cuts = %8d. Lim = %2d. Ave = %5.2f. ", p->RequiredGlo, p->AreaGlo, p->nNets, p->nCutsMerged, p->nCutsUsed, 1.0 * p->nCutsMerged / If_ManAndNum(p) ); - Abc_PrintTime( 1, "T", clock() - clk ); + Abc_PrintTime( 1, "T", Abc_Clock() - clk ); } */ /* - clk = clock(); + clk = Abc_Clock(); If_ManImproveExpand( p, p->pPars->nLutSize ); If_ManComputeRequired( p, 0 ); if ( p->pPars->fVerbose ) { Abc_Print( 1, "E: Del = %6.2f. Area = %8.2f. Nets = %6d. Cuts = %8d. Lim = %2d. Ave = %5.2f. ", p->RequiredGlo, p->AreaGlo, p->nNets, p->nCutsMerged, p->nCutsUsed, 1.0 * p->nCutsMerged / If_ManAndNum(p) ); - Abc_PrintTime( 1, "T", clock() - clk ); + Abc_PrintTime( 1, "T", Abc_Clock() - clk ); } */ } diff --git a/src/map/if/ifSeq.c b/src/map/if/ifSeq.c index d6037ce8..adb97b22 100644 --- a/src/map/if/ifSeq.c +++ b/src/map/if/ifSeq.c @@ -27,7 +27,7 @@ ABC_NAMESPACE_IMPL_START /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// -extern clock_t s_MappingTime; +extern abctime s_MappingTime; //////////////////////////////////////////////////////////////////////// /// FUNCTION DEFINITIONS /// @@ -124,7 +124,7 @@ int If_ManPerformMappingRoundSeq( If_Man_t * p, int nIter ) { If_Obj_t * pObj; int i; - clock_t clk = clock(); + abctime clk = Abc_Clock(); int fVeryVerbose = 0; int fChange = 0; @@ -179,7 +179,7 @@ int If_ManPerformMappingRoundSeq( If_Man_t * p, int nIter ) // p->AreaGlo = If_ManScanMapping(p); Abc_Print( 1, "S%d: Fi = %6.2f. Del = %6.2f. Area = %8.2f. Cuts = %8d. ", nIter, (float)p->Period, p->RequiredGlo, p->AreaGlo, p->nCutsMerged ); - Abc_PrintTime( 1, "T", clock() - clk ); + Abc_PrintTime( 1, "T", Abc_Clock() - clk ); } return fChange; } @@ -339,7 +339,7 @@ void If_ManPerformMappingSeqPost( If_Man_t * p ) ***********************************************************************/ int If_ManPerformMappingSeq( If_Man_t * p ) { - clock_t clkTotal = clock(); + abctime clkTotal = Abc_Clock(); int PeriodBest; p->SortMode = 0; @@ -384,13 +384,13 @@ int If_ManPerformMappingSeq( If_Man_t * p ) // if ( p->pPars->fVerbose ) { Abc_Print( 1, "The best clock period is %3d. ", p->Period ); - Abc_PrintTime( 1, "Time", clock() - clkTotal ); + Abc_PrintTime( 1, "Time", Abc_Clock() - clkTotal ); } p->RequiredGlo = (float)(PeriodBest); // postprocess it using combinational mapping If_ManPerformMappingSeqPost( p ); - s_MappingTime = clock() - clkTotal; + s_MappingTime = Abc_Clock() - clkTotal; return 1; } diff --git a/src/map/if/ifTime.c b/src/map/if/ifTime.c index 6fba33f4..ca11b6fc 100644 --- a/src/map/if/ifTime.c +++ b/src/map/if/ifTime.c @@ -250,7 +250,7 @@ Vec_Wrd_t * If_CutDelaySopAnds( If_Man_t * p, If_Cut_t * pCut, Vec_Int_t * vCove ***********************************************************************/ Vec_Wrd_t * If_CutDelaySopArray( If_Man_t * p, If_Cut_t * pCut ) { - clock_t clk; + abctime clk; Vec_Wrd_t * vAnds; int RetValue; if ( p->vCover == NULL ) @@ -266,9 +266,9 @@ Vec_Wrd_t * If_CutDelaySopArray( If_Man_t * p, If_Cut_t * pCut ) return NULL; assert( RetValue == 0 || RetValue == 1 ); - clk = clock(); + clk = Abc_Clock(); vAnds = If_CutDelaySopAnds( p, pCut, p->vCover, RetValue ^ pCut->fCompl ); - s_timeOld += clock() - clk; + s_timeOld += Abc_Clock() - clk; /* if ( pCut->nLeaves <= 5 ) { @@ -491,7 +491,7 @@ int If_CutDelaySopAnds2( If_Man_t * p, If_Cut_t * pCut, Vec_Int_t * vCover, int } int If_CutDelaySopArray2( If_Man_t * p, If_Cut_t * pCut, int * pArea ) { - clock_t clk; + abctime clk; int RetValue; if ( p->vCover == NULL ) p->vCover = Vec_IntAlloc(0); @@ -504,10 +504,10 @@ int If_CutDelaySopArray2( If_Man_t * p, If_Cut_t * pCut, int * pArea ) return -1; assert( RetValue == 0 || RetValue == 1 ); - clk = clock(); + clk = Abc_Clock(); RetValue = If_CutDelaySopAnds2( p, pCut, p->vCover, RetValue ^ pCut->fCompl, pArea ); // RetValue = If_CutDelaySopAnds2_( p, pCut, p->vCover, RetValue ^ pCut->fCompl, pArea ); - s_timeNew += clock() - clk; + s_timeNew += Abc_Clock() - clk; return RetValue; } int If_CutDelaySopCost2( If_Man_t * p, If_Cut_t * pCut ) |