Updates to &flow and &flow2.

src/aig/gia/giaScript.c

@@ -388,7 +388,7 @@ void Gia_ManPerformMap( int nAnds, int nLutSize, int nCutNum, int fMinAve, int f
         printf( "Mapping with &lf:\n" );
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
     }
-    if ( (nLutSize == 4 && nAnds < 100000) || (nLutSize == 6 && nAnds < 10000) )
+    if ( (nLutSize == 4 && nAnds < 100000) || (nLutSize == 6 && nAnds < 2000) )
     {
         sprintf( Command, "&unmap; &if -sz -S %d%d -K %d -C %d %s", nLutSize, nLutSize, 2*nLutSize-1, 2*nCutNum, fMinAve?"-t":"" );
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
@@ -417,11 +417,11 @@ void Gia_ManPerformRound( int fIsMapped, int nAnds, int nLevels, int nLutSize, i
     if ( nAnds < 50000 )
     {
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "" );
-        sprintf( Command, "&dsdb; &dch -f; &if -K %d -C %d %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
+        sprintf( Command, "&dsdb; &dch -C 200; &if -K %d -C %d %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
         if ( fVerbose )
         {
-            printf( "Mapping with &dch -f; &if -K %d -C %d %s:\n", nLutSize, nCutNum, fMinAve?"-t":"" );
+            printf( "Mapping with &dch -C 200; &if -K %d -C %d %s:\n", nLutSize, nCutNum, fMinAve?"-t":"" );
             Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
         }
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
@@ -431,11 +431,11 @@ void Gia_ManPerformRound( int fIsMapped, int nAnds, int nLevels, int nLutSize, i
     if ( nAnds < 20000 )
     {
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "" );
-        sprintf( Command, "&dsdb; &dch -f; &if -K %d -C %d %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
+        sprintf( Command, "&dsdb; &dch -C 200; &if -K %d -C %d %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
         if ( fVerbose )
         {
-            printf( "Mapping with &dch -f; &if -K %d -C %d %s:\n", nLutSize, nCutNum, fMinAve?"-t":"" );
+            printf( "Mapping with &dch -C 200; &if -K %d -C %d %s:\n", nLutSize, nCutNum, fMinAve?"-t":"" );
             Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
         }
         Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
@@ -496,10 +496,10 @@ void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, in
 void Gia_ManPerformFlow2( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fBalance, int fMinAve, int fUseMfs, int fVerbose )
 {
     char Comm1[100], Comm2[100], Comm3[100], Comm4[100];
-    sprintf( Comm1, "&synch2 -K %d; &if -m%s       -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum,   fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
-    sprintf( Comm2, "&dch -f;       &if -m%s       -K %d -C %d; %s &save",           fMinAve?"t":"", nLutSize, nCutNum+4, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
-    sprintf( Comm3, "&synch2 -K %d; &lf -m%s  -E 5 -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum,   fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
-    sprintf( Comm4, "&dch -f;       &lf -m%sk -E 5 -K %d -C %d; %s &save",           fMinAve?"t":"", nLutSize, nCutNum+4, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
+    sprintf( Comm1, "&synch2 -K %d -C 200; &if -m%s       -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum,   fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
+    sprintf( Comm2, "&dch -C 200;          &if -m%s       -K %d -C %d; %s &save",           fMinAve?"t":"", nLutSize, nCutNum+4, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
+    sprintf( Comm3, "&synch2 -K %d -C 200; &lf -m%s  -E 5 -K %d -C %d; %s &save", nLutSize, fMinAve?"t":"", nLutSize, nCutNum,   fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
+    sprintf( Comm4, "&dch -C 200;          &lf -m%sk -E 5 -K %d -C %d; %s &save",           fMinAve?"t":"", nLutSize, nCutNum+4, fUseMfs ? "&put; mfs2 -W 4 -M 500 -C 7000; &get -m;":"" );
 
     // perform synthesis
     if ( fVerbose )