Adding a wrapper around clock() for more accurate time counting in ABC.

2 files changed, 11 insertions, 11 deletions

diff --git a/src/bdd/reo/reoShuffle.c b/src/bdd/reo/reoShuffle.c
index 86aab4b9..e1c33617 100644
--- a/src/bdd/reo/reoShuffle.c
+++ b/src/bdd/reo/reoShuffle.c
@@ -162,7 +162,7 @@ void Extra_ShuffleTest( reo_man * pReo, DdManager * dd, DdNode * Func )
 
     DdNode * Temp, * bRemap;
     int nSuppSize, OffSet, Num, i;
-    clock_t clk;
+    abctime clk;
     int pOrder[1000], pOrderInv[1000];
     assert( dd->size < 1000 );
 
@@ -198,17 +198,17 @@ void Extra_ShuffleTest( reo_man * pReo, DdManager * dd, DdNode * Func )
 //    Extra_ReorderSetVerification( pReo, 1 );
     bRemap = Extra_bddRemapUp( dd, Func );  Cudd_Ref( bRemap );
 
-clk = clock();
+clk = Abc_Clock();
     Temp  = reoShuffle( pReo, dd, bRemap, pOrder, pOrderInv );  Cudd_Ref( Temp );
-//runtime1 += clock() - clk;
+//runtime1 += Abc_Clock() - clk;
 
 //printf( "Initial = %d. Final = %d.\n", Cudd_DagSize(bRemap), Cudd_DagSize(Temp)  );
 
     {
         DdNode * bFuncPerm;
-clk = clock();
+clk = Abc_Clock();
         bFuncPerm = Cudd_bddPermute( dd, bRemap, pOrderInv );  Cudd_Ref( bFuncPerm );
-//runtime2 += clock() - clk;
+//runtime2 += Abc_Clock() - clk;
         if ( bFuncPerm != Temp )
         {
             printf( "REO: Internal verification has failed!\n" );
diff --git a/src/bdd/reo/reoTest.c b/src/bdd/reo/reoTest.c
index 58e442f3..f9b1cc04 100644
--- a/src/bdd/reo/reoTest.c
+++ b/src/bdd/reo/reoTest.c
@@ -182,21 +182,21 @@ int Extra_bddReorderTest( DdManager * dd, DdNode * bF )
     static DdManager * s_ddmin;
     DdNode * bFmin;
     int  nNodes;
-//    clock_t clk1;
+//    abctime clk1;
 
     if ( s_ddmin == NULL )
         s_ddmin = Cudd_Init( dd->size, 0, CUDD_UNIQUE_SLOTS, CUDD_CACHE_SLOTS, 0);
 
 //    Cudd_ShuffleHeap( s_ddmin, dd->invperm );
 
-//    clk1 = clock();
+//    clk1 = Abc_Clock();
     bFmin = Cudd_bddTransfer( dd, s_ddmin, bF );  Cudd_Ref( bFmin );
     Cudd_ReduceHeap(s_ddmin,CUDD_REORDER_SIFT,1);
 //    Cudd_ReduceHeap(s_ddmin,CUDD_REORDER_SYMM_SIFT,1);
     nNodes = Cudd_DagSize( bFmin );
     Cudd_RecursiveDeref( s_ddmin, bFmin );
 
-//    printf( "Classical variable reordering time = %.2f sec\n", (float)(clock() - clk1)/(float)(CLOCKS_PER_SEC) );
+//    printf( "Classical variable reordering time = %.2f sec\n", (float)(Abc_Clock() - clk1)/(float)(CLOCKS_PER_SEC) );
     return nNodes;
 }
 
@@ -222,14 +222,14 @@ int Extra_addReorderTest( DdManager * dd, DdNode * aF )
     DdNode * aFmin;
     int  nNodesBeg;
     int  nNodesEnd;
-    clock_t clk1;
+    abctime clk1;
 
     if ( s_ddmin == NULL )
         s_ddmin = Cudd_Init( dd->size, 0, CUDD_UNIQUE_SLOTS, CUDD_CACHE_SLOTS, 0);
 
 //    Cudd_ShuffleHeap( s_ddmin, dd->invperm );
 
-    clk1 = clock();
+    clk1 = Abc_Clock();
     bF    = Cudd_addBddPattern( dd, aF );         Cudd_Ref( bF );
     bFmin = Cudd_bddTransfer( dd, s_ddmin, bF );  Cudd_Ref( bFmin );
     Cudd_RecursiveDeref( dd, bF );
@@ -243,7 +243,7 @@ int Extra_addReorderTest( DdManager * dd, DdNode * aF )
     Cudd_RecursiveDeref( s_ddmin, aFmin );
 
     printf( "Classical reordering of ADDs: Before = %d. After = %d.\n", nNodesBeg, nNodesEnd );
-    printf( "Classical variable reordering time = %.2f sec\n", (float)(clock() - clk1)/(float)(CLOCKS_PER_SEC) );
+    printf( "Classical variable reordering time = %.2f sec\n", (float)(Abc_Clock() - clk1)/(float)(CLOCKS_PER_SEC) );
     return nNodesEnd;
 }