diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-03-13 11:47:17 +0100 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-03-13 11:47:17 +0100 |
| commit | bf795e57cf427d74d002d7cc80c4000447f5543c (patch) | |
| tree | 91fc5d560ff61b0537a69a1f08bc71763bfcaba8 /src/base/abci/abc.c | |
| parent | ec2973947cfe8165fdbbdaeeb011e3245cd683f8 (diff) | |
| download | abc-bf795e57cf427d74d002d7cc80c4000447f5543c.tar.gz abc-bf795e57cf427d74d002d7cc80c4000447f5543c.tar.bz2 abc-bf795e57cf427d74d002d7cc80c4000447f5543c.zip | |
Handling special case in 'fold' when the network is combinational.
Diffstat (limited to 'src/base/abci/abc.c')
| -rw-r--r-- | src/base/abci/abc.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 79f92b08..3a6c8b1b 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -21967,11 +21967,6 @@ int Abc_CommandConstr( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Empty network.\n" ); return 1; } - if ( Abc_NtkIsComb(pNtk) ) - { - Abc_Print( -1, "The network is combinational.\n" ); - return 0; - } if ( !Abc_NtkIsStrash(pNtk) ) { Abc_Print( -1, "Currently only works for structurally hashed circuits.\n" ); @@ -22007,6 +22002,8 @@ int Abc_CommandConstr( Abc_Frame_t * pAbc, int argc, char ** argv ) // consider the case of manual constraint definition if ( nConstrs > 0 ) { + if ( Abc_NtkIsComb(pNtk) ) + Abc_Print( -1, "The network is combinational.\n" ); if ( Abc_NtkConstrNum(pNtk) > 0 ) { Abc_Print( -1, "The network already has constraints.\n" ); @@ -22021,6 +22018,11 @@ int Abc_CommandConstr( Abc_Frame_t * pAbc, int argc, char ** argv ) pNtk->nConstrs = nConstrs; return 0; } + if ( Abc_NtkIsComb(pNtk) ) + { + Abc_Print( -1, "The network is combinational.\n" ); + return 0; + } // detect constraints using functional/structural methods Abc_NtkDarConstr( pNtk, nFrames, nConfs, nProps, fStruct, fOldAlgo, fVerbose ); return 0; @@ -22217,11 +22219,6 @@ int Abc_CommandFold( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "Empty network.\n" ); return 1; } - if ( Abc_NtkIsComb(pNtk) ) - { - Abc_Print( -1, "The network is combinational.\n" ); - return 0; - } if ( !Abc_NtkIsStrash(pNtk) ) { Abc_Print( -1, "Currently only works for structurally hashed circuits.\n" ); @@ -22232,6 +22229,8 @@ int Abc_CommandFold( Abc_Frame_t * pAbc, int argc, char ** argv ) Abc_Print( -1, "The network has no constraints.\n" ); return 0; } + if ( Abc_NtkIsComb(pNtk) ) + Abc_Print( 0, "The network is combinational.\n" ); // modify the current network pNtkRes = Abc_NtkDarFold( pNtk, fCompl, fVerbose ); if ( pNtkRes == NULL ) |