mirror of https://github.com/YosysHQ/abc.git
Improvements to ISOP.
This commit is contained in:
parent
5cf92f32a5
commit
b8bd21c82d
|
|
@ -10802,6 +10802,10 @@ int Abc_CommandTest( Abc_Frame_t * pAbc, int argc, char ** argv )
|
||||||
Abc_FrameReplaceCurrentNetwork( pAbc, pNtkRes );
|
Abc_FrameReplaceCurrentNetwork( pAbc, pNtkRes );
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
{
|
||||||
|
extern void Abc_IsopTestNew();
|
||||||
|
Abc_IsopTestNew();
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
usage:
|
usage:
|
||||||
Abc_Print( -2, "usage: test [-CKDNM] [-aovwh] <file_name>\n" );
|
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;
|
Vec_Str_t * vStr;
|
||||||
char * pSopStr;
|
char * pSopStr;
|
||||||
vStr = Vec_StrAlloc( 10000 );
|
vStr = Vec_StrAlloc( 10000 );
|
||||||
vCover = Vec_IntAlloc( 1 << 16 );
|
vCover = Vec_IntAlloc( 1 << 20 );
|
||||||
for ( i = 0; i < p->nFuncs; i++ )
|
for ( i = 0; i < p->nFuncs; i++ )
|
||||||
{
|
{
|
||||||
// extern int Abc_IsopTest( word * pFunc, int nVars, Vec_Int_t * vCover );
|
extern int Abc_IsopTest( word * pFunc, int nVars, Vec_Int_t * vCover );
|
||||||
// Abc_IsopTest( p->pFuncs[i], p->nVars, vCover );
|
if ( i == 0 ) printf( "\n" );
|
||||||
// continue;
|
Abc_IsopTest( p->pFuncs[i], p->nVars, vCover );
|
||||||
|
continue;
|
||||||
if ( fVerbose )
|
if ( fVerbose )
|
||||||
printf( "%7d : ", i );
|
printf( "%7d : ", i );
|
||||||
pSopStr = Kit_PlaFromTruthNew( (unsigned *)p->pFuncs[i], p->nVars, vCover, vStr );
|
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
|
// allocate data-structure
|
||||||
p = Abc_TtStoreLoad( pFileName, nVarNum );
|
p = Abc_TtStoreLoad( pFileName, nVarNum );
|
||||||
|
if ( p == NULL ) return;
|
||||||
|
|
||||||
// consider functions from the file
|
// consider functions from the file
|
||||||
Abc_TruthDecPerform( p, DecType, fVerbose );
|
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;
|
Kit_Sop_t cRes2, * pcRes2 = &cRes2;
|
||||||
unsigned * pResult;
|
unsigned * pResult;
|
||||||
int RetValue = 0;
|
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
|
// if nVars < 5, make sure it does not depend on those vars
|
||||||
// for ( i = nVars; i < 5; i++ )
|
// for ( i = nVars; i < 5; i++ )
|
||||||
// assert( !Kit_TruthVarInSupport(puTruth, 5, i) );
|
// assert( !Kit_TruthVarInSupport(puTruth, 5, i) );
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue