Changing default values.

This commit is contained in:
Alan Mishchenko
2013-09-28 23:56:08 -07:00
parent 797cb49584
commit 2a83a97164
3 changed files with 11 additions and 4 deletions

1
abc.rc
View File

@@ -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"

View File

@@ -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;

View File

@@ -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 );