Merge remote-tracking branch 'upstream/master' into yosys-experimental

5 files changed, 73 insertions, 5 deletions

diff --git a/src/map/if/if.h b/src/map/if/if.h
index aa9608c9..13fa4108 100644
--- a/src/map/if/if.h
+++ b/src/map/if/if.h
@@ -275,6 +275,8 @@ struct If_Man_t_
     void *             pUserMan;
     Vec_Int_t *        vDump;
     int                pDumpIns[16];
+    Vec_Str_t *        vMarks;
+    Vec_Int_t *        vVisited2;
 
     // timing manager
     Tim_Man_t *        pManTim;
@@ -564,7 +566,7 @@ extern If_DsdMan_t *   If_DsdManAlloc( int nVars, int nLutSize );
 extern void            If_DsdManAllocIsops( If_DsdMan_t * p, int nLutSize );
 extern void            If_DsdManPrint( If_DsdMan_t * p, char * pFileName, int Number, int Support, int fOccurs, int fTtDump, int fVerbose );
 extern void            If_DsdManTune( If_DsdMan_t * p, int LutSize, int fFast, int fAdd, int fSpec, int fVerbose );
-extern void            Id_DsdManTuneStr( If_DsdMan_t * p, char * pStruct, int nConfls, int nProcs, int fVerbose );
+extern void            Id_DsdManTuneStr( If_DsdMan_t * p, char * pStruct, int nConfls, int nProcs, int nInputs, int fVerbose );
 extern void            If_DsdManFree( If_DsdMan_t * p, int fVerbose );
 extern void            If_DsdManSave( If_DsdMan_t * p, char * pFileName );
 extern If_DsdMan_t *   If_DsdManLoad( char * pFileName );
diff --git a/src/map/if/ifCore.c b/src/map/if/ifCore.c
index 0c9287a1..c03061af 100644
--- a/src/map/if/ifCore.c
+++ b/src/map/if/ifCore.c
@@ -106,6 +106,8 @@ int If_ManPerformMappingComb( If_Man_t * p )
     If_Obj_t * pObj;
     abctime clkTotal = Abc_Clock();
     int i;
+    //p->vVisited2 = Vec_IntAlloc( 100 );
+    //p->vMarks = Vec_StrStart( If_ManObjNum(p) );
 
     // set arrival times and fanout estimates
     If_ManForEachCi( p, pObj, i )
diff --git a/src/map/if/ifCut.c b/src/map/if/ifCut.c
index 2d6889c0..079781e0 100644
--- a/src/map/if/ifCut.c
+++ b/src/map/if/ifCut.c
@@ -1494,6 +1494,68 @@ int If_CutCountTotalFanins( If_Man_t * p )
     return 1;
 }
 
+/**Function*************************************************************
+
+  Synopsis    []
+
+  Description []
+               
+  SideEffects []
+
+  SeeAlso     []
+
+***********************************************************************/
+int If_CutFilter2_rec( If_Man_t * p, If_Obj_t * pObj, int LevelMin )
+{
+    char * pVisited = Vec_StrEntryP(p->vMarks, pObj->Id);
+    if ( *pVisited )
+        return *pVisited;
+    Vec_IntPush( p->vVisited2, pObj->Id );
+    if ( (int)pObj->Level <= LevelMin )
+        return (*pVisited = 1);
+    if ( If_CutFilter2_rec( p, pObj->pFanin0, LevelMin ) == 1 )
+        return (*pVisited = 1);
+    if ( If_CutFilter2_rec( p, pObj->pFanin1, LevelMin ) == 1 )
+        return (*pVisited = 1);
+    return (*pVisited = 2);
+}
+int If_CutFilter2( If_Man_t * p, If_Obj_t * pNode, If_Cut_t * pCut )
+{
+    If_Obj_t * pLeaf, * pTemp;  int i, Count = 0; 
+//    printf( "Considering node %d and cut {", pNode->Id );
+//    If_CutForEachLeaf( p, pCut, pLeaf, i )
+//        printf( " %d", pLeaf->Id );
+//    printf( " }\n" );
+    If_CutForEachLeaf( p, pCut, pLeaf, i )
+    {
+        int k, iObj, RetValue, nLevelMin = ABC_INFINITY;
+        Vec_IntClear( p->vVisited2 );
+        If_CutForEachLeaf( p, pCut, pTemp, k )
+        {
+            if ( pTemp == pLeaf )
+                continue;
+            nLevelMin = Abc_MinInt( nLevelMin, (int)pTemp->Level );
+            assert( Vec_StrEntry(p->vMarks, pTemp->Id) == 0 );
+            Vec_StrWriteEntry( p->vMarks, pTemp->Id, 2 );
+            Vec_IntPush( p->vVisited2, pTemp->Id );
+        }
+        RetValue = If_CutFilter2_rec( p, pLeaf, nLevelMin );
+        Vec_IntForEachEntry( p->vVisited2, iObj, k )
+            Vec_StrWriteEntry( p->vMarks, iObj, 0 );
+        if ( RetValue == 2 )
+        {
+            Count++;
+            pCut->nLeaves--;
+            for ( k = i; k < (int)pCut->nLeaves; k++ )
+                pCut->pLeaves[k] = pCut->pLeaves[k+1];
+            i--;
+        }
+    }
+    //if ( Count )
+    //    printf( "%d", Count );
+    return 0;
+}
+
 ////////////////////////////////////////////////////////////////////////
 ///                       END OF FILE                                ///
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/map/if/ifDsd.c b/src/map/if/ifDsd.c
index ddfc1036..d33c42d6 100644
--- a/src/map/if/ifDsd.c
+++ b/src/map/if/ifDsd.c
@@ -2554,7 +2554,7 @@ void Id_DsdManTuneStr1( If_DsdMan_t * p, char * pStruct, int nConfls, int fVerbo
 
 ***********************************************************************/
 #ifndef ABC_USE_PTHREADS
-void Id_DsdManTuneStr( If_DsdMan_t * p, char * pStruct, int nConfls, int nProcs, int fVerbose )
+void Id_DsdManTuneStr( If_DsdMan_t * p, char * pStruct, int nConfls, int nProcs, int nInputs, int fVerbose )
 {
     Id_DsdManTuneStr1( p, pStruct, nConfls, fVerbose );
 }
@@ -2600,7 +2600,7 @@ void * Ifn_WorkerThread( void * pArg )
     assert( 0 );
     return NULL;
 }
-void Id_DsdManTuneStr( If_DsdMan_t * p, char * pStruct, int nConfls, int nProcs, int fVerbose )
+void Id_DsdManTuneStr( If_DsdMan_t * p, char * pStruct, int nConfls, int nProcs, int nInputs, int fVerbose )
 {
     int fVeryVerbose = 0;
     ProgressBar * pProgress = NULL;
@@ -2703,8 +2703,8 @@ void Id_DsdManTuneStr( If_DsdMan_t * p, char * pStruct, int nConfls, int nProcs,
                         Extra_ProgressBarUpdate( pProgress, k, NULL );
                     pObj  = If_DsdVecObj( &p->vObjs, k );
                     nVars = If_DsdObjSuppSize(pObj);
-                    //if ( nVars <= LutSize )
-                    //    continue;
+                    if ( nInputs && nVars < nInputs )
+                        continue;
                     clk = Abc_Clock();
                     If_DsdManComputeTruthPtr( p, Abc_Var2Lit(k, 0), NULL, ThData[i].pTruth );
                     clkUsed += Abc_Clock() - clk;
diff --git a/src/map/if/ifMan.c b/src/map/if/ifMan.c
index 4027b780..6ecd0eb8 100644
--- a/src/map/if/ifMan.c
+++ b/src/map/if/ifMan.c
@@ -273,6 +273,8 @@ void If_ManStop( If_Man_t * p )
     Vec_IntFreeP( &p->vPairRes );
     Vec_StrFreeP( &p->vPairPerms );
     Vec_PtrFreeP( &p->vVisited );
+    Vec_StrFreeP( &p->vMarks );
+    Vec_IntFreeP( &p->vVisited2 );
     if ( p->vPairHash )
         Hash_IntManStop( p->vPairHash );
     for ( i = 6; i <= Abc_MaxInt(6,p->pPars->nLutSize); i++ )