Commit 2a83a971 by Alan Mishchenko

Changing default values.

parent 797cb495
...@@ -122,6 +122,7 @@ alias addinit "read_init; undc; strash; zero" ...@@ -122,6 +122,7 @@ alias addinit "read_init; undc; strash; zero"
alias blif2aig "undc; strash; zero" alias blif2aig "undc; strash; zero"
alias v2p "&vta_gla; &ps; &gla_derive; &put; w 1.aig; pdr -v" 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 g2p "&ps; &gla_derive; &put; w 2.aig; pdr -v"
alias &fx_ "&put; sweep; sop; fx; st; &get"
# resubstitution scripts for the IWLS paper # resubstitution scripts for the IWLS paper
alias src_rw "st; rw -l; rwz -l; rwz -l" alias src_rw "st; rw -l; rwz -l; rwz -l"
......
...@@ -32,7 +32,7 @@ ABC_NAMESPACE_IMPL_START ...@@ -32,7 +32,7 @@ ABC_NAMESPACE_IMPL_START
/// DECLARATIONS /// /// DECLARATIONS ///
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
#define JF_LEAF_MAX 6 #define JF_LEAF_MAX 8
#define JF_CUT_MAX 16 #define JF_CUT_MAX 16
typedef struct Jf_Cut_t_ Jf_Cut_t; typedef struct Jf_Cut_t_ Jf_Cut_t;
......
...@@ -30074,16 +30074,22 @@ int Abc_CommandAbc9Jf( Abc_Frame_t * pAbc, int argc, char ** argv ) ...@@ -30074,16 +30074,22 @@ int Abc_CommandAbc9Jf( Abc_Frame_t * pAbc, int argc, char ** argv )
return 1; 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; return 1;
} }
pNew = Jf_ManPerformMapping( pAbc->pGia, pPars ); pNew = Jf_ManPerformMapping( pAbc->pGia, pPars );
if ( pNew == NULL ) 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; return 1;
} }
Abc_FrameUpdateGia( pAbc, pNew ); Abc_FrameUpdateGia( pAbc, pNew );
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment