Updated code for lazy man's synthesis.

src/aig/gia/giaUtil.c

@@ -1360,12 +1360,17 @@ unsigned * Gia_ManComputePoTruthTables( Gia_Man_t * p, int nBytesMax )
 int Gia_ObjComputeTruthTable_rec( Gia_Man_t * p, Gia_Obj_t * pObj )
 {
     word * pTruth0, * pTruth1, * pTruth, * pTruthL;
+    int Value0, Value1;
     if ( Gia_ObjIsTravIdCurrent(p, pObj) )
         return pObj->Value;
     Gia_ObjSetTravIdCurrent(p, pObj);
     assert( Gia_ObjIsAnd(pObj) );
-    pTruth0 = Vec_WrdArray(p->vTtMemory) + p->nTtWords * Gia_ObjComputeTruthTable_rec( p, Gia_ObjFanin0(pObj) );
-    pTruth1 = Vec_WrdArray(p->vTtMemory) + p->nTtWords * Gia_ObjComputeTruthTable_rec( p, Gia_ObjFanin1(pObj) );
+    Value0 = Gia_ObjComputeTruthTable_rec( p, Gia_ObjFanin0(pObj) );
+    Value1 = Gia_ObjComputeTruthTable_rec( p, Gia_ObjFanin1(pObj) );
+    assert( Value0 < Vec_WrdSize(p->vTtMemory) );
+    assert( Value1 < Vec_WrdSize(p->vTtMemory) );
+    pTruth0 = Vec_WrdArray(p->vTtMemory) + p->nTtWords * Value0;
+    pTruth1 = Vec_WrdArray(p->vTtMemory) + p->nTtWords * Value1;
     assert( p->nTtWords * p->iTtNum < Vec_WrdSize(p->vTtMemory) );
     pTruth  = Vec_WrdArray(p->vTtMemory) + p->nTtWords * p->iTtNum++;
     pTruthL = Vec_WrdArray(p->vTtMemory) + p->nTtWords * p->iTtNum;
@@ -1387,7 +1392,7 @@ int Gia_ObjComputeTruthTable_rec( Gia_Man_t * p, Gia_Obj_t * pObj )
             while ( pTruth < pTruthL )
                 *pTruth++ =  *pTruth0++ &  *pTruth1++;
     }
-    return p->iTtNum-1;
+    return (pObj->Value = p->iTtNum-1);
 }
 unsigned * Gia_ObjComputeTruthTable( Gia_Man_t * p, Gia_Obj_t * pObj )
 {

src/base/abc/abc.h

@@ -33,6 +33,7 @@
 
 #include "misc/vec/vec.h"
 #include "aig/hop/hop.h"
+#include "aig/gia/gia.h"
 #include "misc/st/st.h"
 #include "misc/st/stmm.h"
 #include "misc/nm/nm.h"
@@ -783,6 +784,16 @@ extern ABC_DLL int                Abc_NtkRecIsInTrimMode();
 extern ABC_DLL int                Abc_NtkRecVarNum();
 extern ABC_DLL Vec_Int_t *        Abc_NtkRecMemory();
 extern ABC_DLL int                Abc_NtkRecStrashNode( Abc_Ntk_t * pNtkNew, Abc_Obj_t * pObj, unsigned * pTruth, int nVars );
+/*=== abcRec2.c ==========================================================*/
+extern ABC_DLL void               Abc_NtkRecStart2( Gia_Man_t *p, int nVars, int nCuts, int fTrim );
+extern ABC_DLL void               Abc_NtkRecStop2();
+extern ABC_DLL void               Abc_NtkRecAdd2( Abc_Ntk_t * pNtk, int fUseSOPB );
+extern ABC_DLL void               Abc_NtkRecPs2(int fPrintLib);
+extern ABC_DLL Gia_Man_t *        Abc_NtkRecGetGia();
+extern ABC_DLL void               Abc_NtkRecLibMerge2(Gia_Man_t * pGia);
+extern ABC_DLL int                Abc_NtkRecIsRunning2();
+extern ABC_DLL int                Abc_NtkRecIsInTrimMode2();
+extern ABC_DLL void               Abc_NtkRecFilter2(int nLimit);
 /*=== abcReconv.c ==========================================================*/
 extern ABC_DLL Abc_ManCut_t *     Abc_NtkManCutStart( int nNodeSizeMax, int nConeSizeMax, int nNodeFanStop, int nConeFanStop );
 extern ABC_DLL void               Abc_NtkManCutStop( Abc_ManCut_t * p );

src/base/abci/abcIf.c

@@ -494,7 +494,12 @@ Abc_Obj_t * Abc_NodeFromIf_rec( Abc_Ntk_t * pNtkNew, If_Man_t * pIfMan, If_Obj_t
         else if ( pIfMan->pPars->fUserRecLib )
         {
             extern Hop_Obj_t * Abc_RecToHop( Hop_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, If_Obj_t * pIfObj );
-            pNodeNew->pData = Abc_RecToHop( (Hop_Man_t *)pNtkNew->pManFunc, pIfMan, pCutBest, pIfObj);
+            extern Hop_Obj_t * Abc_RecToHop2( Hop_Man_t * pMan, If_Man_t * pIfMan, If_Cut_t * pCut, If_Obj_t * pIfObj );
+            if(Abc_NtkRecIsRunning())
+                pNodeNew->pData = Abc_RecToHop( (Hop_Man_t *)pNtkNew->pManFunc, pIfMan, pCutBest, pIfObj); 
+            else
+                pNodeNew->pData = Abc_RecToHop2( (Hop_Man_t *)pNtkNew->pManFunc, pIfMan, pCutBest, pIfObj); 
+            
         }
         else
         {

src/base/abci/abc_new.h

-struct Abc_Obj_t_ // 6 words
-{
-    Abc_Obj_t *       pCopy;         // the copy of this object
-    Abc_Ntk_t *       pNtk;          // the host network
-    int               Id;            // the object ID
-    int               TravId;        // the traversal ID 
-    int               nRefs;         // the number of fanouts
-    unsigned          Type    :  4;  // the object type
-    unsigned          fMarkA  :  1;  // the multipurpose mark
-    unsigned          fMarkB  :  1;  // the multipurpose mark
-    unsigned          fPhase  :  1;  // the flag to mark the phase of equivalent node
-    unsigned          fPersist:  1;  // marks the persistant AIG node
-    unsigned          nFanins : 24;  // the level of the node
-    Abc_Obj_t *       Fanins[0];     // the array of fanins
-};
-
-struct Abc_Pin_t_ // 4 words
-{
-    Abc_Pin_t *       pNext;
-    Abc_Pin_t *       pPrev;
-    Abc_Obj_t *       pFanin;
-    Abc_Obj_t *       pFanout;
-};

src/map/if/if.h

@@ -525,9 +525,13 @@ extern int             If_ManCountSpecialPos( If_Man_t * p );
 
 /*=== abcRec.c ============================================================*/
 extern int             If_CutDelayRecCost(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj);
+extern int             If_CutDelayRecCost2(If_Man_t* p, If_Cut_t* pCut, If_Obj_t * pObj);
+/*=== abcRec2.c ============================================================*/
+extern int             Abc_NtkRecIsRunning();
+extern int             Abc_NtkRecIsRunning2();
 
 // othe packages
-extern int Bat_ManCellFuncLookup( unsigned * pTruth, int nVars, int nLeaves );
+extern int             Bat_ManCellFuncLookup( unsigned * pTruth, int nVars, int nLeaves );
 
 ABC_NAMESPACE_HEADER_END
 

src/map/if/ifMap.c

@@ -156,7 +156,14 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep
 ///        if ( p->pPars->pLutStruct )
 ///            pCut->Delay = If_CutDelayLutStruct( p, pCut, p->pPars->pLutStruct, p->pPars->WireDelay );
         if ( p->pPars->fUserRecLib )
-            pCut->Delay = If_CutDelayRecCost(p, pCut, pObj);
+        {
+            if((Abc_NtkRecIsRunning2()&& Abc_NtkRecIsRunning()) || (!Abc_NtkRecIsRunning2()&& !Abc_NtkRecIsRunning()))
+                assert(0);
+            else if(Abc_NtkRecIsRunning())
+                pCut->Delay = If_CutDelayRecCost(p, pCut, pObj); 
+            else
+                pCut->Delay = If_CutDelayRecCost2(p, pCut, pObj);
+        }
         else if(p->pPars->fDelayOpt)
             pCut->Delay = If_CutDelaySopCost(p,pCut);
         else if(p->pPars->nGateSize > 0)
@@ -228,7 +235,14 @@ void If_ObjPerformMappingAnd( If_Man_t * p, If_Obj_t * pObj, int Mode, int fPrep
 ///        if ( p->pPars->pLutStruct )
 ///            pCut->Delay = If_CutDelayLutStruct( p, pCut, p->pPars->pLutStruct, p->pPars->WireDelay );
         if ( p->pPars->fUserRecLib )
-            pCut->Delay = If_CutDelayRecCost(p, pCut, pObj);
+        {
+            if((Abc_NtkRecIsRunning2()&& Abc_NtkRecIsRunning()) || (!Abc_NtkRecIsRunning2()&& !Abc_NtkRecIsRunning()))
+                assert(0);
+            else if(Abc_NtkRecIsRunning())
+                pCut->Delay = If_CutDelayRecCost(p, pCut, pObj); 
+            else
+                pCut->Delay = If_CutDelayRecCost2(p, pCut, pObj); 
+        }
         else if (p->pPars->fDelayOpt)
             pCut->Delay = If_CutDelaySopCost(p, pCut);  
         else if(p->pPars->nGateSize > 0)