Fixing time primtouts throughout the code.

6 files changed, 18 insertions, 25 deletions

diff --git a/src/map/mapper/mapper.h b/src/map/mapper/mapper.h
index 29bc98ef..0c8a8f42 100644
--- a/src/map/mapper/mapper.h
+++ b/src/map/mapper/mapper.h
@@ -78,7 +78,7 @@ extern Map_Man_t *     Map_ManCreate( int nInputs, int nOutputs, int fVerbose );
 extern Map_Node_t *    Map_NodeCreate( Map_Man_t * p, Map_Node_t * p1, Map_Node_t * p2 );
 extern void            Map_ManFree( Map_Man_t * pMan );
 extern void            Map_ManPrintTimeStats( Map_Man_t * p );
-extern void            Map_ManPrintStatsToFile( char * pName, float Area, float Delay, int Time );
+extern void            Map_ManPrintStatsToFile( char * pName, float Area, float Delay, clock_t Time );
 extern int             Map_ManReadInputNum( Map_Man_t * p );
 extern int             Map_ManReadOutputNum( Map_Man_t * p );
 extern Map_Node_t **   Map_ManReadInputs ( Map_Man_t * p );
@@ -89,10 +89,6 @@ extern Mio_Library_t * Map_ManReadGenLib ( Map_Man_t * p );
 extern int             Map_ManReadVerbose( Map_Man_t * p );
 extern float           Map_ManReadAreaFinal( Map_Man_t * p );
 extern float           Map_ManReadRequiredGlo( Map_Man_t * p );
-extern void            Map_ManSetTimeToMap( Map_Man_t * p, int Time );
-extern void            Map_ManSetTimeToNet( Map_Man_t * p, int Time );
-extern void            Map_ManSetTimeSweep( Map_Man_t * p, int Time );
-extern void            Map_ManSetTimeTotal( Map_Man_t * p, int Time );
 extern void            Map_ManSetOutputNames( Map_Man_t * p, char ** ppNames );
 extern void            Map_ManSetAreaRecovery( Map_Man_t * p, int fAreaRecovery );
 extern void            Map_ManSetDelayTarget( Map_Man_t * p, float DelayTarget );
diff --git a/src/map/mapper/mapperCore.c b/src/map/mapper/mapperCore.c
index 7a4f7c4e..9df22923 100644
--- a/src/map/mapper/mapperCore.c
+++ b/src/map/mapper/mapperCore.c
@@ -53,7 +53,7 @@ int Map_Mapping( Map_Man_t * p )
     int fUseAreaFlow           = 1;
     int fUseExactArea          = !p->fSwitching;
     int fUseExactAreaWithPhase = !p->fSwitching;
-    int clk;
+    clock_t clk;
 
     //////////////////////////////////////////////////////////////////////
     // perform pre-mapping computations
diff --git a/src/map/mapper/mapperCreate.c b/src/map/mapper/mapperCreate.c
index 2b1663a4..42094477 100644
--- a/src/map/mapper/mapperCreate.c
+++ b/src/map/mapper/mapperCreate.c
@@ -58,10 +58,6 @@ Mio_Library_t * Map_ManReadGenLib ( Map_Man_t * p )                     { return
 int             Map_ManReadVerbose( Map_Man_t * p )                     { return p->fVerbose;   }
 float           Map_ManReadAreaFinal( Map_Man_t * p )                   { return p->AreaFinal;  }
 float           Map_ManReadRequiredGlo( Map_Man_t * p )                 { return p->fRequiredGlo; }
-void            Map_ManSetTimeToMap( Map_Man_t * p, int Time )          { p->timeToMap = Time;  }
-void            Map_ManSetTimeToNet( Map_Man_t * p, int Time )          { p->timeToNet = Time;  }
-void            Map_ManSetTimeSweep( Map_Man_t * p, int Time )          { p->timeSweep = Time;  }
-void            Map_ManSetTimeTotal( Map_Man_t * p, int Time )          { p->timeTotal = Time;  }
 void            Map_ManSetOutputNames( Map_Man_t * p, char ** ppNames ) { p->ppOutputNames = ppNames;}
 void            Map_ManSetAreaRecovery( Map_Man_t * p, int fAreaRecovery ) { p->fAreaRecovery = fAreaRecovery;}
 void            Map_ManSetDelayTarget( Map_Man_t * p, float DelayTarget ) { p->DelayTarget = DelayTarget;}
@@ -317,7 +313,7 @@ void Map_ManPrintTimeStats( Map_Man_t * p )
   SeeAlso     []
 
 ***********************************************************************/
-void Map_ManPrintStatsToFile( char * pName, float Area, float Delay, int Time )
+void Map_ManPrintStatsToFile( char * pName, float Area, float Delay, clock_t Time )
 {
     FILE * pTable;
     pTable = fopen( "map_stats.txt", "a+" );
@@ -472,7 +468,8 @@ void Map_TableResize( Map_Man_t * pMan )
 {
     Map_Node_t ** pBinsNew;
     Map_Node_t * pEnt, * pEnt2;
-    int nBinsNew, Counter, i, clk;
+    int nBinsNew, Counter, i;
+    clock_t clk;
     unsigned Key;
 
 clk = clock();
diff --git a/src/map/mapper/mapperCut.c b/src/map/mapper/mapperCut.c
index 29861531..12ee5d92 100644
--- a/src/map/mapper/mapperCut.c
+++ b/src/map/mapper/mapperCut.c
@@ -117,7 +117,7 @@ void Map_MappingCuts( Map_Man_t * p )
     Map_Node_t * pNode;
     Map_Cut_t * pCut;
     int nCuts, nNodes, i;
-    int clk = clock();
+    clock_t clk = clock();
     // set the elementary cuts for the PI variables
     assert( p->nVarsMax > 1 && p->nVarsMax < 7 );
     for ( i = 0; i < p->nInputs; i++ )
diff --git a/src/map/mapper/mapperInt.h b/src/map/mapper/mapperInt.h
index 8d1e3fb7..95c5b0c7 100644
--- a/src/map/mapper/mapperInt.h
+++ b/src/map/mapper/mapperInt.h
@@ -149,17 +149,17 @@ struct Map_ManStruct_t_
     int                 nFanoutViolations;  // the number of nodes in mapped circuit violating fanout
 
     // runtime statistics
-    int                 timeToMap;     // time to transfer to the mapping structure
-    int                 timeCuts;      // time to compute k-feasible cuts
-    int                 timeTruth;     // time to compute the truth table for each cut
-    int                 timeMatch;     // time to perform matching for each node
-    int                 timeArea;      // time to recover area after delay oriented mapping
-    int                 timeSweep;     // time to perform technology dependent sweep
-    int                 timeToNet;     // time to transfer back to the network
-    int                 timeTotal;     // the total mapping time
-    int                 time1;         // time to transfer to the mapping structure
-    int                 time2;         // time to transfer to the mapping structure
-    int                 time3;         // time to transfer to the mapping structure
+    clock_t             timeToMap;     // time to transfer to the mapping structure
+    clock_t             timeCuts;      // time to compute k-feasible cuts
+    clock_t             timeTruth;     // time to compute the truth table for each cut
+    clock_t             timeMatch;     // time to perform matching for each node
+    clock_t             timeArea;      // time to recover area after delay oriented mapping
+    clock_t             timeSweep;     // time to perform technology dependent sweep
+    clock_t             timeToNet;     // time to transfer back to the network
+    clock_t             timeTotal;     // the total mapping time
+    clock_t             time1;         // time to transfer to the mapping structure
+    clock_t             time2;         // time to transfer to the mapping structure
+    clock_t             time3;         // time to transfer to the mapping structure
 };
 
 // the supergate library
diff --git a/src/map/mapper/mapperLib.c b/src/map/mapper/mapperLib.c
index c8b677bf..8b30f294 100644
--- a/src/map/mapper/mapperLib.c
+++ b/src/map/mapper/mapperLib.c
@@ -56,7 +56,7 @@ ABC_NAMESPACE_IMPL_START
 Map_SuperLib_t * Map_SuperLibCreate( char * pFileName, char * pExcludeFile, int fAlgorithm, int fVerbose )
 {
     Map_SuperLib_t * p;
-    int clk;
+    clock_t clk;
 
     // start the supergate library
     p = ABC_ALLOC( Map_SuperLib_t, 1 );