Experiments with retiming (adding new APIs).

3 files changed, 45 insertions, 37 deletions

diff --git a/src/base/wln/wln.h b/src/base/wln/wln.h
index c862b262..c4fbf997 100644
--- a/src/base/wln/wln.h
+++ b/src/base/wln/wln.h
@@ -244,7 +244,8 @@ extern int            Wln_ObjClone( Wln_Ntk_t * pNew, Wln_Ntk_t * p, int iObj );
 extern int            Wln_ObjCreateCo( Wln_Ntk_t * p, int iFanin );
 extern void           Wln_ObjPrint( Wln_Ntk_t * p, int iObj );
 /*=== wlcRetime.c ========================================================*/
-extern Vec_Int_t *    Wln_NtkRetime( Wln_Ntk_t * p );
+extern Vec_Int_t *    Wln_NtkRetime( Wln_Ntk_t * p, int fVerbose );
+extern void           Wln_NtkRetimeCreateDelayInfo( Wln_Ntk_t * pNtk );
 /*=== wlcWriteVer.c ========================================================*/
 extern void           Wln_WriteVer( Wln_Ntk_t * p, char * pFileName );
 
diff --git a/src/base/wln/wlnNdr.c b/src/base/wln/wlnNdr.c
index 012622e9..411dfaeb 100644
--- a/src/base/wln/wlnNdr.c
+++ b/src/base/wln/wlnNdr.c
@@ -293,7 +293,8 @@ Wln_Ntk_t * Wln_NtkFromNdr( void * pData )
 Wln_Ntk_t * Wln_ReadNdr( char * pFileName )
 {
     void * pData = Ndr_Read( pFileName );
-    Wln_Ntk_t * pNtk = Wln_NtkFromNdr( pData );
+    Wln_Ntk_t * pNtk = pData ? Wln_NtkFromNdr( pData ) : NULL;
+    if ( pNtk ) return NULL;
     //char * ppNames[10] = { NULL, "a", "b", "c", "d", "e", "f", "g", "h", "i" };
     //Ndr_WriteVerilog( NULL, pData, ppNames );
     Ndr_Delete( pData );
@@ -308,40 +309,21 @@ void Wln_ReadNdrTest()
     Wln_NtkStaticFanoutTest( pNtk );
     Wln_NtkFree( pNtk );
 }
-void Wln_NtkRetimeTest( char * pFileName )
+void Wln_NtkRetimeTest( char * pFileName, int fVerbose  )
 {
+    Vec_Int_t * vMoves;
     void * pData = Ndr_Read( pFileName );
-    Wln_Ntk_t * pNtk = Wln_NtkFromNdr( pData );
-    Ndr_Delete( pData );
-    if ( Wln_NtkHasInstId(pNtk) )
-        Vec_IntErase( &pNtk->vInstIds );
-    if ( !Wln_NtkHasInstId(pNtk) )
-    {
-        int iObj;
-        printf( "The design has no delay information.\n" );
-        Wln_NtkCleanInstId(pNtk);
-        Wln_NtkForEachObj( pNtk, iObj )
-            if ( Wln_ObjIsFf(pNtk, iObj) )
-                Wln_ObjSetInstId( pNtk, iObj, 1 );
-            else if ( !Wln_ObjIsCio(pNtk, iObj) && Wln_ObjFaninNum(pNtk, iObj) > 0 )
-                Wln_ObjSetInstId( pNtk, iObj, 10 );
-        printf( "Assuming user-specified delays for internal nodes.\n" );
-    }
-/*
-    else
-    {
-        int iObj;
-        Wln_NtkForEachObj( pNtk, iObj )
-            if ( !Wln_ObjIsCio(pNtk, iObj) && Wln_ObjFaninNum(pNtk, iObj) > 0 && !Wln_ObjIsFf(pNtk, iObj) )
-                printf( "Obj %5d : NameId = %6d  InstId = %6d\n", iObj, Wln_ObjNameId(pNtk, iObj), Wln_ObjInstId(pNtk, iObj) );
-    }
-*/
-    //else
+    Wln_Ntk_t * pNtk = pData ? Wln_NtkFromNdr( pData ) : NULL;
+    if ( pNtk == NULL ) 
     {
-        Vec_Int_t * vMoves = Wln_NtkRetime( pNtk );
-        //Vec_IntPrint( vMoves );
-        Vec_IntFree( vMoves );
+        printf( "Retiming network is not available.\n" );
+        return;
     }
+    Ndr_Delete( pData );
+    Wln_NtkRetimeCreateDelayInfo( pNtk );
+    vMoves = Wln_NtkRetime( pNtk, fVerbose );
+    //Vec_IntPrint( vMoves );
+    Vec_IntFree( vMoves );
     Wln_NtkFree( pNtk );
 }
 
diff --git a/src/base/wln/wlnRetime.c b/src/base/wln/wlnRetime.c
index 4ef8b53c..d1b8884c 100644
--- a/src/base/wln/wlnRetime.c
+++ b/src/base/wln/wlnRetime.c
@@ -76,7 +76,8 @@ static inline int *   Wln_RetFanouts( Wln_Ret_t * p, int i ) { return Vec_IntEnt
 void Wln_RetPrintObj( Wln_Ret_t * p, int iObj )
 {
     int k, iFanin, Type = Wln_ObjType(p->pNtk, iObj), * pLink;
-    printf( "Obj %6d : Type = %6s  Fanins = %d : ", iObj, Abc_OperName(Type), Wln_ObjFaninNum(p->pNtk, iObj) );
+    printf( "Obj %6d : Type = %6s  NameId = %5d  InstId = %5d  Fanins = %d : ", 
+        iObj, Abc_OperName(Type), Wln_ObjNameId(p->pNtk, iObj), Wln_ObjInstId(p->pNtk, iObj), Wln_ObjFaninNum(p->pNtk, iObj) );
     Wln_RetForEachFanin( p, iObj, iFanin, pLink, k )
     {
         printf( "%5d ", iFanin );
@@ -159,7 +160,8 @@ Wln_Ret_t * Wln_RetAlloc( Wln_Ntk_t * pNtk )
     Vec_IntFree( vRefsCopy );
     // other data
     p->nClasses = Wln_RetComputeFfClasses( pNtk, &p->vFfClasses );
-    ABC_SWAP( Vec_Int_t, p->vNodeDelays, pNtk->vInstIds );
+    //ABC_SWAP( Vec_Int_t, p->vNodeDelays, pNtk->vInstIds );
+    Vec_IntAppend( &p->vNodeDelays, &pNtk->vInstIds );
     Vec_IntGrow( &p->vSources, 1000 );
     Vec_IntGrow( &p->vSinks, 1000 );
     Vec_IntGrow( &p->vFront, 1000 );
@@ -474,7 +476,7 @@ void Wln_RetAddToMoves( Wln_Ret_t * p, Vec_Int_t * vSet, int Delay, int fForward
     {
         int NameId = Vec_IntEntry( &p->pNtk->vNameIds, iObj );
         Vec_IntPush( &p->vMoves, fForward ? -NameId : NameId );
-        printf( " %d", fForward ? -iObj : iObj );
+        printf( " %d (NameID = %d)  ", fForward ? -iObj : iObj, fForward ? -NameId : NameId );
     }
     Vec_IntPush( &p->vMoves, 0 );
     printf( "\n" );
@@ -491,14 +493,32 @@ void Wln_RetAddToMoves( Wln_Ret_t * p, Vec_Int_t * vSet, int Delay, int fForward
   SeeAlso     []
 
 ***********************************************************************/
-Vec_Int_t * Wln_NtkRetime( Wln_Ntk_t * pNtk )
+void Wln_NtkRetimeCreateDelayInfo( Wln_Ntk_t * pNtk )
+{
+    if ( Wln_NtkHasInstId(pNtk) )
+        Vec_IntErase( &pNtk->vInstIds );
+    if ( !Wln_NtkHasInstId(pNtk) )
+    {
+        int iObj;
+        printf( "The design has no delay information.\n" );
+        Wln_NtkCleanInstId(pNtk);
+        Wln_NtkForEachObj( pNtk, iObj )
+            if ( Wln_ObjIsFf(pNtk, iObj) )
+                Wln_ObjSetInstId( pNtk, iObj, 1 );
+            else if ( !Wln_ObjIsCio(pNtk, iObj) && Wln_ObjFaninNum(pNtk, iObj) > 0 )
+                Wln_ObjSetInstId( pNtk, iObj, 10 );
+        printf( "Assuming user-specified delays for internal nodes.\n" );
+    }
+}
+Vec_Int_t * Wln_NtkRetime( Wln_Ntk_t * pNtk, int fVerbose )
 {
     Wln_Ret_t * p = Wln_RetAlloc( pNtk );
     Vec_Int_t * vSources = &p->vSources;
     Vec_Int_t * vSinks   = &p->vSinks;
     Vec_Int_t * vFront   = &p->vFront;
     Vec_Int_t * vMoves   = Vec_IntAlloc(0);
-    //Wln_RetPrint( p );
+    if ( fVerbose )
+        Wln_RetPrint( p );
     Wln_RetMarkChanges( p, NULL );
     p->DelayMax = Wln_RetPropDelay( p );
     Wln_RetFindSources( p );
@@ -554,6 +574,11 @@ Vec_Int_t * Wln_NtkRetime( Wln_Ntk_t * pNtk )
     }
     ABC_SWAP( Vec_Int_t, *vMoves, p->vMoves );
     Wln_RetFree( p );
+    if ( fVerbose )
+    {
+        printf( "\nThe resulting moves recorded in terms of name IDs of the NDR nodes:\n" );
+        Vec_IntPrint( vMoves );
+    }
     return vMoves;
 }