Improvements to delay-optimization in &satlut.

src/aig/gia/gia.h

@@ -1382,7 +1382,7 @@ extern float               Gia_ManDelayTraceLut( Gia_Man_t * p );
 extern float               Gia_ManDelayTraceLutPrint( Gia_Man_t * p, int fVerbose );
 extern Gia_Man_t *         Gia_ManSpeedup( Gia_Man_t * p, int Percentage, int Degree, int fVerbose, int fVeryVerbose );
 /*=== giaSplit.c ============================================================*/
-extern void                Gia_ManComputeOneWinStart( Gia_Man_t * p, int fReverse );
+extern void                Gia_ManComputeOneWinStart( Gia_Man_t * p, int nAnds, int fReverse );
 extern int                 Gia_ManComputeOneWin( Gia_Man_t * p, int iPivot, Vec_Int_t ** pvRoots, Vec_Int_t ** pvNodes, Vec_Int_t ** pvLeaves, Vec_Int_t ** pvAnds );
 /*=== giaStg.c ============================================================*/
 extern void                Gia_ManStgPrint( FILE * pFile, Vec_Int_t * vLines, int nIns, int nOuts, int nStates );

src/aig/gia/giaSplit.c

@@ -538,10 +538,10 @@ int Gia_ManComputeOneWin( Gia_Man_t * pGia, int iPivot, Vec_Int_t ** pvRoots, Ve
     // Vec_IntPrint( p->vNodes );
     return Vec_IntSize(p->vAnds);
 }
-void Gia_ManComputeOneWinStart( Gia_Man_t * pGia, int fReverse )
+void Gia_ManComputeOneWinStart( Gia_Man_t * pGia, int nAnds, int fReverse )
 {
     assert( pGia->pSatlutWinman == NULL );
-    pGia->pSatlutWinman = Spl_ManAlloc( pGia, 64, fReverse );
+    pGia->pSatlutWinman = Spl_ManAlloc( pGia, nAnds, fReverse );
 }
 
 /**Function*************************************************************
@@ -558,7 +558,7 @@ void Gia_ManComputeOneWinStart( Gia_Man_t * pGia, int fReverse )
 void Spl_ManComputeOneTest( Gia_Man_t * pGia )
 {
     int iLut, Count;
-    Gia_ManComputeOneWinStart( pGia, 0 );
+    Gia_ManComputeOneWinStart( pGia, 64, 0 );
     Gia_ManForEachLut2( pGia, iLut )
     {
         Vec_Int_t * vRoots, * vNodes, * vLeaves, * vAnds;

src/base/abci/abc.c

@@ -34828,7 +34828,7 @@ usage:
 int Abc_CommandAbc9SatLut( Abc_Frame_t * pAbc, int argc, char ** argv )
 {
     extern void Gia_ManLutSat( Gia_Man_t * p, int nNumber, int nImproves, int nBTLimit, int DelayMax, int nEdges, int fDelay, int fReverse, int fVeryVerbose, int fVerbose );
-    int c, nNumber = 64, nImproves = 0, nBTLimit = 500, DelayMax = 0, nEdges = 0;
+    int c, nNumber = 32, nImproves = 0, nBTLimit = 100, DelayMax = 0, nEdges = 0;
     int fDelay = 0, fReverse = 0, fVeryVerbose = 0, fVerbose = 0;
     Extra_UtilGetoptReset();
     while ( ( c = Extra_UtilGetopt( argc, argv, "NICDQdrwvh" ) ) != EOF )
@@ -34842,6 +34842,11 @@ int Abc_CommandAbc9SatLut( Abc_Frame_t * pAbc, int argc, char ** argv )
                 goto usage;
             }
             nNumber = atoi(argv[globalUtilOptind]);
+            if ( nNumber > 128 )
+            {
+                Abc_Print( -1, "The number of AIG nodes should not exceed 128.\n" );
+                goto usage;
+            }
             globalUtilOptind++;
             break;
         case 'I':
@@ -34917,7 +34922,7 @@ int Abc_CommandAbc9SatLut( Abc_Frame_t * pAbc, int argc, char ** argv )
 usage:
     Abc_Print( -2, "usage: &satlut [-NICDQ num] [-drwvh]\n" );
     Abc_Print( -2, "\t           performs SAT-based remapping of the 4-LUT network\n" );
-    Abc_Print( -2, "\t-N num   : the limit on the number of AIG nodes in the window [default = %d]\n", nNumber );
+    Abc_Print( -2, "\t-N num   : the limit on AIG nodes in the window (num <= 128) [default = %d]\n", nNumber );
     Abc_Print( -2, "\t-I num   : the limit on the number of improved windows [default = %d]\n", nImproves );
     Abc_Print( -2, "\t-C num   : the limit on the number of conflicts [default = %d]\n", nBTLimit );
     Abc_Print( -2, "\t-D num   : the user-specified required times at the outputs [default = %d]\n", DelayMax );