Commit 28f12c5f by Alan Mishchenko

Shrink for 6-LUTs.

parent 5ec77b66
...@@ -980,7 +980,7 @@ extern Gia_Man_t * Gia_ManSeqCleanup( Gia_Man_t * p ); ...@@ -980,7 +980,7 @@ extern Gia_Man_t * Gia_ManSeqCleanup( Gia_Man_t * p );
extern Gia_Man_t * Gia_ManSeqStructSweep( Gia_Man_t * p, int fConst, int fEquiv, int fVerbose ); extern Gia_Man_t * Gia_ManSeqStructSweep( Gia_Man_t * p, int fConst, int fEquiv, int fVerbose );
/*=== giaShrink.c ===========================================================*/ /*=== giaShrink.c ===========================================================*/
extern Gia_Man_t * Gia_ManPerformMapShrink( Gia_Man_t * p, int fKeepLevel, int fVerbose ); extern Gia_Man_t * Gia_ManPerformMapShrink( Gia_Man_t * p, int fKeepLevel, int fVerbose );
extern Gia_Man_t * Gia_ManMapShrink6( Gia_Man_t * p, int fKeepLevel, int fVerbose ); extern Gia_Man_t * Gia_ManMapShrink6( Gia_Man_t * p, int nFanoutMax, int fKeepLevel, int fVerbose );
/*=== giaSort.c ============================================================*/ /*=== giaSort.c ============================================================*/
extern int * Gia_SortFloats( float * pArray, int * pPerm, int nSize ); extern int * Gia_SortFloats( float * pArray, int * pPerm, int nSize );
/*=== giaSim.c ============================================================*/ /*=== giaSim.c ============================================================*/
......
...@@ -72,6 +72,7 @@ struct Shr_Man_t_ ...@@ -72,6 +72,7 @@ struct Shr_Man_t_
Rsb_Man_t * pManRsb; Rsb_Man_t * pManRsb;
Bdc_Man_t * pManDec; Bdc_Man_t * pManDec;
Bdc_Par_t Pars; Bdc_Par_t Pars;
// statistics
}; };
#define Shr_ObjForEachFanout( p, iNode, iFan ) \ #define Shr_ObjForEachFanout( p, iNode, iFan ) \
...@@ -206,7 +207,7 @@ static inline int Shr_ManDivPushOrderByLevel( Shr_Man_t * p, int iDiv ) ...@@ -206,7 +207,7 @@ static inline int Shr_ManDivPushOrderByLevel( Shr_Man_t * p, int iDiv )
int iPlace, * pArray; int iPlace, * pArray;
Vec_IntPush( p->vPrio, iDiv ); Vec_IntPush( p->vPrio, iDiv );
if ( Vec_IntSize(p->vPrio) == 1 ) if ( Vec_IntSize(p->vPrio) == 1 )
return 0; return 0;
pArray = Vec_IntArray(p->vPrio); pArray = Vec_IntArray(p->vPrio);
for ( iPlace = Vec_IntSize(p->vPrio) - 1; iPlace > 0; iPlace-- ) for ( iPlace = Vec_IntSize(p->vPrio) - 1; iPlace > 0; iPlace-- )
if ( Gia_ObjLevel(p->pNew, Gia_ManObj(p->pNew, pArray[iPlace-1])) > if ( Gia_ObjLevel(p->pNew, Gia_ManObj(p->pNew, pArray[iPlace-1])) >
...@@ -216,10 +217,10 @@ static inline int Shr_ManDivPushOrderByLevel( Shr_Man_t * p, int iDiv ) ...@@ -216,10 +217,10 @@ static inline int Shr_ManDivPushOrderByLevel( Shr_Man_t * p, int iDiv )
break; break;
return iPlace; // the place of the new divisor return iPlace; // the place of the new divisor
} }
static inline int Shr_ManCollectDivisors( Shr_Man_t * p, Vec_Int_t * vLeaves, int Limit ) static inline int Shr_ManCollectDivisors( Shr_Man_t * p, Vec_Int_t * vLeaves, int Limit, int nFanoutMax )
{ {
Gia_Obj_t * pFan; Gia_Obj_t * pFan;
int i, iDiv, iFan, iPlace; int i, c, iDiv, iFan, iPlace;
assert( Limit > 6 ); assert( Limit > 6 );
Vec_IntClear( p->vDivs ); Vec_IntClear( p->vDivs );
Vec_IntClear( p->vPrio ); Vec_IntClear( p->vPrio );
...@@ -232,9 +233,12 @@ static inline int Shr_ManCollectDivisors( Shr_Man_t * p, Vec_Int_t * vLeaves, in ...@@ -232,9 +233,12 @@ static inline int Shr_ManCollectDivisors( Shr_Man_t * p, Vec_Int_t * vLeaves, in
} }
Vec_IntForEachEntry( p->vPrio, iDiv, i ) Vec_IntForEachEntry( p->vPrio, iDiv, i )
{ {
c = 0;
assert( Gia_ObjIsTravIdCurrentId(p->pNew, iDiv) ); assert( Gia_ObjIsTravIdCurrentId(p->pNew, iDiv) );
Shr_ObjForEachFanout( p, iDiv, iFan ) Shr_ObjForEachFanout( p, iDiv, iFan )
{ {
if ( c++ == nFanoutMax )
break;
if ( Gia_ObjIsTravIdCurrentId(p->pNew, iFan) ) if ( Gia_ObjIsTravIdCurrentId(p->pNew, iFan) )
continue; continue;
pFan = Gia_ManObj( p->pNew, iFan ); pFan = Gia_ManObj( p->pNew, iFan );
...@@ -391,14 +395,15 @@ void Shr_ManComputeTruths( Gia_Man_t * p, int nVars, Vec_Int_t * vDivs, Vec_Wrd_ ...@@ -391,14 +395,15 @@ void Shr_ManComputeTruths( Gia_Man_t * p, int nVars, Vec_Int_t * vDivs, Vec_Wrd_
SeeAlso [] SeeAlso []
***********************************************************************/ ***********************************************************************/
Gia_Man_t * Gia_ManMapShrink6( Gia_Man_t * p, int fKeepLevel, int fVerbose ) Gia_Man_t * Gia_ManMapShrink6( Gia_Man_t * p, int nFanoutMax, int fKeepLevel, int fVerbose )
{ {
Shr_Man_t * pMan; Shr_Man_t * pMan;
Gia_Obj_t * pObj, * pFanin; Gia_Obj_t * pObj, * pFanin;
word uTruth, uTruth0, uTruth1; word uTruth, uTruth0, uTruth1;
int i, k, nDivs, iNode; int i, k, nDivs, iNode;
int RetValue, Counter1 = 0, Counter2 = 0; int RetValue, Counter1 = 0, Counter2 = 0;
clock_t clk = clock(); clock_t clk2, clk = clock();
clock_t timeFanout = 0;
assert( p->pMapping != NULL ); assert( p->pMapping != NULL );
pMan = Shr_ManAlloc( p ); pMan = Shr_ManAlloc( p );
Gia_ManFillValue( p ); Gia_ManFillValue( p );
...@@ -441,8 +446,10 @@ Gia_Man_t * Gia_ManMapShrink6( Gia_Man_t * p, int fKeepLevel, int fVerbose ) ...@@ -441,8 +446,10 @@ Gia_Man_t * Gia_ManMapShrink6( Gia_Man_t * p, int fKeepLevel, int fVerbose )
Vec_IntWriteEntry( pMan->vLeaves, k, Abc_Lit2Var(pFanin->Value) ); Vec_IntWriteEntry( pMan->vLeaves, k, Abc_Lit2Var(pFanin->Value) );
} }
// compute divisors // compute divisors
nDivs = Shr_ManCollectDivisors( pMan, pMan->vLeaves, pMan->nDivMax ); clk2 = clock();
nDivs = Shr_ManCollectDivisors( pMan, pMan->vLeaves, pMan->nDivMax, nFanoutMax );
assert( nDivs <= pMan->nDivMax ); assert( nDivs <= pMan->nDivMax );
timeFanout += clock() - clk2;
// compute truth tables // compute truth tables
Shr_ManComputeTruths( pMan->pNew, Vec_IntSize(pMan->vLeaves), pMan->vDivs, pMan->vDivTruths, pMan->vTruths ); Shr_ManComputeTruths( pMan->pNew, Vec_IntSize(pMan->vLeaves), pMan->vDivs, pMan->vDivTruths, pMan->vTruths );
// perform resubstitution // perform resubstitution
...@@ -468,6 +475,7 @@ Gia_Man_t * Gia_ManMapShrink6( Gia_Man_t * p, int fKeepLevel, int fVerbose ) ...@@ -468,6 +475,7 @@ Gia_Man_t * Gia_ManMapShrink6( Gia_Man_t * p, int fKeepLevel, int fVerbose )
printf( "Performed %d resubs and %d decomps. ", Counter1, Counter2 ); printf( "Performed %d resubs and %d decomps. ", Counter1, Counter2 );
printf( "Gain in AIG nodes = %d. ", Gia_ManObjNum(p)-Gia_ManObjNum(pMan->pNew) ); printf( "Gain in AIG nodes = %d. ", Gia_ManObjNum(p)-Gia_ManObjNum(pMan->pNew) );
ABC_PRT( "Runtime", clock() - clk ); ABC_PRT( "Runtime", clock() - clk );
ABC_PRT( "Divisors", timeFanout );
} }
return Shr_ManFree( pMan ); return Shr_ManFree( pMan );
} }
......
...@@ -26187,11 +26187,23 @@ int Abc_CommandAbc9Shrink( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -26187,11 +26187,23 @@ int Abc_CommandAbc9Shrink( Abc_Frame_t * pAbc, int argc, char ** argv )
int nLutSize; int nLutSize;
int c,fVerbose = 0; int c,fVerbose = 0;
int fKeepLevel = 0; int fKeepLevel = 0;
int nFanoutMax = 50;
Extra_UtilGetoptReset(); Extra_UtilGetoptReset();
while ( ( c = Extra_UtilGetopt( argc, argv, "lvh" ) ) != EOF ) while ( ( c = Extra_UtilGetopt( argc, argv, "Nlvh" ) ) != EOF )
{ {
switch ( c ) switch ( c )
{ {
case 'N':
if ( globalUtilOptind >= argc )
{
Abc_Print( -1, "Command line switch \"-N\" should be followed by a char string.\n" );
goto usage;
}
nFanoutMax = atoi(argv[globalUtilOptind]);
globalUtilOptind++;
if ( nFanoutMax < 0 )
goto usage;
break;
case 'l': case 'l':
fKeepLevel ^= 1; fKeepLevel ^= 1;
break; break;
...@@ -26218,7 +26230,7 @@ int Abc_CommandAbc9Shrink( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -26218,7 +26230,7 @@ int Abc_CommandAbc9Shrink( Abc_Frame_t * pAbc, int argc, char ** argv )
if ( nLutSize <= 4 ) if ( nLutSize <= 4 )
pTemp = Gia_ManPerformMapShrink( pAbc->pGia, fKeepLevel, fVerbose ); pTemp = Gia_ManPerformMapShrink( pAbc->pGia, fKeepLevel, fVerbose );
else if ( nLutSize <= 6 ) else if ( nLutSize <= 6 )
pTemp = Gia_ManMapShrink6( pAbc->pGia, fKeepLevel, fVerbose ); pTemp = Gia_ManMapShrink6( pAbc->pGia, nFanoutMax, fKeepLevel, fVerbose );
else else
Abc_Print( -1, "Abc_CommandAbc9Shrink(): Works only for 4-LUTs and 6-LUTs.\n" ); Abc_Print( -1, "Abc_CommandAbc9Shrink(): Works only for 4-LUTs and 6-LUTs.\n" );
if ( pTemp ) if ( pTemp )
...@@ -26226,8 +26238,9 @@ int Abc_CommandAbc9Shrink( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -26226,8 +26238,9 @@ int Abc_CommandAbc9Shrink( Abc_Frame_t * pAbc, int argc, char ** argv )
return 0; return 0;
usage: usage:
Abc_Print( -2, "usage: &shrink [-lvh]\n" ); Abc_Print( -2, "usage: &shrink [-N num] [-lvh]\n" );
Abc_Print( -2, "\t performs fast shrinking using current mapping\n" ); Abc_Print( -2, "\t performs fast shrinking using current mapping\n" );
Abc_Print( -2, "\t-N num : the max fanout count to skip a divisor [default = %d]\n", nFanoutMax );
Abc_Print( -2, "\t-l : toggle level update during shrinking [default = %s]\n", fKeepLevel? "yes": "no" ); Abc_Print( -2, "\t-l : toggle level update during shrinking [default = %s]\n", fKeepLevel? "yes": "no" );
Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", fVerbose? "yes": "no" ); Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", fVerbose? "yes": "no" );
Abc_Print( -2, "\t-h : print the command usage\n"); Abc_Print( -2, "\t-h : print the command usage\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment