diff options
| -rw-r--r-- | abc.rc | 1 | ||||
| -rw-r--r-- | src/aig/gia/giaJf.c | 2 | ||||
| -rw-r--r-- | src/base/abci/abc.c | 12 |
3 files changed, 11 insertions, 4 deletions
@@ -122,6 +122,7 @@ alias addinit "read_init; undc; strash; zero" alias blif2aig "undc; strash; zero" alias v2p "&vta_gla; &ps; &gla_derive; &put; w 1.aig; pdr -v" alias g2p "&ps; &gla_derive; &put; w 2.aig; pdr -v" +alias &fx_ "&put; sweep; sop; fx; st; &get" # resubstitution scripts for the IWLS paper alias src_rw "st; rw -l; rwz -l; rwz -l" diff --git a/src/aig/gia/giaJf.c b/src/aig/gia/giaJf.c index 4e66e7f1..209715de 100644 --- a/src/aig/gia/giaJf.c +++ b/src/aig/gia/giaJf.c @@ -32,7 +32,7 @@ ABC_NAMESPACE_IMPL_START /// DECLARATIONS /// //////////////////////////////////////////////////////////////////////// -#define JF_LEAF_MAX 6 +#define JF_LEAF_MAX 8 #define JF_CUT_MAX 16 typedef struct Jf_Cut_t_ Jf_Cut_t; diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 63b95a33..f1c63614 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -30074,16 +30074,22 @@ int Abc_CommandAbc9Jf( Abc_Frame_t * pAbc, int argc, char ** argv ) return 1; } - if ( pPars->fCutMin && !Sdm_ManCanRead() ) + if ( (pPars->fCutMin || pPars->fGenCnf) && pPars->nLutSize > 6 ) { - Abc_Print( -1, "Abc_CommandAbc9If2(): Cannot input DSD data from file.\n" ); + Abc_Print( -1, "Abc_CommandAbc9Jf(): Cut minimization works for LUT6 or less.\n" ); + return 1; + } + + if ( ((pPars->fCutMin && pPars->fFuncDsd) || pPars->fGenCnf) && !Sdm_ManCanRead() ) + { + Abc_Print( -1, "Abc_CommandAbc9Jf(): Cannot input DSD data from file.\n" ); return 1; } pNew = Jf_ManPerformMapping( pAbc->pGia, pPars ); if ( pNew == NULL ) { - Abc_Print( -1, "Abc_CommandAbc9If2(): Mapping into LUTs has failed.\n" ); + Abc_Print( -1, "Abc_CommandAbc9Jf(): Mapping into LUTs has failed.\n" ); return 1; } Abc_FrameUpdateGia( pAbc, pNew ); |