From d0197d83782fd016358360c305d5d4dcd7ef95d8 Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
Date: Mon, 24 Sep 2012 22:57:01 -0700
Subject: Changed printouts in a few places in supergate computation.

---
 src/map/mapper/mapperTree.c | 3 +++
 src/map/mio/mio.h           | 2 +-
 src/map/mio/mioUtils.c      | 5 ++++-
 src/map/scl/sclTime.c       | 2 +-
 src/map/super/superGate.c   | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src/map')

diff --git a/src/map/mapper/mapperTree.c b/src/map/mapper/mapperTree.c
index b41dfe54..179487f8 100644
--- a/src/map/mapper/mapperTree.c
+++ b/src/map/mapper/mapperTree.c
@@ -147,6 +147,8 @@ int Map_LibraryReadFileTree( Map_SuperLib_t * pLib, FILE * pFile, char *pFileNam
 #ifdef __linux__
     snprintf( pLibFile, 5000, "%s/%s", dirname(strdup(pFileName)), pLibName ); 
 #else
+//    strcpy( pLibFile, pFileName );
+
     {
         char * pStr;
         strcpy( pLibFile, pFileName );
@@ -158,6 +160,7 @@ int Map_LibraryReadFileTree( Map_SuperLib_t * pLib, FILE * pFile, char *pFileNam
         else
             sprintf( pStr, "\\%s", pLibName );
     }
+
 #endif
     
     pFileGen = Io_FileOpen( pLibFile, "open_path", "r", 1 );
diff --git a/src/map/mio/mio.h b/src/map/mio/mio.h
index 55612e32..e6a0cc8f 100644
--- a/src/map/mio/mio.h
+++ b/src/map/mio/mio.h
@@ -144,7 +144,7 @@ extern void              Mio_GateDelete( Mio_Gate_t * pGate );
 extern void              Mio_PinDelete( Mio_Pin_t * pPin );
 extern Mio_Pin_t *       Mio_PinDup( Mio_Pin_t * pPin );
 extern void              Mio_WriteLibrary( FILE * pFile, Mio_Library_t * pLib, int fPrintSops );
-extern Mio_Gate_t **     Mio_CollectRoots( Mio_Library_t * pLib, int nInputs, float tDelay, int fSkipInv, int * pnGates );
+extern Mio_Gate_t **     Mio_CollectRoots( Mio_Library_t * pLib, int nInputs, float tDelay, int fSkipInv, int * pnGates, int fVerbose );
 extern word              Mio_DeriveTruthTable6( Mio_Gate_t * pGate );
 extern void              Mio_DeriveTruthTable( Mio_Gate_t * pGate, unsigned uTruthsIn[][2], int nSigns, int nInputs, unsigned uTruthRes[] );
 extern void              Mio_DeriveGateDelays( Mio_Gate_t * pGate, 
diff --git a/src/map/mio/mioUtils.c b/src/map/mio/mioUtils.c
index 347d81f5..a11fed68 100644
--- a/src/map/mio/mioUtils.c
+++ b/src/map/mio/mioUtils.c
@@ -297,7 +297,7 @@ int Mio_DelayCompare( Mio_Gate_t ** ppG1, Mio_Gate_t ** ppG2 )
   SeeAlso     []
 
 ***********************************************************************/
-Mio_Gate_t ** Mio_CollectRoots( Mio_Library_t * pLib, int nInputs, float tDelay, int fSkipInv, int * pnGates )
+Mio_Gate_t ** Mio_CollectRoots( Mio_Library_t * pLib, int nInputs, float tDelay, int fSkipInv, int * pnGates, int fVerbose )
 {
     Mio_Gate_t * pGate;
     Mio_Gate_t ** ppGates;
@@ -334,6 +334,9 @@ Mio_Gate_t ** Mio_CollectRoots( Mio_Library_t * pLib, int nInputs, float tDelay,
             continue;
         assert( iGate < nGates );
         ppGates[ iGate++ ] = pGate;
+        if ( fVerbose )
+            printf( "Selected gate %3d:   %-20s  A = %7.2f  D = %7.2f  %3s = %-s\n", 
+                iGate+1, pGate->pName, pGate->dArea, pGate->dDelayMax, pGate->pOutName, pGate->pForm );
     }
     // sort by delay
     if ( iGate > 0 ) 
diff --git a/src/map/scl/sclTime.c b/src/map/scl/sclTime.c
index 1b091b9a..d714c20d 100644
--- a/src/map/scl/sclTime.c
+++ b/src/map/scl/sclTime.c
@@ -243,7 +243,7 @@ void Abc_SclTimeGate( SC_Man * p, Abc_Obj_t * pObj, int fDept )
     // get the library cell
     pCell = Abc_SclObjCell( p, pObj );
     // get the output pin
-    assert( pCell->n_outputs == 1 );
+//    assert( pCell->n_outputs == 1 );
     pPin = SC_CellPin( pCell, pCell->n_inputs );
     // compute timing using each fanin
     assert( Vec_PtrSize(pPin->vRTimings) == pCell->n_inputs );
diff --git a/src/map/super/superGate.c b/src/map/super/superGate.c
index 700fef0e..2fa71481 100644
--- a/src/map/super/superGate.c
+++ b/src/map/super/superGate.c
@@ -156,7 +156,7 @@ void Super_Precompute( Mio_Library_t * pLibGen, int nVarsMax, int nLevels, int n
     }
 
     // get the root gates
-    ppGates = Mio_CollectRoots( pLibGen, nVarsMax, tDelayMax, 0, &nGates );
+    ppGates = Mio_CollectRoots( pLibGen, nVarsMax, tDelayMax, 0, &nGates, fVerbose );
     if ( nGates >= nGatesMax )
     {
         fprintf( stdout, "Warning! Genlib library contains more gates than can be computed.\n");
@@ -386,7 +386,7 @@ Super_Man_t * Super_Compute( Super_Man_t * pMan, Mio_Gate_t ** ppGates, int nGat
 
         if ( pMan->fVerbose )
         {
-            printf ("Trying %d choices for %d inputs\n", t, Mio_GateReadPinNum(ppGates[k]) );
+            printf ("Trying %d choices for %d inputs\r", t, Mio_GateReadPinNum(ppGates[k]) );
         }
 
         // resort part of this range by area
-- 
cgit v1.2.3