Word-level abstraction.

1 files changed, 43 insertions, 33 deletions

diff --git a/src/base/wlc/wlcAbs2.c b/src/base/wlc/wlcAbs2.c
index 9da59f42..f5a7b46d 100644
--- a/src/base/wlc/wlcAbs2.c
+++ b/src/base/wlc/wlcAbs2.c
@@ -52,11 +52,11 @@ struct Wabs_Par_t_
 void Wlc_ManSetDefaultParams( Wlc_Par_t * pPars )
 {
     memset( pPars, 0, sizeof(Wlc_Par_t) );
-    pPars->nBitsAdd       =      16;  // adder bit-width
-    pPars->nBitsMul       =       8;  // multiplier bit-widht 
-    pPars->nBitsMux       =      32;  // MUX bit-width
-    pPars->nBitsFlop      =      32;  // flop bit-width
-    pPars->fVerbose       =       0;  // verbose output`
+    pPars->nBitsAdd    = ABC_INFINITY;   // adder bit-width
+    pPars->nBitsMul    = ABC_INFINITY;   // multiplier bit-widht 
+    pPars->nBitsMux    = ABC_INFINITY;   // MUX bit-width
+    pPars->nBitsFlop   = ABC_INFINITY;   // flop bit-width
+    pPars->fVerbose    =             0;  // verbose output`
 }
 
 /**Function*************************************************************
@@ -73,40 +73,41 @@ void Wlc_ManSetDefaultParams( Wlc_Par_t * pPars )
 Vec_Bit_t * Wlc_NtkAbsMarkOpers( Wlc_Ntk_t * p, Wlc_Par_t * pPars )
 {
     Vec_Bit_t * vLeaves = Vec_BitStart( Wlc_NtkObjNumMax(p) );
-    Wlc_Obj_t * pObj; int i;
+    Wlc_Obj_t * pObj; int i, Count[4] = {0};
     Wlc_NtkForEachObj( p, pObj, i )
     {
         if ( pObj->Type == WLC_OBJ_ARI_ADD || pObj->Type == WLC_OBJ_ARI_SUB || pObj->Type == WLC_OBJ_ARI_MINUS )
         {
             if ( Wlc_ObjRange(pObj) >= pPars->nBitsAdd )
-                Vec_BitWriteEntry( vLeaves, Wlc_ObjId(p, pObj), 1 );
+                Vec_BitWriteEntry( vLeaves, Wlc_ObjId(p, pObj), 1 ), Count[0]++;
             continue;
         }
         if ( pObj->Type == WLC_OBJ_ARI_MULTI || pObj->Type == WLC_OBJ_ARI_DIVIDE || pObj->Type == WLC_OBJ_ARI_REM || pObj->Type == WLC_OBJ_ARI_MODULUS )
         {
             if ( Wlc_ObjRange(pObj) >= pPars->nBitsMul )
-                Vec_BitWriteEntry( vLeaves, Wlc_ObjId(p, pObj), 1 );
+                Vec_BitWriteEntry( vLeaves, Wlc_ObjId(p, pObj), 1 ), Count[1]++;
             continue;
         }
         if ( pObj->Type == WLC_OBJ_MUX )
         {
             if ( Wlc_ObjRange(pObj) >= pPars->nBitsMux )
-                Vec_BitWriteEntry( vLeaves, Wlc_ObjId(p, pObj), 1 );
+                Vec_BitWriteEntry( vLeaves, Wlc_ObjId(p, pObj), 1 ), Count[2]++;
             continue;
         }
         if ( Wlc_ObjIsCi(pObj) && !Wlc_ObjIsPi(pObj) )
         {
             if ( Wlc_ObjRange(pObj) >= pPars->nBitsFlop )
-                Vec_BitWriteEntry( vLeaves, Wlc_ObjId(p, pObj), 1 );
+                Vec_BitWriteEntry( vLeaves, Wlc_ObjId(p, pObj), 1 ), Count[3]++;
             continue;
         }
     }
+    printf( "Abstraction engine marked %d adds/subs, %d muls/divs, %d muxes, and %d flops to be abstracted away.\n", Count[0], Count[1], Count[2], Count[3] );
     return vLeaves;
 }
 
 /**Function*************************************************************
 
-  Synopsis    []
+  Synopsis    [Marks nodes to be included in the abstracted network.]
 
   Description []
                
@@ -115,7 +116,7 @@ Vec_Bit_t * Wlc_NtkAbsMarkOpers( Wlc_Ntk_t * p, Wlc_Par_t * pPars )
   SeeAlso     []
 
 ***********************************************************************/
-void Wlc_NtkAbsMarkNodes_rec( Wlc_Ntk_t * p, Wlc_Obj_t * pObj, Vec_Bit_t * vLeaves, Vec_Int_t * vFlops, Vec_Int_t * vPisNew )
+void Wlc_NtkAbsMarkNodes_rec( Wlc_Ntk_t * p, Wlc_Obj_t * pObj, Vec_Bit_t * vLeaves, Vec_Int_t * vPisOld, Vec_Int_t * vPisNew, Vec_Int_t * vFlops )
 {
     int i, iFanin;
     if ( pObj->Mark )
@@ -123,42 +124,45 @@ void Wlc_NtkAbsMarkNodes_rec( Wlc_Ntk_t * p, Wlc_Obj_t * pObj, Vec_Bit_t * vLeav
     pObj->Mark = 1;
     if ( Vec_BitEntry(vLeaves, Wlc_ObjId(p, pObj)) )
     {
+        assert( !Wlc_ObjIsPi(pObj) );
         Vec_IntPush( vPisNew, Wlc_ObjId(p, pObj) );
         return;
     }
     if ( Wlc_ObjIsCi(pObj) )
     {
-        if ( !Wlc_ObjIsPi(pObj) )
-            Vec_IntPush( vFlops, Wlc_ObjCiId(pObj) );
+        if ( Wlc_ObjIsPi(pObj) )
+            Vec_IntPush( vPisOld, Wlc_ObjId(p, pObj) );
+        else
+            Vec_IntPush( vFlops, Wlc_ObjId(p, pObj) );
         return;
     }
     Wlc_ObjForEachFanin( pObj, iFanin, i )
-        Wlc_NtkAbsMarkNodes_rec( p, Wlc_NtkObj(p, iFanin), vLeaves, vFlops, vPisNew );
+        Wlc_NtkAbsMarkNodes_rec( p, Wlc_NtkObj(p, iFanin), vLeaves, vPisOld, vPisNew, vFlops );
 }
 
-Vec_Int_t * Wlc_NtkAbsMarkNodes( Wlc_Ntk_t * p, Vec_Bit_t * vLeaves )
+void Wlc_NtkAbsMarkNodes( Wlc_Ntk_t * p, Vec_Bit_t * vLeaves, Vec_Int_t * vPisOld, Vec_Int_t * vPisNew, Vec_Int_t * vFlops )
 {
-    Vec_Int_t * vFlops;
-    Vec_Int_t * vPisNew;
     Wlc_Obj_t * pObj;
-    int i, CiId, CoId;
+    int i, Count = 0;
     Wlc_NtkCleanMarks( p );
-    vFlops = Vec_IntAlloc( 100 );
-    vPisNew = Vec_IntAlloc( 100 );
     Wlc_NtkForEachCo( p, pObj, i )
-        Wlc_NtkAbsMarkNodes_rec( p, pObj, vLeaves, vFlops, vPisNew );
-    Vec_IntForEachEntry( vFlops, CiId, i )
-    {
-        CoId = Wlc_NtkPoNum(p) + CiId - Wlc_NtkPiNum(p);
-        Wlc_NtkAbsMarkNodes_rec( p, Wlc_NtkCo(p, CoId), vLeaves, vFlops, vPisNew );
-    }
-    Vec_IntFree( vFlops );
-    return vPisNew;
+        Wlc_NtkAbsMarkNodes_rec( p, pObj, vLeaves, vPisOld, vPisNew, vFlops );
+    Wlc_NtkForEachObjVec( vFlops, p, pObj, i )
+        Wlc_NtkAbsMarkNodes_rec( p, Wlc_ObjFo2Fi(p, pObj), vLeaves, vPisOld, vPisNew, vFlops );
+    Wlc_NtkForEachObj( p, pObj, i )
+        Count += pObj->Mark;
+//    printf( "Collected %d old PIs, %d new PIs, %d flops, and %d other objects.\n", 
+//        Vec_IntSize(vPisOld), Vec_IntSize(vPisNew), Vec_IntSize(vFlops), 
+//        Count - Vec_IntSize(vPisOld) - Vec_IntSize(vPisNew) - Vec_IntSize(vFlops) );
+    Vec_IntSort( vPisOld, 0 );
+    Vec_IntSort( vPisNew, 0 );
+    Vec_IntSort( vFlops, 0 );
+    Wlc_NtkCleanMarks( p );
 }
 
 /**Function*************************************************************
 
-  Synopsis    []
+  Synopsis    [Derive abstraction based on the parameter values.]
 
   Description []
                
@@ -169,11 +173,17 @@ Vec_Int_t * Wlc_NtkAbsMarkNodes( Wlc_Ntk_t * p, Vec_Bit_t * vLeaves )
 ***********************************************************************/
 Wlc_Ntk_t * Wlc_NtkAbs( Wlc_Ntk_t * p, Wlc_Par_t * pPars )
 {
+    Wlc_Ntk_t * pNtkNew = NULL;
+    Vec_Int_t * vPisOld = Vec_IntAlloc( 100 );
+    Vec_Int_t * vPisNew = Vec_IntAlloc( 100 );
+    Vec_Int_t * vFlops  = Vec_IntAlloc( 100 );
     Vec_Bit_t * vLeaves = Wlc_NtkAbsMarkOpers( p, pPars );
-    Vec_Int_t * vPisNew = Wlc_NtkAbsMarkNodes( p, vLeaves );
-    Wlc_Ntk_t * pNtkNew = Wlc_NtkDupDfs( p, 1, 1, vPisNew );
-    Vec_IntFree( vPisNew );
+    Wlc_NtkAbsMarkNodes( p, vLeaves, vPisOld, vPisNew, vFlops );
     Vec_BitFree( vLeaves );
+    pNtkNew = Wlc_NtkDupDfsAbs( p, vPisOld, vPisNew, vFlops );
+    Vec_IntFree( vPisOld );
+    Vec_IntFree( vPisNew );
+    Vec_IntFree( vFlops );
     return pNtkNew;
 }