Skip to content

A
abc
Commit e033a622 by Alan Mishchenko
Options

Code restructuring.

parent 1d5cb52e
Showing with 63 additions and 322 deletions
abclib.dsp
......@@ -3735,11 +3735,15 @@ SOURCE=.\src\aig\gia\giaAigerExt.c
# End Source File
# Begin Source File
SOURCE=.\src\aig\gia\giaBalance.c
SOURCE=.\src\aig\gia\giaBalAig.c
# End Source File
# Begin Source File
SOURCE=.\src\aig\gia\giaBalance2.c
SOURCE=.\src\aig\gia\giaBalLut.c
# End Source File
# Begin Source File
SOURCE=.\src\aig\gia\giaBalMap.c
# End Source File
# Begin Source File
......@@ -3919,6 +3923,10 @@ SOURCE=.\src\aig\gia\giaScl.c
# End Source File
# Begin Source File
SOURCE=.\src\aig\gia\giaScript.c
# End Source File
# Begin Source File
SOURCE=.\src\aig\gia\giaShrink.c
# End Source File
# Begin Source File
......@@ -3939,10 +3947,6 @@ SOURCE=.\src\aig\gia\giaSim2.c
# End Source File
# Begin Source File
SOURCE=.\src\aig\gia\giaSopb.c
# End Source File
# Begin Source File
SOURCE=.\src\aig\gia\giaSort.c
# End Source File
# Begin Source File
......
src/aig/gia/giaBalance.c → src/aig/gia/giaBalAig.c
......@@ -980,195 +980,6 @@ Gia_Man_t * Gia_ManAreaBalance( Gia_Man_t * p, int fSimpleAnd, int nNewNodesMax,
return pNew2;
}
/**Function*************************************************************
Synopsis [Synthesis script.]
Description []
SideEffects []
SeeAlso []
***********************************************************************/
void Gia_ManAigPrintPiLevels( Gia_Man_t * p )
{
Gia_Obj_t * pObj;
int i;
Gia_ManForEachPi( p, pObj, i )
printf( "%d ", Gia_ObjLevel(p, pObj) );
printf( "\n" );
}
/**Function*************************************************************
Synopsis [Synthesis script.]
Description []
SideEffects []
SeeAlso []
***********************************************************************/
Gia_Man_t * Gia_ManAigSyn2( Gia_Man_t * pInit, int fOldAlgo, int fCoarsen, int fCutMin, int nRelaxRatio, int fDelayMin, int fVerbose, int fVeryVerbose )
{
Gia_Man_t * p, * pNew, * pTemp;
Jf_Par_t Pars, * pPars = &Pars;
if ( fOldAlgo )
{
Jf_ManSetDefaultPars( pPars );
pPars->fCutMin = fCutMin;
}
else
{
Lf_ManSetDefaultPars( pPars );
pPars->fCutMin = fCutMin;
pPars->fCoarsen = fCoarsen;
pPars->nRelaxRatio = nRelaxRatio;
pPars->nAreaTuner = 1;
pPars->nCutNum = 4;
}
if ( fVerbose ) Gia_ManPrintStats( pInit, NULL );
p = Gia_ManDup( pInit );
Gia_ManTransferTiming( p, pInit );
if ( Gia_ManAndNum(p) == 0 )
return p;
// delay optimization
if ( fDelayMin && p->pManTime == NULL )
{
int Area0, Area1, Delay0, Delay1;
int fCutMin = pPars->fCutMin;
int fCoarsen = pPars->fCoarsen;
int nRelaxRatio = pPars->nRelaxRatio;
pPars->fCutMin = 0;
pPars->fCoarsen = 0;
pPars->nRelaxRatio = 0;
// perform mapping
if ( fOldAlgo )
Jf_ManPerformMapping( p, pPars );
else
Lf_ManPerformMapping( p, pPars );
Area0 = (int)pPars->Area;
Delay0 = (int)pPars->Delay;
// perform balancing
pNew = Gia_ManPerformDsdBalance( p, 6, 4, 0, 0 );
// perform mapping again
if ( fOldAlgo )
Jf_ManPerformMapping( pNew, pPars );
else
Lf_ManPerformMapping( pNew, pPars );
Area1 = (int)pPars->Area;
Delay1 = (int)pPars->Delay;
// choose the best result
if ( Delay1 < Delay0 - 1 || (Delay1 == Delay0 + 1 && 100.0 * (Area1 - Area0) / Area1 < 3.0) )
{
Gia_ManStop( p );
p = pNew;
}
else
{
Gia_ManStop( pNew );
Vec_IntFreeP( &p->vMapping );
}
// reset params
pPars->fCutMin = fCutMin;
pPars->fCoarsen = fCoarsen;
pPars->nRelaxRatio = nRelaxRatio;
}
// perform balancing
pNew = Gia_ManAreaBalance( p, 0, ABC_INFINITY, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
Gia_ManStop( p );
// perform mapping
if ( fOldAlgo )
pNew = Jf_ManPerformMapping( pTemp = pNew, pPars );
else
pNew = Lf_ManPerformMapping( pTemp = pNew, pPars );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
if ( pTemp != pNew )
Gia_ManStop( pTemp );
// perform balancing
pNew = Gia_ManAreaBalance( pTemp = pNew, 0, ABC_INFINITY, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
Gia_ManStop( pTemp );
return pNew;
}
Gia_Man_t * Gia_ManAigSyn3( Gia_Man_t * p, int fVerbose, int fVeryVerbose )
{
Gia_Man_t * pNew, * pTemp;
Jf_Par_t Pars, * pPars = &Pars;
Jf_ManSetDefaultPars( pPars );
pPars->nRelaxRatio = 40;
if ( fVerbose ) Gia_ManPrintStats( p, NULL );
if ( Gia_ManAndNum(p) == 0 )
return Gia_ManDup(p);
// perform balancing
pNew = Gia_ManAreaBalance( p, 0, ABC_INFINITY, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
// perform mapping
pPars->nLutSize = 6;
pNew = Jf_ManPerformMapping( pTemp = pNew, pPars );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
// Gia_ManStop( pTemp );
// perform balancing
pNew = Gia_ManAreaBalance( pTemp = pNew, 0, ABC_INFINITY, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
Gia_ManStop( pTemp );
// perform mapping
pPars->nLutSize = 4;
pNew = Jf_ManPerformMapping( pTemp = pNew, pPars );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
// Gia_ManStop( pTemp );
// perform balancing
pNew = Gia_ManAreaBalance( pTemp = pNew, 0, ABC_INFINITY, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
Gia_ManStop( pTemp );
return pNew;
}
Gia_Man_t * Gia_ManAigSyn4( Gia_Man_t * p, int fVerbose, int fVeryVerbose )
{
Gia_Man_t * pNew, * pTemp;
Jf_Par_t Pars, * pPars = &Pars;
Jf_ManSetDefaultPars( pPars );
pPars->nRelaxRatio = 40;
if ( fVerbose ) Gia_ManPrintStats( p, NULL );
if ( Gia_ManAndNum(p) == 0 )
return Gia_ManDup(p);
//Gia_ManAigPrintPiLevels( p );
// perform balancing
pNew = Gia_ManAreaBalance( p, 0, ABC_INFINITY, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
// perform mapping
pPars->nLutSize = 7;
pNew = Jf_ManPerformMapping( pTemp = pNew, pPars );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
// Gia_ManStop( pTemp );
// perform extraction
pNew = Gia_ManPerformFx( pTemp = pNew, ABC_INFINITY, 0, 0, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
Gia_ManStop( pTemp );
// perform balancing
pNew = Gia_ManAreaBalance( pTemp = pNew, 0, ABC_INFINITY, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
Gia_ManStop( pTemp );
// perform mapping
pPars->nLutSize = 5;
pNew = Jf_ManPerformMapping( pTemp = pNew, pPars );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
// Gia_ManStop( pTemp );
// perform extraction
pNew = Gia_ManPerformFx( pTemp = pNew, ABC_INFINITY, 0, 0, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
Gia_ManStop( pTemp );
// perform balancing
pNew = Gia_ManAreaBalance( pTemp = pNew, 0, ABC_INFINITY, fVeryVerbose, 0 );
if ( fVerbose ) Gia_ManPrintStats( pNew, NULL );
Gia_ManStop( pTemp );
//Gia_ManAigPrintPiLevels( pNew );
return pNew;
}
////////////////////////////////////////////////////////////////////////
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
......
src/aig/gia/giaSopb.c → src/aig/gia/giaBalMap.c
......@@ -19,8 +19,6 @@
***********************************************************************/
#include "gia.h"
#include "base/main/main.h"
#include "base/cmd/cmd.h"
ABC_NAMESPACE_IMPL_START
......@@ -319,128 +317,6 @@ Gia_Man_t * Gia_ManPerformDsdBalanceWin( Gia_Man_t * p, int LevelMax, int nTimeW
return pNew;
}
/**Function*************************************************************
Synopsis []
Description []
SideEffects []
SeeAlso []
***********************************************************************/
void Gia_ManPerformMap( int nAnds, int nLutSize, int nCutNum, int fVerbose )
{
char Command[200];
sprintf( Command, "&unmap; &lf -K %d -C %d -k; &save", nLutSize, nCutNum );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
if ( fVerbose )
{
printf( "MAPPING:\n" );
printf( "Mapping with &lf -k:\n" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
sprintf( Command, "&unmap; &lf -K %d -C %d; &save", nLutSize, nCutNum );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
if ( fVerbose )
{
printf( "Mapping with &lf:\n" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
if ( (nLutSize == 4 && nAnds < 100000) || (nLutSize == 6 && nAnds < 2000) )
{
sprintf( Command, "&unmap; &if -sz -S %d%d -K %d -C %d", nLutSize, nLutSize, 2*nLutSize-1, 2*nCutNum );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
Vec_IntFreeP( &Abc_FrameReadGia(Abc_FrameGetGlobalFrame())->vPacking );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&save" );
if ( fVerbose )
{
printf( "Mapping with &if -sz -S %d%d -K %d -C %d:\n", nLutSize, nLutSize, 2*nLutSize-1, 2*nCutNum );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
}
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&load" );
if ( fVerbose )
{
printf( "Mapping final:\n" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
}
void Gia_ManPerformRound( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int nRelaxRatio, int fVerbose )
{
char Command[200];
// perform AIG-based synthesis
if ( nAnds < 50000 )
{
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "" );
sprintf( Command, "&dsdb; &dch -f; &if -K %d -C %d; &save", nLutSize, nCutNum );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
if ( fVerbose )
{
printf( "Mapping with &dch -f; &if -K %d -C %d:\n", nLutSize, nCutNum );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
}
// perform AIG-based synthesis
if ( nAnds < 20000 )
{
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "" );
sprintf( Command, "&dsdb; &dch -f; &if -K %d -C %d; &save", nLutSize, nCutNum );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
if ( fVerbose )
{
printf( "Mapping with &dch -f; &if -K %d -C %d:\n", nLutSize, nCutNum );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
}
// perform first round of mapping
Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fVerbose );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
// perform synthesis
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&dsdb" );
// perform second round of mapping
Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fVerbose );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
// perform synthesis
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&syn2 -m -R 10; &dsdb" );
// prepare for final mapping
sprintf( Command, "&blut -a -K %d", nLutSize );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
// perform third round of mapping
Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fVerbose );
}
void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int nRelaxRatio, int fVerbose )
{
// remove comb equivs
if ( fIsMapped )
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
if ( Abc_FrameReadGia(Abc_FrameGetGlobalFrame())->pManTime )
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&sweep" );
else
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&fraig -c" );
// perform first round
Gia_ManPerformRound( fIsMapped, nAnds, nLevels, nLutSize, nCutNum, nRelaxRatio, fVerbose );
// perform synthesis
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st; &sopb" );
// perform first round
Gia_ManPerformRound( fIsMapped, nAnds, nLevels, nLutSize, nCutNum, nRelaxRatio, fVerbose );
}
////////////////////////////////////////////////////////////////////////
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
......
src/aig/gia/module.make
......@@ -2,8 +2,9 @@ SRC += src/aig/gia/giaAig.c \
src/aig/gia/giaAgi.c \
src/aig/gia/giaAiger.c \
src/aig/gia/giaAigerExt.c \
src/aig/gia/giaBalance.c \
src/aig/gia/giaBalance2.c \
src/aig/gia/giaBalAig.c \
src/aig/gia/giaBalLut.c \
src/aig/gia/giaBalMap.c \
src/aig/gia/giaBidec.c \
src/aig/gia/giaCCof.c \
src/aig/gia/giaCex.c \
......@@ -48,12 +49,12 @@ SRC += src/aig/gia/giaAig.c \
src/aig/gia/giaResub.c \
src/aig/gia/giaRetime.c \
src/aig/gia/giaScl.c \
src/aig/gia/giaScript.c \
src/aig/gia/giaShrink.c \
src/aig/gia/giaShrink6.c \
src/aig/gia/giaShrink7.c \
src/aig/gia/giaSim.c \
src/aig/gia/giaSim2.c \
src/aig/gia/giaSopb.c \
src/aig/gia/giaSort.c \
src/aig/gia/giaSpeedup.c \
src/aig/gia/giaStg.c \
......
src/base/abci/abc.c
......@@ -360,6 +360,7 @@ static int Abc_CommandAbc9BalanceLut ( Abc_Frame_t * pAbc, int argc, cha
static int Abc_CommandAbc9Syn2 ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandAbc9Syn3 ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandAbc9Syn4 ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandAbc9Synch2 ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandAbc9False ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandAbc9Miter ( Abc_Frame_t * pAbc, int argc, char ** argv );
static int Abc_CommandAbc9Miter2 ( Abc_Frame_t * pAbc, int argc, char ** argv );
......@@ -950,6 +951,7 @@ void Abc_Init( Abc_Frame_t * pAbc )
Cmd_CommandAdd( pAbc, "ABC9", "&syn2", Abc_CommandAbc9Syn2, 0 );
Cmd_CommandAdd( pAbc, "ABC9", "&syn3", Abc_CommandAbc9Syn3, 0 );
Cmd_CommandAdd( pAbc, "ABC9", "&syn4", Abc_CommandAbc9Syn4, 0 );
Cmd_CommandAdd( pAbc, "ABC9", "&synch2", Abc_CommandAbc9Synch2, 0 );
Cmd_CommandAdd( pAbc, "ABC9", "&false", Abc_CommandAbc9False, 0 );
Cmd_CommandAdd( pAbc, "ABC9", "&miter", Abc_CommandAbc9Miter, 0 );
Cmd_CommandAdd( pAbc, "ABC9", "&miter2", Abc_CommandAbc9Miter2, 0 );
......@@ -28449,6 +28451,53 @@ usage:
SeeAlso []
***********************************************************************/
int Abc_CommandAbc9Synch2( Abc_Frame_t * pAbc, int argc, char ** argv )
{
extern Gia_Man_t * Gia_ManAigSynch2( Gia_Man_t * p, int fVerbose );
Gia_Man_t * pTemp;
int c, fVerbose = 0;
Extra_UtilGetoptReset();
while ( ( c = Extra_UtilGetopt( argc, argv, "vh" ) ) != EOF )
{
switch ( c )
{
case 'v':
fVerbose ^= 1;
break;
case 'h':
goto usage;
default:
goto usage;
}
}
if ( pAbc->pGia == NULL )
{
Abc_Print( -1, "Abc_CommandAbc9Synch2(): There is no AIG.\n" );
return 1;
}
pTemp = Gia_ManAigSynch2( pAbc->pGia, fVerbose );
Abc_FrameUpdateGia( pAbc, pTemp );
return 0;
usage:
Abc_Print( -2, "usage: &synch2 [-vh]\n" );
Abc_Print( -2, "\t performs synthesis and computes structural choices\n" );
Abc_Print( -2, "\t-v : toggles printing additional information [default = %s]\n", fVerbose? "yes": "no" );
Abc_Print( -2, "\t-h : print the command usage\n");
return 1;
}
/**Function*************************************************************
Synopsis []
Description []
SideEffects []
SeeAlso []
***********************************************************************/
int Abc_CommandAbc9Syn3( Abc_Frame_t * pAbc, int argc, char ** argv )
{
Gia_Man_t * pTemp;
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