Experiments with mini AIG manager.

1 files changed, 40 insertions, 31 deletions

diff --git a/src/base/abci/abcMini.c b/src/base/abci/abcMini.c
index 793695b4..bcfed643 100644
--- a/src/base/abci/abcMini.c
+++ b/src/base/abci/abcMini.c
@@ -29,9 +29,6 @@ ABC_NAMESPACE_IMPL_START
 ///                        DECLARATIONS                              ///
 ////////////////////////////////////////////////////////////////////////
 
-static Mini_Aig_t * Abc_NtkToMini( Abc_Ntk_t * pNtk );
-static Abc_Ntk_t * Abc_NtkFromMini( Abc_Ntk_t * pNtkOld, Mini_Aig_t * p );
-
 ////////////////////////////////////////////////////////////////////////
 ///                     FUNCTION DEFINITIONS                         ///
 ////////////////////////////////////////////////////////////////////////
@@ -50,20 +47,15 @@ static Abc_Ntk_t * Abc_NtkFromMini( Abc_Ntk_t * pNtkOld, Mini_Aig_t * p );
 Abc_Obj_t * Abc_NodeFanin0Copy( Abc_Ntk_t * pNtk, Vec_Int_t * vCopies, Mini_Aig_t * p, int Id )
 {
     int Lit = Mini_AigNodeFanin0( p, Id );
-    Lit = Abc_LitNotCond( Vec_IntEntry(vCopies, Abc_Lit2Var(Lit)), Abc_LitIsCompl(Lit) );
-    return Abc_ObjNotCond( Abc_NtkObj(pNtk, Abc_Lit2Var(Lit)), Abc_LitIsCompl(Lit) ); 
+    int AbcLit = Abc_LitNotCond( Vec_IntEntry(vCopies, Abc_Lit2Var(Lit)), Abc_LitIsCompl(Lit) );
+    return Abc_ObjFromLit( pNtk, AbcLit );
 }
 Abc_Obj_t * Abc_NodeFanin1Copy( Abc_Ntk_t * pNtk, Vec_Int_t * vCopies, Mini_Aig_t * p, int Id )
 {
     int Lit = Mini_AigNodeFanin1( p, Id );
-    Lit = Abc_LitNotCond( Vec_IntEntry(vCopies, Abc_Lit2Var(Lit)), Abc_LitIsCompl(Lit) );
-    return Abc_ObjNotCond( Abc_NtkObj(pNtk, Abc_Lit2Var(Lit)), Abc_LitIsCompl(Lit) ); 
-}
-int Abc_NodeToLit( Abc_Obj_t * pObj )
-{
-    return Abc_LitNotCond( Abc_ObjId(Abc_ObjRegular(pObj)), Abc_ObjIsComplement(pObj) );
+    int AbcLit = Abc_LitNotCond( Vec_IntEntry(vCopies, Abc_Lit2Var(Lit)), Abc_LitIsCompl(Lit) );
+    return Abc_ObjFromLit( pNtk, AbcLit );
 }
-
 Abc_Ntk_t * Abc_NtkFromMiniAig( Mini_Aig_t * p )
 {
     Abc_Ntk_t * pNtk;
@@ -71,12 +63,12 @@ Abc_Ntk_t * Abc_NtkFromMiniAig( Mini_Aig_t * p )
     Vec_Int_t * vCopies;
     int i, nNodes;
     // get the number of nodes
-    nNodes = Mini_AigNumNodes(p);
+    nNodes = Mini_AigNodeNum(p);
     // create ABC network
     pNtk = Abc_NtkAlloc( ABC_NTK_STRASH, ABC_FUNC_AIG, 1 );
-    // create mapping from MiniAIG into ABC objects
+    // create mapping from MiniAIG objects into ABC objects
     vCopies = Vec_IntAlloc( nNodes );
-    Vec_IntPush( vCopies, Abc_LitNot(Abc_NodeToLit(Abc_AigConst1(pNtk))) );
+    Vec_IntPush( vCopies, Abc_LitNot(Abc_ObjToLit(Abc_AigConst1(pNtk))) );
     // iterate through the objects
     for ( i = 1; i < nNodes; i++ )
     {
@@ -87,7 +79,7 @@ Abc_Ntk_t * Abc_NtkFromMiniAig( Mini_Aig_t * p )
         else if ( Mini_AigNodeIsAnd( p, i ) )
             pObj = Abc_AigAnd((Abc_Aig_t *)pNtk->pManFunc, Abc_NodeFanin0Copy(pNtk, vCopies, p, i), Abc_NodeFanin1Copy(pNtk, vCopies, p, i));
         else assert( 0 );
-        Vec_IntPush( vCopies, Abc_NodeToLit(pObj) );
+        Vec_IntPush( vCopies, Abc_ObjToLit(pObj) );
     }
     Abc_AigCleanup( (Abc_Aig_t *)pNtk->pManFunc );
     Vec_IntFree( vCopies );
@@ -109,26 +101,34 @@ Abc_Ntk_t * Abc_NtkFromMiniAig( Mini_Aig_t * p )
   SeeAlso     []
 
 ***********************************************************************/
+int Abc_NodeFanin0Copy2( Abc_Obj_t * pObj )
+{
+    return Abc_LitNotCond( Abc_ObjFanin0(pObj)->iTemp, Abc_ObjFaninC0(pObj) );
+}
+int Abc_NodeFanin1Copy2( Abc_Obj_t * pObj )
+{
+    return Abc_LitNotCond( Abc_ObjFanin1(pObj)->iTemp, Abc_ObjFaninC1(pObj) );
+}
 Mini_Aig_t * Abc_NtkToMiniAig( Abc_Ntk_t * pNtk )
 {
-    Mini_Aig_t * p = NULL;
-/*
+    Mini_Aig_t * p;
     Abc_Obj_t * pObj;
     int i;
+    assert( Abc_NtkIsStrash(pNtk) );
     // create the manager
-    p = Hop_ManStart();
-    // transfer the pointers to the basic nodes
-    Abc_AigConst1(pNtk)->pCopy = (Abc_Obj_t *)Hop_ManConst1(p);
+    p = Mini_AigStart();
+    // create mapping from MiniAIG into ABC objects
+    Abc_NtkCleanCopy( pNtk );
+    Abc_AigConst1(pNtk)->iTemp = Mini_AigLitConst1();
+    // create primary inputs
     Abc_NtkForEachCi( pNtk, pObj, i )
-        pObj->pCopy = (Abc_Obj_t *)Hop_ObjCreatePi(p);
-    // perform the conversion of the internal nodes (assumes DFS ordering)
+        pObj->iTemp = Mini_AigCreatePi(p);
+    // create internal nodes
     Abc_NtkForEachNode( pNtk, pObj, i )
-        pObj->pCopy = (Abc_Obj_t *)Hop_And( p, (Hop_Obj_t *)Abc_ObjChild0Copy(pObj), (Hop_Obj_t *)Abc_ObjChild1Copy(pObj) );
-    // create the POs
+        pObj->iTemp = Mini_AigAnd( p, Abc_NodeFanin0Copy2(pObj), Abc_NodeFanin1Copy2(pObj) );
+    // create primary outputs
     Abc_NtkForEachCo( pNtk, pObj, i )
-        Hop_ObjCreatePo( p, (Hop_Obj_t *)Abc_ObjChild0Copy(pObj) );
-    Hop_ManCleanup( p );
-*/
+        pObj->iTemp = Mini_AigCreatePo( p, Abc_NodeFanin0Copy2(pObj) );
     return p;
 }
 
@@ -143,16 +143,25 @@ Mini_Aig_t * Abc_NtkToMiniAig( Abc_Ntk_t * pNtk )
   SeeAlso     []
 
 ***********************************************************************/
-void Abc_NtkInputMiniAig( Mini_Aig_t * p )
+void Abc_NtkInputMiniAig( Abc_Frame_t * pAbc, void * p )
 {
     Abc_Ntk_t * pNtk;
-    Abc_Frame_t * pAbc = Abc_FrameReadGlobalFrame();
     if ( pAbc == NULL )
         printf( "ABC framework is not initialized by calling Abc_Start()\n" );
-    pNtk = Abc_NtkFromMiniAig( p );
+    pNtk = Abc_NtkFromMiniAig( (Mini_Aig_t *)p );
     Abc_FrameReplaceCurrentNetwork( pAbc, pNtk );
 //    Abc_NtkDelete( pNtk );
 }
+void * Abc_NtkOutputMiniAig( Abc_Frame_t * pAbc )
+{
+    Abc_Ntk_t * pNtk;
+    if ( pAbc == NULL )
+        printf( "ABC framework is not initialized by calling Abc_Start()\n" );
+    pNtk = Abc_FrameReadNtk( pAbc );
+    if ( pNtk == NULL )
+        printf( "Current network in ABC framework is not defined.\n" );
+    return Abc_NtkToMiniAig( pNtk );
+}
 
 
 ////////////////////////////////////////////////////////////////////////