diff options
author | Alan Mishchenko <alanmi@berkeley.edu> | 2011-10-01 17:00:59 +0700 |
---|---|---|
committer | Alan Mishchenko <alanmi@berkeley.edu> | 2011-10-01 17:00:59 +0700 |
commit | e6e6a3cf9ecfccf71cba45273ea866e7e2526f0a (patch) | |
tree | 624cbbdca94773dced12e3689362d13358ae62f9 /src/base | |
parent | ff4c674dd7afd2c8f3fa3e52aca8c1e65829315d (diff) | |
download | abc-e6e6a3cf9ecfccf71cba45273ea866e7e2526f0a.tar.gz abc-e6e6a3cf9ecfccf71cba45273ea866e7e2526f0a.tar.bz2 abc-e6e6a3cf9ecfccf71cba45273ea866e7e2526f0a.zip |
Changes to the matching procedure.
Diffstat (limited to 'src/base')
-rw-r--r-- | src/base/abci/abc.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 2f3e2d04..d692e5d8 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -903,8 +903,8 @@ void Abc_Init( Abc_Frame_t * pAbc ) } */ { -// extern void If_CluTest(); -// If_CluTest(); + extern void If_CluTest(); + If_CluTest(); } } @@ -13252,7 +13252,7 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv ) pPars->fCutMin = 1; } - if ( pPars->fEnableCheck07 + pPars->fEnableCheck08 + pPars->fEnableCheck10 > 1 ) + if ( pPars->fEnableCheck07 + pPars->fEnableCheck08 + pPars->fEnableCheck10 + (pPars->pLutStruct != NULL) > 1 ) { Abc_Print( -1, "Only one additional check can be performed at the same time.\n" ); return 1; @@ -13287,6 +13287,16 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv ) pPars->pFuncCell = If_CutPerformCheck10; pPars->fCutMin = 1; } + if ( pPars->pLutStruct ) + { + if ( pPars->nLutSize < 6 || pPars->nLutSize > 11 ) + { + Abc_Print( -1, "This feature only works for {6,7,8,9,10,11}-LUTs.\n" ); + return 1; + } + pPars->pFuncCell = If_CutPerformCheck16; + pPars->fCutMin = 1; + } // enable truth table computation if cut minimization is selected if ( pPars->fCutMin ) @@ -13303,7 +13313,7 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv ) pPars->fUsePerm = 1; pPars->pLutLib = NULL; } - +/* // modify for LUT structures if ( pPars->pLutStruct ) { @@ -13317,7 +13327,7 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv ) pPars->fUsePerm = 1; pPars->pLutLib = NULL; } - +*/ // complain if truth tables are requested but the cut size is too large if ( pPars->fTruth && pPars->nLutSize > IF_MAX_FUNC_LUTSIZE ) { |