Debugging and finetuning the flow.

4 files changed, 88 insertions, 64 deletions

diff --git a/src/map/scl/scl.c b/src/map/scl/scl.c
index 6b386547..48295868 100644
--- a/src/map/scl/scl.c
+++ b/src/map/scl/scl.c
@@ -28,26 +28,27 @@ ABC_NAMESPACE_IMPL_START
 ///                        DECLARATIONS                              ///
 ////////////////////////////////////////////////////////////////////////
 
-static int Scl_CommandReadLib    ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandWriteLib   ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandReadScl    ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandWriteScl   ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandPrintLib   ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandDumpGen    ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandPrintGS    ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandStime      ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandTopo       ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandBuffer     ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandBufSize    ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandUnBuffer   ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandMinsize    ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandMaxsize    ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandUpsize     ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandDnsize     ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandBsize      ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandPrintBuf   ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandSetConstr  ( Abc_Frame_t * pAbc, int argc, char **argv );
-static int Scl_CommandPrintConstr( Abc_Frame_t * pAbc, int argc, char **argv );
+static int Scl_CommandReadLib    ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandWriteLib   ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandReadScl    ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandWriteScl   ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandPrintLib   ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandDumpGen    ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandPrintGS    ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandStime      ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandTopo       ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandBuffer     ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandBufSize    ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandUnBuffer   ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandMinsize    ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandMaxsize    ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandUpsize     ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandDnsize     ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandBsize      ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandPrintBuf   ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandReadConstr ( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandPrintConstr( Abc_Frame_t * pAbc, int argc, char ** argv );
+static int Scl_CommandResetConstr( Abc_Frame_t * pAbc, int argc, char ** argv );
 
 ////////////////////////////////////////////////////////////////////////
 ///                     FUNCTION DEFINITIONS                         ///
@@ -89,26 +90,27 @@ void Abc_SclLoad( SC_Lib * pLib, SC_Lib ** ppScl )
 ***********************************************************************/
 void Scl_Init( Abc_Frame_t * pAbc )
 {
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "read_lib",      Scl_CommandReadLib,    0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "write_lib",     Scl_CommandWriteLib,   0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "print_lib",     Scl_CommandPrintLib,   0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "read_scl",      Scl_CommandReadScl,    0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "write_scl",     Scl_CommandWriteScl,   0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "dump_genlib",   Scl_CommandDumpGen,    0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "print_gs",      Scl_CommandPrintGS,    0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "stime",         Scl_CommandStime,      0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "topo",          Scl_CommandTopo,       1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "buffer",        Scl_CommandBuffer,     1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "bufsize",       Scl_CommandBufSize,    1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "unbuffer",      Scl_CommandUnBuffer,   1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "minsize",       Scl_CommandMinsize,    1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "maxsize",       Scl_CommandMaxsize,    1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "upsize",        Scl_CommandUpsize,     1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "dnsize",        Scl_CommandDnsize,     1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "bsize",         Scl_CommandBsize,      1 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "print_buf",     Scl_CommandPrintBuf,   0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "set_constr",    Scl_CommandSetConstr,  0 ); 
-    Cmd_CommandAdd( pAbc, "SCL mapping",  "print_constr",  Scl_CommandPrintConstr,0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "read_lib",      Scl_CommandReadLib,     0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "write_lib",     Scl_CommandWriteLib,    0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "print_lib",     Scl_CommandPrintLib,    0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "read_scl",      Scl_CommandReadScl,     0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "write_scl",     Scl_CommandWriteScl,    0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "dump_genlib",   Scl_CommandDumpGen,     0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "print_gs",      Scl_CommandPrintGS,     0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "stime",         Scl_CommandStime,       0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "topo",          Scl_CommandTopo,        1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "buffer",        Scl_CommandBuffer,      1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "bufsize",       Scl_CommandBufSize,     1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "unbuffer",      Scl_CommandUnBuffer,    1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "minsize",       Scl_CommandMinsize,     1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "maxsize",       Scl_CommandMaxsize,     1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "upsize",        Scl_CommandUpsize,      1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "dnsize",        Scl_CommandDnsize,      1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "bsize",         Scl_CommandBsize,       1 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "print_buf",     Scl_CommandPrintBuf,    0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "read_constr",   Scl_CommandReadConstr,  0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "print_constr",  Scl_CommandPrintConstr, 0 ); 
+    Cmd_CommandAdd( pAbc, "SCL mapping",  "reset_constr",  Scl_CommandResetConstr, 0 ); 
 }
 void Scl_End( Abc_Frame_t * pAbc )
 {
@@ -1788,7 +1790,7 @@ usage:
   SeeAlso     []
 
 ***********************************************************************/
-int Scl_CommandSetConstr( Abc_Frame_t * pAbc, int argc, char ** argv )
+int Scl_CommandReadConstr( Abc_Frame_t * pAbc, int argc, char ** argv )
 {
     extern void Abc_SclReadTimingConstr( Abc_Frame_t * pAbc, char * pFileName, int fVerbose );
     FILE * pFile;
@@ -1824,8 +1826,8 @@ int Scl_CommandSetConstr( Abc_Frame_t * pAbc, int argc, char ** argv )
     return 0;
 
 usage:
-    fprintf( pAbc->Err, "usage: set_constr [-vh] <file>\n" );
-    fprintf( pAbc->Err, "\t         sets timing constraints for standard-cell designs\n" );
+    fprintf( pAbc->Err, "usage: read_constr [-vh] <file>\n" );
+    fprintf( pAbc->Err, "\t         read file with timing constraints for standard-cell designs\n" );
     fprintf( pAbc->Err, "\t-v     : toggle printing verbose information [default = %s]\n", fVerbose? "yes": "no" );
     fprintf( pAbc->Err, "\t-h     : prints the command summary\n" );
     fprintf( pAbc->Err, "\t<file> : the name of a file to read\n" );
@@ -1846,7 +1848,6 @@ usage:
 int Scl_CommandPrintConstr( Abc_Frame_t * pAbc, int argc, char ** argv )
 {
     int c, fVerbose = 0;
-
     Extra_UtilGetoptReset();
     while ( ( c = Extra_UtilGetopt( argc, argv, "vh" ) ) != EOF )
     {
@@ -1874,6 +1875,47 @@ usage:
     return 1;
 }
 
+/**Function*************************************************************
+
+  Synopsis    []
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+int Scl_CommandResetConstr( Abc_Frame_t * pAbc, int argc, char ** argv )
+{
+    int c, fVerbose = 0;
+    Extra_UtilGetoptReset();
+    while ( ( c = Extra_UtilGetopt( argc, argv, "vh" ) ) != EOF )
+    {
+        switch ( c )
+        {
+        case 'v':
+            fVerbose ^= 1;
+            break;
+        case 'h':
+            goto usage;
+        default:
+            goto usage;
+        }
+    }
+    Abc_FrameSetDrivingCell( NULL );
+    Abc_FrameSetMaxLoad( 0 );
+    return 0;
+
+usage:
+    fprintf( pAbc->Err, "usage: reset_constr [-vh] <file>\n" );
+    fprintf( pAbc->Err, "\t         removes current timing constraints\n" );
+    fprintf( pAbc->Err, "\t-v     : toggle printing verbose information [default = %s]\n", fVerbose? "yes": "no" );
+    fprintf( pAbc->Err, "\t-h     : prints the command summary\n" );
+    fprintf( pAbc->Err, "\t<file> : the name of a file to read\n" );
+    return 1;
+}
+
 ////////////////////////////////////////////////////////////////////////
 ///                       END OF FILE                                ///
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/map/scl/sclLoad.c b/src/map/scl/sclLoad.c
index 12422c5a..033750cb 100644
--- a/src/map/scl/sclLoad.c
+++ b/src/map/scl/sclLoad.c
@@ -115,7 +115,7 @@ void Abc_SclComputeLoad( SC_Man * p )
         }
     }
     // add PO load
-    Abc_NtkForEachPo( p->pNtk, pObj, i )
+    Abc_NtkForEachCo( p->pNtk, pObj, i )
     {
         SC_Pair * pLoadPo = Abc_SclObjLoad( p, pObj );
         SC_Pair * pLoad = Abc_SclObjLoad( p, Abc_ObjFanin0(pObj) );
diff --git a/src/map/scl/sclSize.c b/src/map/scl/sclSize.c
index 3bd192da..0cc282a9 100644
--- a/src/map/scl/sclSize.c
+++ b/src/map/scl/sclSize.c
@@ -136,7 +136,7 @@ void Abc_SclTimeNtkPrint( SC_Man * p, int fShowAll, int fPrintPath )
     printf( "WireLoad = \"%s\"  ", p->pWLoadUsed ? p->pWLoadUsed->pName : "none" );
     printf( "Gates =%7d ",         Abc_NtkNodeNum(p->pNtk) );
     printf( "(%5.1f %%)   ",       100.0 * Abc_SclGetBufInvCount(p->pNtk) / Abc_NtkNodeNum(p->pNtk) );
-    printf( "Cap =%5.1f ff ",      p->EstLoadAve );
+    printf( "Cap =%5.1f ff ",      SC_LibCapFf(p->pLib, p->EstLoadAve) );
     printf( "(%5.1f %%)   ",       Abc_SclGetAverageSize(p->pNtk) );
     printf( "Area =%12.2f ",       Abc_SclGetTotalArea(p->pNtk) );
     printf( "(%5.1f %%)   ",       100.0 * Abc_SclCountMinSize(p->pLib, p->pNtk, 0) / Abc_NtkNodeNum(p->pNtk) );
diff --git a/src/map/scl/sclUtil.c b/src/map/scl/sclUtil.c
index 2d73a375..2c71b739 100644
--- a/src/map/scl/sclUtil.c
+++ b/src/map/scl/sclUtil.c
@@ -202,24 +202,6 @@ int Abc_SclCountMinSize( SC_Lib * pLib, Abc_Ntk_t * p, int fUseMax )
 
 /**Function*************************************************************
 
-  Synopsis    [Returns gate formula by name.]
-
-  Description []
-               
-  SideEffects []
-
-  SeeAlso     []
-
-***********************************************************************/
-char * Abc_SclFindGateFormula( char * pGateName, char * pOutName )
-{
-    Mio_Library_t * pLib = (Mio_Library_t *)Abc_FrameReadLibGen();
-    Mio_Gate_t * pGate = Mio_LibraryReadGateByName( pLib, pGateName, pOutName );
-    return Mio_GateReadForm(pGate);
-}
-
-/**Function*************************************************************
-
   Synopsis    [Reads timing constraints.]
 
   Description []