Commit b8bd21c8 by Alan Mishchenko

Improvements to ISOP.

parent 5cf92f32
......@@ -10802,6 +10802,10 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
Abc_FrameReplaceCurrentNetwork( pAbc, pNtkRes );
}
*/
{
extern void Abc_IsopTestNew();
Abc_IsopTestNew();
}
return 0;
usage:
Abc_Print( -2, "usage: test [-CKDNM] [-aovwh] <file_name>\n" );
......@@ -499,12 +499,13 @@ void Abc_TruthDecPerform( Abc_TtStore_t * p, int DecType, int fVerbose )
Vec_Str_t * vStr;
char * pSopStr;
vStr = Vec_StrAlloc( 10000 );
vCover = Vec_IntAlloc( 1 << 16 );
vCover = Vec_IntAlloc( 1 << 20 );
for ( i = 0; i < p->nFuncs; i++ )
{
// extern int Abc_IsopTest( word * pFunc, int nVars, Vec_Int_t * vCover );
// Abc_IsopTest( p->pFuncs[i], p->nVars, vCover );
// continue;
extern int Abc_IsopTest( word * pFunc, int nVars, Vec_Int_t * vCover );
if ( i == 0 ) printf( "\n" );
Abc_IsopTest( p->pFuncs[i], p->nVars, vCover );
continue;
if ( fVerbose )
printf( "%7d : ", i );
pSopStr = Kit_PlaFromTruthNew( (unsigned *)p->pFuncs[i], p->nVars, vCover, vStr );
......@@ -600,6 +601,7 @@ void Abc_TruthDecTest( char * pFileName, int DecType, int nVarNum, int fVerbose
// allocate data-structure
p = Abc_TtStoreLoad( pFileName, nVarNum );
if ( p == NULL ) return;
// consider functions from the file
Abc_TruthDecPerform( p, DecType, fVerbose );
......
......@@ -58,7 +58,7 @@ int Kit_TruthIsop( unsigned * puTruth, int nVars, Vec_Int_t * vMemory, int fTryB
Kit_Sop_t cRes2, * pcRes2 = &cRes2;
unsigned * pResult;
int RetValue = 0;
assert( nVars >= 0 && nVars < 16 );
assert( nVars >= 0 && nVars <= 16 );
// if nVars < 5, make sure it does not depend on those vars
// for ( i = nVars; i < 5; i++ )
// assert( !Kit_TruthVarInSupport(puTruth, 5, i) );
......
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