Version abc81025

abc.dsp

@@ -3286,6 +3286,10 @@ SOURCE=.\src\aig\saig\saigBmc.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\aig\saig\saigBmc2.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\aig\saig\saigCone.c
 # End Source File
 # Begin Source File
@@ -3482,6 +3486,10 @@ SOURCE=.\src\aig\ssw\sswInt.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\src\aig\ssw\sswIslands.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\src\aig\ssw\sswLcorr.c
 # End Source File
 # Begin Source File

src/aig/fra/fraCec.c

@@ -175,7 +175,11 @@ int Fra_FraigCec( Aig_Man_t ** ppAig, int nConfLimit, int fVerbose )
     RetValue = Fra_FraigMiterStatus( pAig );
 //    assert( RetValue == -1 );
     if ( RetValue >= 0 )
+    {
+        pAig->pData = ALLOC( int, Aig_ManPiNum(pAig) );
+        memset( pAig->pData, 0, sizeof(int) * Aig_ManPiNum(pAig) );
         return RetValue;
+    }
 
     // if SAT only, solve without iteration
 clk = clock();

src/aig/ntl/ntl.h

@@ -139,6 +139,7 @@ struct Ntl_Obj_t_
     union {                            // clock / other data
         Ntl_Net_t *    pClock;         // clock (for registers)
         void *         pTemp;          // other data 
+        int            iTemp;          // other data
     };
     Ntl_Net_t *        pFanio[0];      // fanins/fanouts
 };
@@ -149,8 +150,8 @@ struct Ntl_Net_t_
     void *             pCopy;          // the copy of this object
     union {
         void *         pCopy2;         // the copy of this object
-        int            iTemp;          // other data
         float          dTemp;          // other data
+        int            iTemp;          // other data
     };
     Ntl_Obj_t *        pDriver;        // driver of the net
     char               nVisits;        // the number of times the net is visited
@@ -352,6 +353,7 @@ extern ABC_DLL int             Ntl_ManSweep( Ntl_Man_t * p, int fVerbose );
 /*=== ntlTable.c ==========================================================*/
 extern ABC_DLL Ntl_Net_t *     Ntl_ModelFindNet( Ntl_Mod_t * p, char * pName );
 extern ABC_DLL Ntl_Net_t *     Ntl_ModelFindOrCreateNet( Ntl_Mod_t * p, char * pName );
+extern ABC_DLL void            Ntl_ModelSetPioNumbers( Ntl_Mod_t * p );
 extern ABC_DLL int             Ntl_ModelFindPioNumber( Ntl_Mod_t * p, int fPiOnly, int fPoOnly, char * pName, int * pNumber );
 extern ABC_DLL int             Ntl_ModelSetNetDriver( Ntl_Obj_t * pObj, Ntl_Net_t * pNet );
 extern ABC_DLL int             Ntl_ModelClearNetDriver( Ntl_Obj_t * pObj, Ntl_Net_t * pNet );

src/aig/ntl/ntlEc.c

@@ -351,6 +351,7 @@ Aig_Man_t * Ntl_ManPrepareSec( char * pFileName1, char * pFileName2 )
     pAig1 = Ntl_ManCollapse( pMan1, 1 );
     pAig2 = Ntl_ManCollapse( pMan2, 1 );
     pAig = Saig_ManCreateMiter( pAig1, pAig2, 0 );
+    Aig_ManCleanup( pAig );
     Aig_ManStop( pAig1 );
     Aig_ManStop( pAig2 );
     // cleanup

src/aig/ntl/ntlReadBlif.c

@@ -745,6 +745,7 @@ static int Ioa_ReadReadInterfaces( Ioa_ReadMan_t * p )
             if ( !Ioa_ReadParseLineOutputs( pMod, pLine ) )
                 return 0;
         // parse the delay info
+        Ntl_ModelSetPioNumbers( pMod->pNtk );
         Vec_PtrForEachEntry( pMod->vDelays, pLine, k )
             if ( !Ioa_ReadParseLineDelay( pMod, pLine ) )
                 return 0;
@@ -954,6 +955,7 @@ static int Ioa_ReadParseLineOutputs( Ioa_ReadMod_t * p, char * pLine )
     {
         pNet = Ntl_ModelFindOrCreateNet( p->pNtk, pToken );
         pObj = Ntl_ModelCreatePo( p->pNtk, pNet );
+        pNet->pCopy = pObj;
     }
     return 1;
 }

src/aig/ntl/ntlTable.c

@@ -180,6 +180,27 @@ Ntl_Net_t * Ntl_ModelFindOrCreateNet( Ntl_Mod_t * p, char * pName )
 
 /**Function*************************************************************
 
+  Synopsis    [Assigns numbers to PIs and POs.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+void Ntl_ModelSetPioNumbers( Ntl_Mod_t * p )
+{
+    Ntl_Obj_t * pObj;
+    int i;
+    Ntl_ModelForEachPi( p, pObj, i )
+        pObj->iTemp = i;
+    Ntl_ModelForEachPo( p, pObj, i )
+        pObj->iTemp = i;
+}
+
+/**Function*************************************************************
+
   Synopsis    [Returns -1, 0, +1 (when it is PI, not found, or PO).]
 
   Description []
@@ -189,7 +210,7 @@ Ntl_Net_t * Ntl_ModelFindOrCreateNet( Ntl_Mod_t * p, char * pName )
   SeeAlso     []
 
 ***********************************************************************/
-int Ntl_ModelFindPioNumber( Ntl_Mod_t * p, int fPiOnly, int fPoOnly, char * pName, int * pNumber )
+int Ntl_ModelFindPioNumber_old( Ntl_Mod_t * p, int fPiOnly, int fPoOnly, char * pName, int * pNumber )
 {
     Ntl_Net_t * pNet;
     Ntl_Obj_t * pObj;
@@ -243,6 +264,60 @@ int Ntl_ModelFindPioNumber( Ntl_Mod_t * p, int fPiOnly, int fPoOnly, char * pNam
 
 /**Function*************************************************************
 
+  Synopsis    [Returns -1, 0, +1 (when it is PI, not found, or PO).]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+int Ntl_ModelFindPioNumber( Ntl_Mod_t * p, int fPiOnly, int fPoOnly, char * pName, int * pNumber )
+{
+    Ntl_Net_t * pNet;
+    Ntl_Obj_t * pTerm;
+    *pNumber = -1;
+    pNet = Ntl_ModelFindNet( p, pName );
+    if ( pNet == NULL )
+        return 0;
+    if ( fPiOnly )
+    {
+        pTerm = pNet->pDriver;
+        if ( pTerm && Ntl_ObjIsPi(pTerm) )
+        {
+            *pNumber = pTerm->iTemp;
+            return -1;
+        }
+        return 0;
+    }
+    if ( fPoOnly )
+    {
+        pTerm = pNet->pCopy;
+        if ( pTerm && Ntl_ObjIsPo(pTerm) )
+        {
+            *pNumber = pTerm->iTemp;
+            return 1;
+        }
+        return 0;
+    }
+    pTerm = pNet->pCopy;
+    if ( pTerm && Ntl_ObjIsPo(pTerm) )
+    {
+        *pNumber = pTerm->iTemp;
+        return 1;
+    }
+    pTerm = pNet->pDriver;
+    if ( pTerm && Ntl_ObjIsPi(pTerm) )
+    {
+        *pNumber = pTerm->iTemp;
+        return -1;
+    }
+    return 0;
+}
+
+/**Function*************************************************************
+
   Synopsis    [Sets the driver of the net.]
 
   Description []

src/aig/nwk/nwkCheck.c

@@ -55,7 +55,7 @@ int Nwk_ManCheck( Nwk_Man_t * p )
     Nwk_ManForEachObj( p, pObj, i )
     {
         Nwk_ObjForEachFanin( pObj, pNext, k )
-            if ( Nwk_ObjFindFanout( pNext, pObj ) == -1 )
+            if ( Nwk_ObjFanoutNum(pNext) < 100 && Nwk_ObjFindFanout( pNext, pObj ) == -1 )
                 printf( "Nwk_ManCheck(): Object %d has fanin %d which does not have a corresponding fanout.\n", pObj->Id, pNext->Id );
         Nwk_ObjForEachFanout( pObj, pNext, k )
             if ( Nwk_ObjFindFanin( pNext, pObj ) == -1 )

src/aig/saig/module.make

 SRC +=    src/aig/saig/saigAbs.c \
     src/aig/saig/saigBmc.c \
+    src/aig/saig/saigBmc2.c \
     src/aig/saig/saigCone.c \
     src/aig/saig/saigDup.c \
     src/aig/saig/saigHaig.c \

src/aig/saig/saig.h

@@ -99,6 +99,7 @@ extern Aig_Man_t *       Saig_ManCreateMiter( Aig_Man_t * p1, Aig_Man_t * p2, in
 extern Aig_Man_t *       Saig_ManCreateMiterComb( Aig_Man_t * p1, Aig_Man_t * p2, int Oper );
 extern Aig_Man_t *       Saig_ManCreateMiterTwo( Aig_Man_t * pOld, Aig_Man_t * pNew, int nFrames );
 extern int               Saig_ManDemiterSimple( Aig_Man_t * p, Aig_Man_t ** ppAig0, Aig_Man_t ** ppAig1 );
+extern int               Saig_ManDemiterSimpleDiff( Aig_Man_t * p, Aig_Man_t ** ppAig0, Aig_Man_t ** ppAig1 );
 /*=== saigPhase.c ==========================================================*/
 extern Aig_Man_t *       Saig_ManPhaseAbstract( Aig_Man_t * p, Vec_Int_t * vInits, int nFrames, int fIgnore, int fPrint, int fVerbose );
 /*=== saigRetFwd.c ==========================================================*/

src/aig/saig/saigSynch.c

@@ -632,6 +632,7 @@ Aig_Man_t * Saig_Synchronize( Aig_Man_t * pAig1, Aig_Man_t * pAig2, int nWords,
     pAig1z = Saig_ManDupInitZero( pAig1 );
     pAig2z = Saig_ManDupInitZero( pAig2 );
     pMiter = Saig_ManCreateMiter( pAig1z, pAig2z, 0 );
+    Aig_ManCleanup( pMiter );
     Aig_ManStop( pAig1z );
     Aig_ManStop( pAig2z );
 

src/aig/ssw/module.make

@@ -4,6 +4,7 @@ SRC +=    src/aig/ssw/sswAig.c \
     src/aig/ssw/sswCnf.c \
     src/aig/ssw/sswCore.c \
     src/aig/ssw/sswDyn.c \
+    src/aig/ssw/sswIslands.c \
     src/aig/ssw/sswLcorr.c \
     src/aig/ssw/sswMan.c \
     src/aig/ssw/sswPart.c \

src/aig/ssw/ssw.h

@@ -104,6 +104,7 @@ extern int           Ssw_SecSpecialMiter( Aig_Man_t * pMiter, int fVerbose );
 /*=== sswPart.c ==========================================================*/
 extern Aig_Man_t *   Ssw_SignalCorrespondencePart( Aig_Man_t * pAig, Ssw_Pars_t * pPars );
 /*=== sswPairs.c ===================================================*/
+extern int           Ssw_MiterStatus( Aig_Man_t * p, int fVerbose );
 extern int           Ssw_SecWithPairs( Aig_Man_t * pAig1, Aig_Man_t * pAig2, Vec_Int_t * vIds1, Vec_Int_t * vIds2, Ssw_Pars_t * pPars );
 extern int           Ssw_SecGeneral( Aig_Man_t * pAig1, Aig_Man_t * pAig2, Ssw_Pars_t * pPars );
 extern int           Ssw_SecGeneralMiter( Aig_Man_t * pMiter, Ssw_Pars_t * pPars );

src/aig/ssw/sswClass.c

@@ -446,7 +446,7 @@ void Ssw_ClassesRemoveNode( Ssw_Cla_t * p, Aig_Obj_t * pObj )
     assert( p->pId2Class[pObj->Id] == NULL );
     pRepr = Aig_ObjRepr( p->pAig, pObj );
     assert( pRepr != NULL );
-    Vec_PtrPush( p->vRefined, pObj );
+//    Vec_PtrPush( p->vRefined, pObj );
     if ( Ssw_ObjIsConst1Cand( p->pAig, pObj ) )
     {
         assert( p->pClassSizes[pRepr->Id] == 0 );
@@ -455,7 +455,7 @@ void Ssw_ClassesRemoveNode( Ssw_Cla_t * p, Aig_Obj_t * pObj )
         p->nCands1--;
         return;
     }
-    Vec_PtrPush( p->vRefined, pRepr );
+//    Vec_PtrPush( p->vRefined, pRepr );
     Aig_ObjSetRepr( p->pAig, pObj, NULL );
     assert( p->pId2Class[pRepr->Id][0] == pRepr );
     assert( p->pClassSizes[pRepr->Id] >= 2 );
@@ -793,6 +793,48 @@ Ssw_Cla_t * Ssw_ClassesPreparePairs( Aig_Man_t * pAig, Vec_Int_t ** pvClasses )
 
 /**Function*************************************************************
 
+  Synopsis    [Creates classes from the temporary representation.]
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+Ssw_Cla_t * Ssw_ClassesFromIslands( Aig_Man_t * pMiter, Vec_Int_t * vPairs )
+{
+    Ssw_Cla_t * p;
+    Aig_Obj_t ** ppClassNew;
+    Aig_Obj_t * pObj, * pRepr;
+    int i;
+    // start the classes
+    p = Ssw_ClassesStart( pMiter );
+    // allocate memory for classes
+    p->pMemClasses = ALLOC( Aig_Obj_t *, Vec_IntSize(vPairs) );
+    // create classes
+    for ( i = 0; i < Vec_IntSize(vPairs); i += 2 )
+    {
+        pRepr = Aig_ManObj( pMiter, Vec_IntEntry(vPairs, i) );
+        pObj  = Aig_ManObj( pMiter, Vec_IntEntry(vPairs, i+1) );
+        assert( Aig_ObjId(pRepr) < Aig_ObjId(pObj) );
+        Aig_ObjSetRepr( pMiter, pObj, pRepr );
+        // get room for storing the class
+        ppClassNew = p->pMemClasses + i;
+        ppClassNew[0] = pRepr;
+        ppClassNew[1] = pObj;
+        // create new class
+        Ssw_ObjAddClass( p, pRepr, ppClassNew, 2 );
+    }
+    // prepare room for new classes
+    p->pMemClassesFree = NULL;
+    Ssw_ClassesCheck( p );
+//    Ssw_ClassesPrint( p, 0 );
+    return p;
+}
+
+/**Function*************************************************************
+
   Synopsis    [Iteratively refines the classes after simulation.]
 
   Description [Returns the number of refinements performed.]
@@ -820,8 +862,8 @@ int Ssw_ClassesRefineOneClass( Ssw_Cla_t * p, Aig_Obj_t * pReprOld, int fRecursi
     if ( Vec_PtrSize(p->vClassNew) == 0 )
         return 0;
     // remember that this class is refined
-    Ssw_ClassForEachNode( p, pReprOld, pObj, i )
-        Vec_PtrPush( p->vRefined, pObj );
+//    Ssw_ClassForEachNode( p, pReprOld, pObj, i )
+//        Vec_PtrPush( p->vRefined, pObj );
 
     // get the new representative
     pReprNew = Vec_PtrEntry( p->vClassNew, 0 );
@@ -944,7 +986,7 @@ int Ssw_ClassesRefineConst1( Ssw_Cla_t * p, int fRecursive )
             if ( !p->pFuncNodeIsConst( p->pManData, pObj ) )
             {
                 Vec_PtrPush( p->vClassNew, pObj );
-                Vec_PtrPush( p->vRefined, pObj );
+//                Vec_PtrPush( p->vRefined, pObj );
             }
         }
     // check if there is a new class

src/aig/ssw/sswInt.h

@@ -205,6 +205,7 @@ extern Ssw_Cla_t *   Ssw_ClassesPrepare( Aig_Man_t * pAig, int fLatchCorr, int n
 extern Ssw_Cla_t *   Ssw_ClassesPrepareSimple( Aig_Man_t * pAig, int fLatchCorr, int nMaxLevs );
 extern Ssw_Cla_t *   Ssw_ClassesPrepareTargets( Aig_Man_t * pAig );
 extern Ssw_Cla_t *   Ssw_ClassesPreparePairs( Aig_Man_t * pAig, Vec_Int_t ** pvClasses );
+extern Ssw_Cla_t *   Ssw_ClassesFromIslands( Aig_Man_t * pMiter, Vec_Int_t * vPairs );
 extern int           Ssw_ClassesRefine( Ssw_Cla_t * p, int fRecursive );
 extern int           Ssw_ClassesRefineOneClass( Ssw_Cla_t * p, Aig_Obj_t * pRepr, int fRecursive );
 extern int           Ssw_ClassesRefineConst1Group( Ssw_Cla_t * p, Vec_Ptr_t * vRoots, int fRecursive );

src/aig/ssw/sswPairs.c

@@ -276,6 +276,7 @@ Aig_Man_t * Ssw_SignalCorrespondenceWithPairs( Aig_Man_t * pAig1, Aig_Man_t * pA
     assert( Vec_IntSize(vIds1) == Vec_IntSize(vIds2) );
     // create sequential miter
     pMiter = Saig_ManCreateMiter( pAig1, pAig2, 0 );
+    Aig_ManCleanup( pMiter );
     // transfer information to the miter
     vPairs = Ssw_TransferSignalPairs( pMiter, pAig1, pAig2, vIds1, vIds2 );
     // create representation of the classes
@@ -413,6 +414,7 @@ int Ssw_SecGeneral( Aig_Man_t * pAig1, Aig_Man_t * pAig2, Ssw_Pars_t * pPars )
     // try the new AIGs
     printf( "Performing general verification without node pairs.\n" );
     pMiter = Saig_ManCreateMiter( pAig1, pAig2, 0 );
+    Aig_ManCleanup( pMiter );
     pAigRes = Ssw_SignalCorrespondence( pMiter, pPars );
     Aig_ManStop( pMiter );
     // report the results

src/base/abci/abc.c

@@ -7936,7 +7936,7 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
     Abc_FrameReplaceCurrentNetwork( pAbc, pNtkRes );
 */
 
-
+/*
     pNtkRes = Abc_NtkDarTestNtk( pNtk );
     if ( pNtkRes == NULL )
     {
@@ -7945,9 +7945,9 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
     }
     // replace the current network
     Abc_FrameReplaceCurrentNetwork( pAbc, pNtkRes );
+*/
 
-
-//    Abc_NtkDarTest( pNtk );
+    Abc_NtkDarTest( pNtk );
 
     return 0;
 usage:

src/base/abci/abcMap.c

@@ -109,9 +109,9 @@ clk = clock();
 
     // reconstruct the network after mapping
     pNtkNew = Abc_NtkFromMap( pMan, pNtk );
+    Map_ManFree( pMan );
     if ( pNtkNew == NULL )
         return NULL;
-    Map_ManFree( pMan );
 
     if ( pNtk->pExdc )
         pNtkNew->pExdc = Abc_NtkDup( pNtk->pExdc );