Updating LUT synthesis code.

src/aig/gia/giaMan.c

@@ -583,7 +583,7 @@ void Gia_ManPrintStats( Gia_Man_t * p, Gps_Par_t * pPars )
         Gia_ManPrintMappingStats( p, pPars ? pPars->pDumpFile : NULL );
     else if ( pPars && pPars->pDumpFile )
         Gia_ManLogAigStats( p, pPars->pDumpFile );
-    if ( pPars && pPars->fNpn && Gia_ManHasMapping(p) && Gia_ManLutSizeMax(p) <= 4 )
+    if ( pPars && pPars->fNpn && Gia_ManHasMapping(p) )
         Gia_ManPrintNpnClasses( p );
     if ( p->vPacking )
         Gia_ManPrintPackingStats( p );

src/aig/gia/giaMinLut.c

@@ -102,9 +102,7 @@ int Vec_WrdReadText2( char * pFileName, Vec_Wrd_t ** pvSimI )
         printf( "Cannot open file \"%s\" for reading.\n", pFileName );
         return 0;
     }
-    fgets( pLine, 1000, pFile );
-    nIns = strlen(pLine)-1;
-    if ( nIns < 1 )
+    if ( !fgets(pLine, 1000, pFile) || (nIns = strlen(pLine)-1) < 1 )
     {
         printf( "Cannot find the number of inputs in file \"%s\".\n", pFileName );
         fclose( pFile );
@@ -464,7 +462,7 @@ Gia_Man_t * Gia_ManPerformLNetOpt( Gia_Man_t * p, char * pFileName, int nIns, in
     word * pTruth1 = ABC_CALLOC( word, Abc_Truth6WordNum(nIns) ); int g, k; float CareAve = 0;
     if ( vSimI && fVerbose )
     {
-        int nPats = 64*Vec_WrdSize(vSimI)/Gia_ManCiNum(p);
+        //int nPats = 64*Vec_WrdSize(vSimI)/Gia_ManCiNum(p);
         printf( "Density of input  patterns %8.4f.\n", (float)Abc_TtCountOnesVec(Vec_WrdArray(vSimI), Vec_WrdSize(vSimI))/(64*Vec_WrdSize(vSimI)) );
         printf( "Using patterns with count %d and higher as cares.\n", Thresh );
     }
@@ -724,7 +722,7 @@ Abc_Ntk_t * Gia_ManPerformLNetMap( Gia_Man_t * p, int GroupSize, int fUseFixed,
 
 #else
 
-Gia_Man_t * Gia_ManPerformLNetMap( Gia_Man_t * p, int GroupSize, int fUseFixed, int fVerbose )
+Abc_Ntk_t * Gia_ManPerformLNetMap( Gia_Man_t * p, int GroupSize, int fUseFixed, int fVerbose )
 {
     return NULL;
 }

src/bool/kit/kitGraph.c

@@ -19,6 +19,7 @@
 ***********************************************************************/
 
 #include "kit.h"
+#include "misc/extra/extra.h"
 
 ABC_NAMESPACE_IMPL_START
 
@@ -385,7 +386,7 @@ Kit_Graph_t * Kit_TruthToGraph2( unsigned * pTruth0, unsigned * pTruth1, int nVa
     Kit_Graph_t * pGraph;
     int RetValue;
     // derive SOP
-    RetValue = Kit_TruthIsop2( pTruth0, pTruth1, nVars, vMemory, 1, 0 ); // tried 1 and found not useful in "renode"
+    RetValue = Kit_TruthIsop2( pTruth0, pTruth1, nVars, vMemory, 0, 0 ); // tried 1 and found not useful in "renode"
     if ( RetValue == -1 )
         return NULL;
     if ( Vec_IntSize(vMemory) > (1<<16) )

src/map/if/ifTruth.c

@@ -20,6 +20,7 @@
 
 #include "if.h"
 #include "bool/kit/kit.h"
+#include "misc/extra/extra.h"
 
 ABC_NAMESPACE_IMPL_START