diff options
author | Mathias Soeken <mathias.soeken@gmail.com> | 2016-08-21 18:12:05 +0200 |
---|---|---|
committer | Mathias Soeken <mathias.soeken@gmail.com> | 2016-08-21 18:12:05 +0200 |
commit | 9bb5a2dd0dff44f3d5376fd57613ca932aeb7253 (patch) | |
tree | d51c47a1c5882101e014060799e2e3e943ebfb68 /src/base/abci/abc.c | |
parent | 821029038d7dacf754f50c57954896755f8ac436 (diff) | |
parent | 6ec77b5d95d603d8bce5863248f82465afb78e93 (diff) | |
download | abc-9bb5a2dd0dff44f3d5376fd57613ca932aeb7253.tar.gz abc-9bb5a2dd0dff44f3d5376fd57613ca932aeb7253.tar.bz2 abc-9bb5a2dd0dff44f3d5376fd57613ca932aeb7253.zip |
Merged alanmi/abc into default
Diffstat (limited to 'src/base/abci/abc.c')
-rw-r--r-- | src/base/abci/abc.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 4e374e88..9e45a7da 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -40439,13 +40439,13 @@ usage: ***********************************************************************/ int Abc_CommandAbc9Exorcism( Abc_Frame_t * pAbc, int argc, char ** argv ) { - extern int Abc_ExorcismMain( Vec_Wec_t * vEsop, int nIns, int nOuts, char * pFileNameOut, int Quality, int Verbosity, int fUseQCost ); + extern int Abc_ExorcismMain( Vec_Wec_t * vEsop, int nIns, int nOuts, char * pFileNameOut, int Quality, int Verbosity, int nCubesMax, int fUseQCost ); extern Gia_Man_t * Eso_ManCompute( Gia_Man_t * pGia, int fVerbose, Vec_Wec_t ** pvRes ); Vec_Wec_t * vEsop = NULL; char * pFileNameOut = NULL; - int c, Quality = 2, Verbosity = 0, fUseQCost = 0, fVerbose = 0; + int c, Quality = 2, Verbosity = 0, nCubesMax = 20000, fUseQCost = 0, fVerbose = 0; Extra_UtilGetoptReset(); - while ( ( c = Extra_UtilGetopt( argc, argv, "QVqvh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "QVCqvh" ) ) != EOF ) { switch ( c ) { @@ -40471,6 +40471,17 @@ int Abc_CommandAbc9Exorcism( Abc_Frame_t * pAbc, int argc, char ** argv ) if ( Verbosity < 0 ) goto usage; break; + case 'C': + if ( globalUtilOptind >= argc ) + { + Abc_Print( -1, "Command line switch \"-C\" should be followed by an integer.\n" ); + goto usage; + } + nCubesMax = atoi(argv[globalUtilOptind]); + globalUtilOptind++; + if ( nCubesMax < 0 ) + goto usage; + break; case 'q': fUseQCost ^= 1; break; @@ -40493,18 +40504,19 @@ int Abc_CommandAbc9Exorcism( Abc_Frame_t * pAbc, int argc, char ** argv ) pFileNameOut = argv[globalUtilOptind]; // generate starting cover and run minimization Eso_ManCompute( pAbc->pGia, fVerbose, &vEsop ); - Abc_ExorcismMain( vEsop, Gia_ManCiNum(pAbc->pGia), Gia_ManCoNum(pAbc->pGia), pFileNameOut, Quality, Verbosity, fUseQCost ); + Abc_ExorcismMain( vEsop, Gia_ManCiNum(pAbc->pGia), Gia_ManCoNum(pAbc->pGia), pFileNameOut, Quality, Verbosity, nCubesMax, fUseQCost ); Vec_WecFree( vEsop ); return 0; usage: - Abc_Print( -2, "usage: &exorcism [-Q N] [-V N] <file>\n" ); + Abc_Print( -2, "usage: &exorcism [-Q N] [-V N] [-C N] -q <file>\n" ); Abc_Print( -2, " performs heuristic exclusive sum-of-project minimization\n" ); Abc_Print( -2, " -Q N : minimization quality [default = %d]\n", Quality); Abc_Print( -2, " increasing this number improves quality and adds to runtime\n"); Abc_Print( -2, " -V N : verbosity level [default = %d]\n", Verbosity); Abc_Print( -2, " 0 = no output; 1 = outline; 2 = verbose\n"); -// Abc_Print( -2, " -q : toggle using quantum cost [default = %s]\n", fUseQCost? "yes": "no" ); + Abc_Print( -2, " -C N : maximum number of cubes in startign cover [default = %d]\n", nCubesMax ); + Abc_Print( -2, " -q : toggle using quantum cost [default = %s]\n", fUseQCost? "yes": "no" ); Abc_Print( -2, " <file>: the output file name in ESOP-PLA format\n"); Abc_Print( -2, "\n" ); return 1; |