luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updating command 'majgen'.

This commit is contained in:
Alan Mishchenko 2018-07-04 22:17:28 -07:00
parent 76aa1d4fed
commit 8110199a5e
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/base/abci/abc.c
View File

@ -8757,10 +8757,10 @@ usage:
***********************************************************************/
int Abc_CommandMajGen( Abc_Frame_t * pAbc, int argc, char ** argv )
{
extern int Gem_Enumerate( int nVars, int fVerbose );
int c, nVars = 8, fVerbose = 0;
extern int Gem_Enumerate( int nVars, int fDump, int fVerbose );
int c, nVars = 8, fDump = 0, fVerbose = 0;
Extra_UtilGetoptReset();
while ( ( c = Extra_UtilGetopt( argc, argv, "Nvh" ) ) != EOF )
while ( ( c = Extra_UtilGetopt( argc, argv, "Ndvh" ) ) != EOF )
{
switch ( c )
{
@ -8775,6 +8775,9 @@ int Abc_CommandMajGen( Abc_Frame_t * pAbc, int argc, char ** argv )
if ( nVars < 0 )
goto usage;
break;
case 'd':
fDump ^= 1;
break;
case 'v':
fVerbose ^= 1;
break;
@ -8784,13 +8787,14 @@ int Abc_CommandMajGen( Abc_Frame_t * pAbc, int argc, char ** argv )
goto usage;
}
}
Gem_Enumerate( nVars, fVerbose );
Gem_Enumerate( nVars, fDump, fVerbose );
return 0;
usage:
Abc_Print( -2, "usage: majgen [-N <num>] [-vh]>\n" );
Abc_Print( -2, "usage: majgen [-N <num>] [-dvh]>\n" );
Abc_Print( -2, "\t generates networks for majority gates\n" );
Abc_Print( -2, "\t-N <num> : the maximum number of variables [default = %d]\n", nVars );
Abc_Print( -2, "\t-d : toggle dumping functions into a file [default = %s]\n", fVerbose ? "yes" : "no" );
Abc_Print( -2, "\t-v : toggle verbose printout [default = %s]\n", fVerbose ? "yes" : "no" );
Abc_Print( -2, "\t-h : print the command usage\n" );
return 1;

28
src/misc/extra/extraUtilMaj.c
View File

@ -91,7 +91,7 @@ Gem_Man_t * Gem_ManAlloc( int nVars, int fVerbose )
p = ABC_CALLOC( Gem_Man_t, 1 );
p->nVars = nVars;
p->nWords = Abc_TtWordNum( nVars );
p->nObjsAlloc = 1000000;
p->nObjsAlloc = 10000000;
p->nObjs = 2;
p->pObjs = ABC_CALLOC( Gem_Obj_t, p->nObjsAlloc );
p->pObjs[1].nVars = p->pObjs[1].Groups = 1; // buffer
@ -274,12 +274,13 @@ int Gem_FuncCheckMajority( Gem_Man_t * p, int f )
int Mask = Abc_Tt6Mask( nHalfVars );
printf( "Found symmetric %d-variable function: ", pObj->nVars );
Extra_PrintBinary2( stdout, (unsigned *)&Polar, pObj->nVars + 1 );
printf( "\n" );
printf( " " );
if ( (pObj->nVars & 1) && Polar == (Mask << nHalfVars) )
{
printf( "This function is majority-%d.\n", pObj->nVars );
printf( "This is majority-%d.\n", pObj->nVars );
return 0;
}
printf( "\n" );
}
return 0;
}
@ -341,26 +342,27 @@ int Gem_FuncReduce( Gem_Man_t * p, int f, int i, int j )
SeeAlso []
***********************************************************************/
int Gem_Enumerate( int nVars, int fVerbose )
int Gem_Enumerate( int nVars, int fDump, int fVerbose )
{
abctime clk = Abc_Clock();
Gem_Man_t * p = Gem_ManAlloc( nVars, fVerbose );
int v, f, i, j;
int v, f, i, j, nObjsStop = 1;
for ( v = 1; v <= nVars-2; v++ )
{
// expand functions by adding a gate
int nObjStop = p->nObjs;
printf( "Expanding %d (functions = %10d) ", v, p->nObjs );
int nObjsStopPrev = nObjsStop;
nObjsStop = p->nObjs;
printf( "Expanding var %2d (functions = %10d) ", v, p->nObjs );
Abc_PrintTime( 0, "Time", Abc_Clock() - clk );
for ( f = 0; f < nObjStop; f++ )
if ( v == (int)p->pObjs[f].nVars )
for ( f = 0; f < nObjsStop; f++ )
if ( v == (int)p->pObjs[f].nVars || (v > (int)p->pObjs[f].nVars && f >= nObjsStopPrev) )
for ( i = 0; i < v; i++ )
if ( (int)p->pObjs[f].Groups & (1 << i) )
Gem_FuncExpand( p, f, i );
// reduce functions by adding a crossbar
printf( "Connecting %d (functions = %10d) ", v, p->nObjs );
printf( "Connecting var %2d (functions = %10d) ", v, p->nObjs );
Abc_PrintTime( 0, "Time", Abc_Clock() - clk );
for ( f = nObjStop; f < p->nObjs; f++ )
for ( f = nObjsStop; f < p->nObjs; f++ )
for ( i = 0; i < (int)p->pObjs[f].nVars; i++ )
if ( (int)p->pObjs[f].Groups & (1 << i) )
for ( j = i+1; j < (int)p->pObjs[f].nVars; j++ )
@ -368,9 +370,9 @@ int Gem_Enumerate( int nVars, int fVerbose )
if ( Gem_FuncReduce( p, f, i, j ) )
return Gem_ManFree( p );
}
printf( "Finished %d (functions = %10d) ", v, p->nObjs );
printf( "Finished (functions = %10d) ", v, p->nObjs );
Abc_PrintTime( 0, "Time", Abc_Clock() - clk );
Vec_MemDumpTruthTables( p->vTtMem, "enum", nVars );
if ( fDump ) Vec_MemDumpTruthTables( p->vTtMem, "enum", nVars );
Gem_ManFree( p );
return 0;
}