Making sure the CI/CO are not ordered by 'fraig_restore'.

2 files changed, 16 insertions, 12 deletions

diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index c6e252a0..0cd325ab 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -16751,7 +16751,7 @@ int Abc_CommandInit( Abc_Frame_t * pAbc, int argc, char ** argv )
 
     if ( Abc_NtkIsComb(pNtk) )
     {
-        Abc_Print( -1, "The current network is combinational.\n" );
+        Abc_Print( 0, "The current network is combinational.\n" );
         return 0;
     }
 
@@ -16882,7 +16882,7 @@ int Abc_CommandZero( Abc_Frame_t * pAbc, int argc, char ** argv )
 
     if ( Abc_NtkIsComb(pNtk) )
     {
-        Abc_Print( -1, "The current network is combinational.\n" );
+        Abc_Print( 0, "The current network is combinational.\n" );
         return 0;
     }
 
@@ -16978,7 +16978,7 @@ int Abc_CommandUndc( Abc_Frame_t * pAbc, int argc, char ** argv )
 
     if ( Abc_NtkIsComb(pNtk) )
     {
-        Abc_Print( -1, "The current network is combinational.\n" );
+        Abc_Print( 0, "The current network is combinational.\n" );
         return 0;
     }
 
@@ -17037,7 +17037,7 @@ int Abc_CommandOneHot( Abc_Frame_t * pAbc, int argc, char ** argv )
     }
     if ( Abc_NtkIsComb(pNtk) )
     {
-        Abc_Print( -1, "The current network is combinational.\n" );
+        Abc_Print( 0, "The current network is combinational.\n" );
         return 0;
     }
     if ( !Abc_NtkIsLogic(pNtk) )
@@ -17113,7 +17113,7 @@ int Abc_CommandPipe( Abc_Frame_t * pAbc, int argc, char ** argv )
 
     if ( Abc_NtkIsComb(pNtk) )
     {
-        Abc_Print( -1, "The current network is combinational.\n" );
+        Abc_Print( 0, "The current network is combinational.\n" );
         return 0;
     }
 
@@ -23404,7 +23404,7 @@ int Abc_CommandTempor( Abc_Frame_t * pAbc, int argc, char ** argv )
     }
     if ( Abc_NtkLatchNum(pNtk) == 0 )
     {
-        Abc_Print( -2, "The current network is combinational.\n");
+        Abc_Print( 0, "The current network is combinational.\n");
         return 0;
     }
     if ( fUpdateCex )
@@ -24602,7 +24602,7 @@ int Abc_CommandPdr( Abc_Frame_t * pAbc, int argc, char ** argv )
     }
     if ( Abc_NtkLatchNum(pNtk) == 0 )
     {
-        Abc_Print( -2, "The current network is combinational.\n");
+        Abc_Print( 0, "The current network is combinational.\n");
         return 0;
     }
     if ( !Abc_NtkIsStrash(pNtk) )
diff --git a/src/base/abci/abcFraig.c b/src/base/abci/abcFraig.c
index cbb675a3..2cfb46bb 100644
--- a/src/base/abci/abcFraig.c
+++ b/src/base/abci/abcFraig.c
@@ -667,12 +667,16 @@ int Abc_NtkFraigStore( Abc_Ntk_t * pNtkAdd )
     if ( Vec_PtrSize(vStore) > 0 )
     {
         // check that the networks have the same PIs
-        // reorder PIs of pNtk2 according to pNtk1
-        if ( !Abc_NtkCompareSignals( pNtk, (Abc_Ntk_t *)Vec_PtrEntry(vStore, 0), 1, 1 ) )
+        extern int Abc_NodeCompareCiCo( Abc_Ntk_t * pNtkOld, Abc_Ntk_t * pNtkNew );
+        if ( !Abc_NodeCompareCiCo(pNtk, (Abc_Ntk_t *)Vec_PtrEntry(vStore, 0)) )
         {
-            printf( "Trying to store the network with different primary inputs.\n" );
-            printf( "The previously stored networks are deleted and this one is added.\n" );
-            Abc_NtkFraigStoreClean();
+            // reorder PIs of pNtk2 according to pNtk1
+            if ( !Abc_NtkCompareSignals( pNtk, (Abc_Ntk_t *)Vec_PtrEntry(vStore, 0), 1, 1 ) )
+            {
+                printf( "Trying to store the network with different primary inputs.\n" );
+                printf( "The previously stored networks are deleted and this one is added.\n" );
+                Abc_NtkFraigStoreClean();
+            }
         }
     }
     Vec_PtrPush( vStore, pNtk );