summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/aig/gia/giaScript.c34
-rw-r--r--src/base/abci/abc.c13
2 files changed, 26 insertions, 21 deletions
diff --git a/src/aig/gia/giaScript.c b/src/aig/gia/giaScript.c
index 714843ce..91a8bc8a 100644
--- a/src/aig/gia/giaScript.c
+++ b/src/aig/gia/giaScript.c
@@ -369,11 +369,11 @@ Gia_Man_t * Gia_ManAigSynch2( Gia_Man_t * pInit, void * pPars0, int nLutSize )
SeeAlso []
***********************************************************************/
-void Gia_ManPerformMap( int nAnds, int nLutSize, int nCutNum, int fVerbose )
+void Gia_ManPerformMap( int nAnds, int nLutSize, int nCutNum, int fMinAve, int fVerbose )
{
char Command[200];
- sprintf( Command, "&unmap; &lf -K %d -C %d -k; &save", nLutSize, nCutNum );
-// sprintf( Command, "&unmap; &if -K %d -C %d; &save", nLutSize, nCutNum );
+ sprintf( Command, "&unmap; &lf -K %d -C %d -k %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
+// sprintf( Command, "&unmap; &if -K %d -C %d %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
if ( fVerbose )
{
@@ -381,7 +381,7 @@ void Gia_ManPerformMap( int nAnds, int nLutSize, int nCutNum, int fVerbose )
printf( "Mapping with &lf -k:\n" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
- sprintf( Command, "&unmap; &lf -K %d -C %d; &save", nLutSize, nCutNum );
+ sprintf( Command, "&unmap; &lf -K %d -C %d %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
if ( fVerbose )
{
@@ -390,13 +390,13 @@ void Gia_ManPerformMap( int nAnds, int nLutSize, int nCutNum, int fVerbose )
}
if ( (nLutSize == 4 && nAnds < 100000) || (nLutSize == 6 && nAnds < 10000) )
{
- sprintf( Command, "&unmap; &if -sz -S %d%d -K %d -C %d", nLutSize, nLutSize, 2*nLutSize-1, 2*nCutNum );
+ sprintf( Command, "&unmap; &if -sz -S %d%d -K %d -C %d %s", nLutSize, nLutSize, 2*nLutSize-1, 2*nCutNum, fMinAve?"-t":"" );
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 );
+ printf( "Mapping with &if -sz -S %d%d -K %d -C %d %s:\n", nLutSize, nLutSize, 2*nLutSize-1, 2*nCutNum, fMinAve?"-t":"" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
}
@@ -407,7 +407,7 @@ void Gia_ManPerformMap( int nAnds, int nLutSize, int nCutNum, int fVerbose )
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
}
-void Gia_ManPerformRound( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fVerbose )
+void Gia_ManPerformRound( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fMinAve, int fVerbose )
{
char Command[200];
@@ -415,11 +415,11 @@ void Gia_ManPerformRound( int fIsMapped, int nAnds, int nLevels, int nLutSize, i
if ( nAnds < 50000 )
{
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "" );
- sprintf( Command, "&dsdb; &dch -f; &if -K %d -C %d; &save", nLutSize, nCutNum );
+ sprintf( Command, "&dsdb; &dch -f; &if -K %d -C %d %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
if ( fVerbose )
{
- printf( "Mapping with &dch -f; &if -K %d -C %d:\n", nLutSize, nCutNum );
+ printf( "Mapping with &dch -f; &if -K %d -C %d %s:\n", nLutSize, nCutNum, fMinAve?"-t":"" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
@@ -429,25 +429,25 @@ void Gia_ManPerformRound( int fIsMapped, int nAnds, int nLevels, int nLutSize, i
if ( nAnds < 20000 )
{
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "" );
- sprintf( Command, "&dsdb; &dch -f; &if -K %d -C %d; &save", nLutSize, nCutNum );
+ sprintf( Command, "&dsdb; &dch -f; &if -K %d -C %d %s; &save", nLutSize, nCutNum, fMinAve?"-t":"" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
if ( fVerbose )
{
- printf( "Mapping with &dch -f; &if -K %d -C %d:\n", nLutSize, nCutNum );
+ printf( "Mapping with &dch -f; &if -K %d -C %d %s:\n", nLutSize, nCutNum, fMinAve?"-t":"" );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&ps" );
}
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
}
// perform first round of mapping
- Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fVerbose );
+ Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fMinAve, fVerbose );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
// perform synthesis
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&dsdb" );
// perform second round of mapping
- Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fVerbose );
+ Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fMinAve, fVerbose );
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st" );
// perform synthesis
@@ -458,9 +458,9 @@ void Gia_ManPerformRound( int fIsMapped, int nAnds, int nLevels, int nLutSize, i
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), Command );
// perform third round of mapping
- Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fVerbose );
+ Gia_ManPerformMap( nAnds, nLutSize, nCutNum, fMinAve, fVerbose );
}
-void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fVerbose )
+void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fMinAve, int fVerbose )
{
// remove comb equivs
if ( fIsMapped )
@@ -471,13 +471,13 @@ void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, in
// Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&fraig -c" );
// perform first round
- Gia_ManPerformRound( fIsMapped, nAnds, nLevels, nLutSize, nCutNum, fVerbose );
+ Gia_ManPerformRound( fIsMapped, nAnds, nLevels, nLutSize, nCutNum, fMinAve, fVerbose );
// perform synthesis
Cmd_CommandExecute( Abc_FrameGetGlobalFrame(), "&st; &sopb" );
// perform first round
- Gia_ManPerformRound( fIsMapped, nAnds, nLevels, nLutSize, nCutNum, fVerbose );
+ Gia_ManPerformRound( fIsMapped, nAnds, nLevels, nLutSize, nCutNum, fMinAve, fVerbose );
}
/**Function*************************************************************
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c
index 2ad21d80..a418febd 100644
--- a/src/base/abci/abc.c
+++ b/src/base/abci/abc.c
@@ -30921,12 +30921,13 @@ usage:
***********************************************************************/
int Abc_CommandAbc9Flow( Abc_Frame_t * pAbc, int argc, char ** argv )
{
- extern void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fVerbose );
+ extern void Gia_ManPerformFlow( int fIsMapped, int nAnds, int nLevels, int nLutSize, int nCutNum, int fMinAve, int fVerbose );
int nLutSize = 6;
int nCutNum = 8;
+ int fMinAve = 0;
int c, fVerbose = 0;
Extra_UtilGetoptReset();
- while ( ( c = Extra_UtilGetopt( argc, argv, "KCvh" ) ) != EOF )
+ while ( ( c = Extra_UtilGetopt( argc, argv, "KCtvh" ) ) != EOF )
{
switch ( c )
{
@@ -30952,6 +30953,9 @@ int Abc_CommandAbc9Flow( Abc_Frame_t * pAbc, int argc, char ** argv )
if ( nCutNum < 0 )
goto usage;
break;
+ case 't':
+ fMinAve ^= 1;
+ break;
case 'v':
fVerbose ^= 1;
break;
@@ -30966,14 +30970,15 @@ int Abc_CommandAbc9Flow( Abc_Frame_t * pAbc, int argc, char ** argv )
Abc_Print( -1, "Abc_CommandAbc9Flow(): There is no AIG.\n" );
return 1;
}
- Gia_ManPerformFlow( Gia_ManHasMapping(pAbc->pGia), Gia_ManAndNum(pAbc->pGia), Gia_ManLevelNum(pAbc->pGia), nLutSize, nCutNum, fVerbose );
+ Gia_ManPerformFlow( Gia_ManHasMapping(pAbc->pGia), Gia_ManAndNum(pAbc->pGia), Gia_ManLevelNum(pAbc->pGia), nLutSize, nCutNum, fMinAve, fVerbose );
return 0;
usage:
- Abc_Print( -2, "usage: &flow [-KC num] [-vh]\n" );
+ Abc_Print( -2, "usage: &flow [-KC num] [-tvh]\n" );
Abc_Print( -2, "\t integration optimization and mapping flow\n" );
Abc_Print( -2, "\t-K num : the number of LUT inputs (LUT size) [default = %d]\n", nLutSize );
Abc_Print( -2, "\t-C num : the number of cuts at a node [default = %d]\n", nCutNum );
+ Abc_Print( -2, "\t-t : toggle minimizing average rather than max delay [default = %s]\n", fMinAve? "yes": "no" );
Abc_Print( -2, "\t-v : toggle printing verbose information [default = %s]\n", fVerbose? "yes": "no" );
Abc_Print( -2, "\t-h : print the command usage\n");
return 1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 16:58:35 +0000