diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/abci/abc.c | 16 | ||||
| -rw-r--r-- | src/map/if/if.h | 1 | ||||
| -rw-r--r-- | src/map/if/ifDec16.c | 8 |
3 files changed, 18 insertions, 7 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 675e9734..24af9806 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -15420,7 +15420,7 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv ) fLutMux = 0; Extra_UtilGetoptReset(); - while ( ( c = Extra_UtilGetopt( argc, argv, "KCFAGNDEWSqaflepmrsdbugyojiknvh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "KCFAGNDEWSTqaflepmrsdbugyojiknvh" ) ) != EOF ) { switch ( c ) { @@ -15539,6 +15539,17 @@ int Abc_CommandIf( Abc_Frame_t * pAbc, int argc, char ** argv ) goto usage; } break; + case 'T': + if ( globalUtilOptind >= argc ) + { + Abc_Print( -1, "Command line switch \"-T\" should be followed by a positive integer 0,1,or 2.\n" ); + goto usage; + } + pPars->nStructType = atoi(argv[globalUtilOptind]); + globalUtilOptind++; + if ( pPars->nStructType < 0 || pPars->nStructType > 2 ) + goto usage; + break; case 'q': pPars->fPreprocess ^= 1; break; @@ -15856,7 +15867,7 @@ usage: sprintf(LutSize, "library" ); else sprintf(LutSize, "%d", pPars->nLutSize ); - Abc_Print( -2, "usage: if [-KCFANG num] [-DEW float] [-S str] [-qarlepmsdbugyojikcnvh]\n" ); + Abc_Print( -2, "usage: if [-KCFANGT num] [-DEW float] [-S str] [-qarlepmsdbugyojikcnvh]\n" ); Abc_Print( -2, "\t performs FPGA technology mapping of the network\n" ); Abc_Print( -2, "\t-K num : the number of LUT inputs (2 < num < %d) [default = %s]\n", IF_MAX_LUTSIZE+1, LutSize ); Abc_Print( -2, "\t-C num : the max number of priority cuts (0 < num < 2^12) [default = %d]\n", pPars->nCutsMax ); @@ -15868,6 +15879,7 @@ usage: Abc_Print( -2, "\t-E float : sets epsilon used for tie-breaking [default = %f]\n", pPars->Epsilon ); Abc_Print( -2, "\t-W float : sets wire delay between adjects LUTs [default = %f]\n", pPars->WireDelay ); Abc_Print( -2, "\t-S str : string representing the LUT structure [default = %s]\n", pPars->pLutStruct ? pPars->pLutStruct : "not used" ); + Abc_Print( -2, "\t-T num : the type of LUT structures [default = any]\n", pPars->nStructType ); Abc_Print( -2, "\t-q : toggles preprocessing using several starting points [default = %s]\n", pPars->fPreprocess? "yes": "no" ); Abc_Print( -2, "\t-a : toggles area-oriented mapping [default = %s]\n", pPars->fArea? "yes": "no" ); // Abc_Print( -2, "\t-f : toggles one fancy feature [default = %s]\n", pPars->fFancy? "yes": "no" ); diff --git a/src/map/if/if.h b/src/map/if/if.h index aac141fd..c51fa940 100644 --- a/src/map/if/if.h +++ b/src/map/if/if.h @@ -103,6 +103,7 @@ struct If_Par_t_ float DelayTarget; // delay target float Epsilon; // value used in comparison floating point numbers int nRelaxRatio; // delay relaxation ratio + int nStructType; // type of the structure int fPreprocess; // preprossing int fArea; // area-oriented mapping int fFancy; // a fancy feature diff --git a/src/map/if/ifDec16.c b/src/map/if/ifDec16.c index aa73f445..de1d9ac4 100644 --- a/src/map/if/ifDec16.c +++ b/src/map/if/ifDec16.c @@ -24,8 +24,6 @@ ABC_NAMESPACE_IMPL_START -#define IF_USE_CASE3 0 // 0 allowed; 1 not allowed; 2 exclusive - //////////////////////////////////////////////////////////////////////// /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// @@ -2020,11 +2018,11 @@ If_Grp_t If_CluCheck3( If_Man_t * p, word * pTruth0, int nVars, int nLutLeaf, in } // the new variable is at the bottom - skip it (iVarStart = 1) - if ( IF_USE_CASE3 == 0 ) + if ( p->pPars->nStructType == 0 ) // allowed G2 = If_CluCheck( p, pLeftOver, R2.nVars, 0, 0, nLutLeaf2, nLutRoot, &R, &Func0, &Func2, NULL, 0 ); - else if ( IF_USE_CASE3 == 1 ) + else if ( p->pPars->nStructType == 1 ) // not allowed G2 = If_CluCheck( p, pLeftOver, R2.nVars, 1, 0, nLutLeaf2, nLutRoot, &R, &Func0, &Func2, NULL, 0 ); - else if ( IF_USE_CASE3 == 2 ) + else if ( p->pPars->nStructType == 2 ) // required G2 = If_CluCheck( p, pLeftOver, R2.nVars, 0, 1, nLutLeaf2, nLutRoot, &R, &Func0, &Func2, NULL, 0 ); else assert( 0 ); |