Adding switch to control area-recovery and more tuning in &nf.

4 files changed, 24 insertions, 10 deletions

diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h
index 9c86c3e0..ba1aa484 100644
--- a/src/aig/gia/gia.h
+++ b/src/aig/gia/gia.h
@@ -278,6 +278,7 @@ struct Jf_Par_t_
     int            nRelaxRatio;
     int            nCoarseLimit;
     int            nAreaTuner;
+    int            nReqTimeFlex;
     int            nVerbLimit;
     int            DelayTarget;
     int            fAreaOnly;
diff --git a/src/aig/gia/giaNf.c b/src/aig/gia/giaNf.c
index d02c51ef..856d5e3c 100644
--- a/src/aig/gia/giaNf.c
+++ b/src/aig/gia/giaNf.c
@@ -132,7 +132,7 @@ static inline int         Nf_ObjMapRefDec( Nf_Man_t * p, int i, int c )
 static inline float       Nf_ObjFlowRefs( Nf_Man_t * p, int i, int c )              { return Vec_FltEntry(&p->vFlowRefs, Abc_Var2Lit(i,c));            }
 static inline float       Nf_ObjRequired( Nf_Man_t * p, int i, int c )              { return Vec_FltEntry(&p->vRequired, Abc_Var2Lit(i,c));            }
 static inline void        Nf_ObjSetRequired(Nf_Man_t * p,int i, int c, float f)     { Vec_FltWriteEntry(&p->vRequired, Abc_Var2Lit(i,c), f);           }
-static inline void        Nf_ObjUpdateRequired(Nf_Man_t * p,int i, int c, float f)  { if (Nf_ObjRequired(p, i, c) > f + p->pPars->Epsilon) Nf_ObjSetRequired(p, i, c, f);  }
+static inline void        Nf_ObjUpdateRequired(Nf_Man_t * p,int i, int c, float f)  { if (Nf_ObjRequired(p, i, c) > f) Nf_ObjSetRequired(p, i, c, f);  }
 
 static inline Nf_Mat_t *  Nf_ObjMatchD( Nf_Man_t * p, int i, int c )                { return &Nf_ManObj(p, i)->M[c][0];                                }
 static inline Nf_Mat_t *  Nf_ObjMatchA( Nf_Man_t * p, int i, int c )                { return &Nf_ManObj(p, i)->M[c][1];                                }
@@ -1310,7 +1310,7 @@ static inline float Nf_CutRequired( Nf_Man_t * p, Nf_Mat_t * pM, int * pCutSet )
         if ( Req < NF_INFINITY )
             Required = Abc_MaxFloat( Required, Req + pCell->Delays[i] );
     }
-    return Abc_MaxFloat( Required + 2*p->InvDelay, Arrival ); 
+    return Abc_MaxFloat( Required + p->pPars->nReqTimeFlex*p->InvDelay, Arrival ); 
 }
 static inline void Nf_ObjComputeRequired( Nf_Man_t * p, int iObj )
 {
@@ -1851,6 +1851,7 @@ void Nf_ManSetDefaultPars( Jf_Par_t * pPars )
     pPars->nRelaxRatio  =  0;
     pPars->nCoarseLimit =  3;
     pPars->nAreaTuner   =  1;
+    pPars->nReqTimeFlex =  0;
     pPars->nVerbLimit   =  5;
     pPars->DelayTarget  = -1;
     pPars->fAreaOnly    =  0;
diff --git a/src/base/abc/abcUtil.c b/src/base/abc/abcUtil.c
index 158934d3..103821f5 100644
--- a/src/base/abc/abcUtil.c
+++ b/src/base/abc/abcUtil.c
@@ -1202,7 +1202,7 @@ int Abc_NtkLogicMakeSimpleCos( Abc_Ntk_t * pNtk, int fDuplicate )
         {
             pDriver = Abc_ObjFanin0(pNode);
             // duplicate if critical
-            if ( fDuplicate && Abc_ObjIsNode(pDriver) && Abc_ObjLevel(pDriver) == LevelMax )
+            if ( fDuplicate && Abc_ObjIsNode(pDriver) && (Abc_NtkHasMapping(pNtk) || Abc_ObjLevel(pDriver) == LevelMax) )
             {
                 pDriverNew = Abc_NtkDupObj( pNtk, pDriver, 0 ); 
                 Abc_ObjForEachFanin( pDriver, pFanin, k )
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index b371c911..148d8451 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -33549,7 +33549,7 @@ int Abc_CommandAbc9Nf( Abc_Frame_t * pAbc, int argc, char ** argv )
     Gia_Man_t * pNew; int c;
     Nf_ManSetDefaultPars( pPars );
     Extra_UtilGetoptReset();
-    while ( ( c = Extra_UtilGetopt( argc, argv, "KCFARLEDWapkvwh" ) ) != EOF )
+    while ( ( c = Extra_UtilGetopt( argc, argv, "KCFARLEDQWapkvwh" ) ) != EOF )
     {
         switch ( c )
         {
@@ -33606,7 +33606,7 @@ int Abc_CommandAbc9Nf( Abc_Frame_t * pAbc, int argc, char ** argv )
         case 'R':
             if ( globalUtilOptind >= argc )
             {
-                Abc_Print( 1, "Command line switch \"-R\" should be followed by a floating point number.\n" );
+                Abc_Print( 1, "Command line switch \"-R\" should be followed by an integer number.\n" );
                 return 0;
             }
             pPars->nRelaxRatio = atoi(argv[globalUtilOptind]);
@@ -33617,7 +33617,7 @@ int Abc_CommandAbc9Nf( Abc_Frame_t * pAbc, int argc, char ** argv )
         case 'L':
             if ( globalUtilOptind >= argc )
             {
-                Abc_Print( 1, "Command line switch \"-R\" should be followed by a floating point number.\n" );
+                Abc_Print( 1, "Command line switch \"-R\" should be followed by an integer number.\n" );
                 return 0;
             }
             pPars->nCoarseLimit = atoi(argv[globalUtilOptind]);
@@ -33628,7 +33628,7 @@ int Abc_CommandAbc9Nf( Abc_Frame_t * pAbc, int argc, char ** argv )
         case 'E':
             if ( globalUtilOptind >= argc )
             {
-                Abc_Print( 1, "Command line switch \"-E\" should be followed by a floating point number.\n" );
+                Abc_Print( 1, "Command line switch \"-E\" should be followed by an integer number.\n" );
                 return 0;
             }
             pPars->nAreaTuner = atoi(argv[globalUtilOptind]);
@@ -33639,12 +33639,23 @@ int Abc_CommandAbc9Nf( Abc_Frame_t * pAbc, int argc, char ** argv )
         case 'D':
             if ( globalUtilOptind >= argc )
             {
-                Abc_Print( -1, "Command line switch \"-D\" should be followed by a floating point number.\n" );
+                Abc_Print( -1, "Command line switch \"-D\" should be followed by an integer number.\n" );
                 goto usage;
             }
             pPars->DelayTarget = atoi(argv[globalUtilOptind]);
             globalUtilOptind++;
-            if ( pPars->DelayTarget <= 0.0 )
+            if ( pPars->DelayTarget <= 0 )
+                goto usage;
+            break;
+        case 'Q':
+            if ( globalUtilOptind >= argc )
+            {
+                Abc_Print( -1, "Command line switch \"-D\" should be followed by an integer number.\n" );
+                goto usage;
+            }
+            pPars->nReqTimeFlex = atoi(argv[globalUtilOptind]);
+            globalUtilOptind++;
+            if ( pPars->nReqTimeFlex < 0 )
                 goto usage;
             break;
         case 'W':
@@ -33705,7 +33716,7 @@ usage:
         sprintf(Buffer, "best possible" );
     else
         sprintf(Buffer, "%d", pPars->DelayTarget );
-    Abc_Print( -2, "usage: &nf [-KCFARLED num] [-akpvwh]\n" );
+    Abc_Print( -2, "usage: &nf [-KCFARLEDQ num] [-akpvwh]\n" );
     Abc_Print( -2, "\t           performs technology mapping of the network\n" );
     Abc_Print( -2, "\t-K num   : LUT size for the mapping (2 <= K <= %d) [default = %d]\n", pPars->nLutSizeMax, pPars->nLutSize );
     Abc_Print( -2, "\t-C num   : the max number of priority cuts (1 <= C <= %d) [default = %d]\n", pPars->nCutNumMax, pPars->nCutNum );
@@ -33715,6 +33726,7 @@ usage:
     Abc_Print( -2, "\t-L num   : the fanout limit for coarsening XOR/MUX (num >= 2) [default = %d]\n", pPars->nCoarseLimit );
     Abc_Print( -2, "\t-E num   : the area/edge tradeoff parameter (0 <= num <= 100) [default = %d]\n", pPars->nAreaTuner );
     Abc_Print( -2, "\t-D num   : sets the delay constraint for the mapping [default = %s]\n", Buffer );
+    Abc_Print( -2, "\t-Q num   : internal parameter impacting area of the mapping [default = %s]\n", Buffer );
     Abc_Print( -2, "\t-a       : toggles area-oriented mapping [default = %s]\n", pPars->fAreaOnly? "yes": "no" );
     Abc_Print( -2, "\t-k       : toggles coarsening the subject graph [default = %s]\n", pPars->fCoarsen? "yes": "no" );
     Abc_Print( -2, "\t-p       : toggles pin-permutation (useful when pin-delays differ) [default = %s]\n", pPars->fPinPerm? "yes": "no" );