Merge remote-tracking branch 'upstream/master' into typo

src/aig/gia/giaMan.c

@@ -803,7 +803,7 @@ void Gia_ManPrintNpnClasses( Gia_Man_t * p )
     Vec_Int_t * vLeaves, * vTruth, * vVisited;
     int * pLutClass, ClassCounts[222] = {0};
     int i, k, iFan, Class, OtherClasses, OtherClasses2, nTotal, Counter, Counter2;
-    unsigned * pTruth;
+    unsigned * pTruth; int nLutSize = 0;
     assert( Gia_ManHasMapping(p) );
     assert(  Gia_ManLutSizeMax( p ) <= 4 );
     vLeaves   = Vec_IntAlloc( 100 );
@@ -813,6 +813,7 @@ void Gia_ManPrintNpnClasses( Gia_Man_t * p )
     Gia_ManCleanTruth( p );
     Gia_ManForEachLut( p, i )
     {
+        nLutSize = Abc_MaxInt( nLutSize, Gia_ObjLutSize(p,i) );
         if ( Gia_ObjLutSize(p,i) > 4 )
             continue;
         Vec_IntClear( vLeaves );
@@ -872,6 +873,55 @@ void Gia_ManPrintNpnClasses( Gia_Man_t * p )
     Abc_Print( 1, "Approximate number of 4:1 MUX structures: All = %6d  (%7.2f %%)  MFFC = %6d  (%7.2f %%)\n", 
         OtherClasses,  100.0 * OtherClasses  / (nTotal+1),
         OtherClasses2, 100.0 * OtherClasses2 / (nTotal+1) );
+    // print information about LUT pairs
+    if ( nLutSize <= 4 )
+    {
+        int nTopPairs = 100, nTopShow = 30;
+        int i, j, k, iFan, * pVec = NULL;
+        Vec_Int_t * vPairs = Vec_IntAlloc( 3 * nTopPairs );
+        Gia_ManForEachLut( p, j ) {
+            Gia_LutForEachFanin( p, j, iFan, k ) {
+                int Num1 = pLutClass[iFan];
+                int Num2 = pLutClass[j];
+                assert( Vec_IntSize(vPairs) % 3 == 0 );
+                for ( i = 0; i < Vec_IntSize(vPairs); i += 3 )
+                    if ( Vec_IntEntry(vPairs, i+0) == Num1 && Vec_IntEntry(vPairs, i+1) == Num2 )
+                        break;
+                if ( i == Vec_IntSize(vPairs) ) {
+                    if ( Vec_IntSize(vPairs) < 3*nTopPairs ) {
+                        Vec_IntPush( vPairs, Num1 );
+                        Vec_IntPush( vPairs, Num2 );
+                        Vec_IntPush( vPairs, 1 );
+                    }
+                    continue;
+                }
+                // found this pair
+                assert( Vec_IntEntry(vPairs, i+0) == Num1 );
+                assert( Vec_IntEntry(vPairs, i+1) == Num2 );                
+                Vec_IntAddToEntry( vPairs, i+2, 1 );
+                // sort 
+                pVec = Vec_IntArray( vPairs );
+                while ( i > 0 && pVec[i+2] > pVec[i-1] ) {
+                    ABC_SWAP( int, pVec[i+0], pVec[i-3] )
+                    ABC_SWAP( int, pVec[i+1], pVec[i-2] )
+                    ABC_SWAP( int, pVec[i+2], pVec[i-1] )
+                    i -= 3;
+                }
+                while ( i < Vec_IntSize(vPairs) - 3 && pVec[i+2] < pVec[i+5] ) {
+                    ABC_SWAP( int, pVec[i+0], pVec[i+3] )
+                    ABC_SWAP( int, pVec[i+1], pVec[i+4] )
+                    ABC_SWAP( int, pVec[i+2], pVec[i+5] )
+                    i += 3;
+                    assert( 0 );
+                }                
+            }
+        }
+        pVec = Vec_IntArray( vPairs );
+        nTopShow = Abc_MinInt( nTopShow, Vec_IntSize(vPairs)/3 );
+        for ( i = 0; i < 3*nTopShow; i += 3 )
+            printf( "%3d : (%3d %3d) x %3d\n", i/3, pVec[i+0], pVec[i+1], pVec[i+2] );
+        Vec_IntFree( vPairs );
+    }    
     ABC_FREE( pLutClass );
 }
 

src/base/abc/abcNetlist.c

@@ -220,7 +220,7 @@ Abc_Ntk_t * Abc_NtkLogicToNetlist( Abc_Ntk_t * pNtk )
         if ( pObj->pCopy->pCopy ) // the net of the new object is already created
             continue;
         // create the new net
-        sprintf( Buffer, "new_%s_", Abc_ObjName(pObj) );
+        sprintf( Buffer, "new_%s", Abc_ObjName(pObj) );
         //pNet = Abc_NtkFindOrCreateNet( pNtkNew, Abc_ObjName(pObj) ); // here we create net names such as "n48", where 48 is the ID of the node
         pNet = Abc_NtkFindOrCreateNet( pNtkNew, Buffer ); 
         Abc_ObjAddFanin( pNet, pObj->pCopy );

src/base/abci/abcGen.c

@@ -706,7 +706,7 @@ void Abc_GenRandom( char * pFileName, int nPis )
     unsigned * pTruth;
     int i, b, w, nWords = Abc_TruthWordNum( nPis );
     int nDigitsIn;
-    Aig_ManRandom( 1 );
+    //Aig_ManRandom( 1 );
     pTruth = ABC_ALLOC( unsigned, nWords );
     for ( w = 0; w < nWords; w++ )
         pTruth[w] = Aig_ManRandom( 0 );

src/base/io/ioWriteEqn.c

@@ -85,6 +85,10 @@ void Io_WriteEqn( Abc_Ntk_t * pNtk, char * pFileName )
   SeeAlso     []
 
 ***********************************************************************/
+char * Io_NamePrepro( char * pName )
+{
+    return strncmp(pName, "new_", 4) ? pName : pName + 4;    
+}
 void Io_NtkWriteEqnOne( FILE * pFile, Abc_Ntk_t * pNtk )
 {
     Vec_Vec_t * vLevels;
@@ -108,10 +112,10 @@ void Io_NtkWriteEqnOne( FILE * pFile, Abc_Ntk_t * pNtk )
     Abc_NtkForEachNode( pNtk, pNode, i )
     {
         Extra_ProgressBarUpdate( pProgress, i, NULL );
-        fprintf( pFile, "%s = ", Abc_ObjName(Abc_ObjFanout0(pNode)) );
+        fprintf( pFile, "%s = ", Io_NamePrepro( Abc_ObjName(Abc_ObjFanout0(pNode)) ) );
         // set the input names
         Abc_ObjForEachFanin( pNode, pFanin, k )
-            Hop_IthVar((Hop_Man_t *)pNtk->pManFunc, k)->pData = Abc_ObjName(pFanin);
+            Hop_IthVar((Hop_Man_t *)pNtk->pManFunc, k)->pData = Io_NamePrepro( Abc_ObjName(pFanin) );
         // write the formula
         Hop_ObjPrintEqn( pFile, (Hop_Obj_t *)pNode->pData, vLevels, 0 );
         fprintf( pFile, ";\n" );

src/sat/cnf/cnfUtil.c

@@ -23,13 +23,18 @@
 
 ABC_NAMESPACE_IMPL_START
 
+#ifdef _MSC_VER
+#define unlink _unlink
+#else
+#include <unistd.h>
+#endif
+
 #ifdef ABC_USE_PTHREADS
 
 #ifdef _WIN32
 #include "../lib/pthread.h"
 #else
 #include <pthread.h>
-#include <unistd.h>
 #endif
 
 #endif