diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2018-09-11 21:27:33 +0300 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2018-09-11 21:27:33 +0300 |
| commit | 1b82a3871828acac6635c9c5767f50397cb704c1 (patch) | |
| tree | 4ebfd28819e7090ca3f51a333ce6f1288e083612 /src/base/abci | |
| parent | 1e35ed8798499dcdf9c29529154aabff918fe43b (diff) | |
| download | abc-1b82a3871828acac6635c9c5767f50397cb704c1.tar.gz abc-1b82a3871828acac6635c9c5767f50397cb704c1.tar.bz2 abc-1b82a3871828acac6635c9c5767f50397cb704c1.zip | |
Expriments with functions (supporting symmetries).
Diffstat (limited to 'src/base/abci')
| -rw-r--r-- | src/base/abci/abc.c | 14 | ||||
| -rw-r--r-- | src/base/abci/abcNpn.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index ff270d8a..b6e00e86 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -23012,10 +23012,10 @@ usage: ***********************************************************************/ int Abc_CommandFunEnum( Abc_Frame_t * pAbc, int argc, char ** argv ) { - extern void Dau_FunctionEnum( int nInputs, int nVars, int nNodeMax, int fUseTwo, int fVerbose ); - int c, nInputs = 4, nVars = 4, nNodeMax = 32, fUseTwo = 0, fVerbose = 0; + extern void Dau_FunctionEnum( int nInputs, int nVars, int nNodeMax, int fUseTwo, int fReduce, int fVerbose ); + int c, nInputs = 4, nVars = 4, nNodeMax = 32, fUseTwo = 0, fReduce = 0, fVerbose = 0; Extra_UtilGetoptReset(); - while ( ( c = Extra_UtilGetopt( argc, argv, "SIMtvh" ) ) != EOF ) + while ( ( c = Extra_UtilGetopt( argc, argv, "SIMtrvh" ) ) != EOF ) { switch ( c ) { @@ -23055,6 +23055,9 @@ int Abc_CommandFunEnum( Abc_Frame_t * pAbc, int argc, char ** argv ) case 't': fUseTwo ^= 1; break; + case 'r': + fReduce ^= 1; + break; case 'v': fVerbose ^= 1; break; @@ -23076,16 +23079,17 @@ int Abc_CommandFunEnum( Abc_Frame_t * pAbc, int argc, char ** argv ) goto usage; } - Dau_FunctionEnum( nInputs, nVars, nNodeMax, fUseTwo, fVerbose ); + Dau_FunctionEnum( nInputs, nVars, nNodeMax, fUseTwo, fReduce, fVerbose ); return 0; usage: - Abc_Print( -2, "usage: funenum [-SIM num] [-tvh]\n" ); + Abc_Print( -2, "usage: funenum [-SIM num] [-trvh]\n" ); Abc_Print( -2, "\t enumerates minimum 2-input-gate implementations\n" ); Abc_Print( -2, "\t-S num : the maximum intermediate support size [default = %d]\n", nInputs ); Abc_Print( -2, "\t-I num : the number of inputs of Boolean functions [default = %d]\n", nVars ); Abc_Print( -2, "\t-M num : the maximum number of 2-input gates [default = %d]\n", nNodeMax ); Abc_Print( -2, "\t-t : toggle adding combination of two gates [default = %s]\n", fUseTwo? "yes": "no" ); + Abc_Print( -2, "\t-r : toggle reducing the last level [default = %s]\n", fReduce? "yes": "no" ); Abc_Print( -2, "\t-v : toggle verbose output [default = %s]\n", fVerbose? "yes": "no" ); Abc_Print( -2, "\t-h : print the command usage\n"); return 1; diff --git a/src/base/abci/abcNpn.c b/src/base/abci/abcNpn.c index 8fe35ca8..744b6443 100644 --- a/src/base/abci/abcNpn.c +++ b/src/base/abci/abcNpn.c @@ -314,8 +314,6 @@ void Abc_TruthNpnPerform( Abc_TtStore_t * p, int NpnType, int fVerbose ) typedef unsigned(*TtCanonicizeFunc)(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag); unsigned Abc_TtCanonicizeWrap(TtCanonicizeFunc func, Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int flag); unsigned Abc_TtCanonicizeAda(Abc_TtHieMan_t * p, word * pTruth, int nVars, char * pCanonPerm, int iThres); - Abc_TtHieMan_t * Abc_TtHieManStart(int nVars, int nLevels); - void Abc_TtHieManStop(Abc_TtHieMan_t * p); int fHigh = 1, iEnumThres = 25; Abc_TtHieMan_t * pMan = Abc_TtHieManStart(p->nVars, 5); |