Commit 10e0f3c5 by Alan Mishchenko

Small changes to enable collecting results using &ps -D file.

parent f4d72b2a
...@@ -176,6 +176,8 @@ struct Gia_Man_t_ ...@@ -176,6 +176,8 @@ struct Gia_Man_t_
int iData2; // various user data int iData2; // various user data
int nAnd2Delay; // AND2 delay scaled to match delay numbers used int nAnd2Delay; // AND2 delay scaled to match delay numbers used
int fVerbose; // verbose reports int fVerbose; // verbose reports
int MappedArea; // area after mapping
int MappedDelay; // delay after mapping
// bit-parallel simulation // bit-parallel simulation
int iPatsPi; int iPatsPi;
Vec_Wrd_t * vSims; Vec_Wrd_t * vSims;
......
...@@ -499,7 +499,7 @@ void Gia_ManPrintMappingStats( Gia_Man_t * p, char * pDumpFile ) ...@@ -499,7 +499,7 @@ void Gia_ManPrintMappingStats( Gia_Man_t * p, char * pDumpFile )
if ( nMuxF ) if ( nMuxF )
Gia_ManCountDupLut( p ); Gia_ManCountDupLut( p );
return; //return;
if ( pDumpFile ) if ( pDumpFile )
{ {
static char FileNameOld[1000] = {0}; static char FileNameOld[1000] = {0};
...@@ -513,19 +513,24 @@ void Gia_ManPrintMappingStats( Gia_Man_t * p, char * pDumpFile ) ...@@ -513,19 +513,24 @@ void Gia_ManPrintMappingStats( Gia_Man_t * p, char * pDumpFile )
// fprintf( pTable, "%d ", Gia_ManCiNum(p) ); // fprintf( pTable, "%d ", Gia_ManCiNum(p) );
// fprintf( pTable, "%d ", Gia_ManCoNum(p) ); // fprintf( pTable, "%d ", Gia_ManCoNum(p) );
// fprintf( pTable, "%d ", Gia_ManAndNum(p) ); // fprintf( pTable, "%d ", Gia_ManAndNum(p) );
fprintf( pTable, "%d ", Gia_ManPiNum(p) - Gia_ManBoxCiNum(p) - Gia_ManRegBoxNum(p) ); // fprintf( pTable, "%d ", Gia_ManPiNum(p) - Gia_ManBoxCiNum(p) - Gia_ManRegBoxNum(p) );
fprintf( pTable, "%d ", Gia_ManPoNum(p) - Gia_ManBoxCoNum(p) - Gia_ManRegBoxNum(p) ); // fprintf( pTable, "%d ", Gia_ManPoNum(p) - Gia_ManBoxCoNum(p) - Gia_ManRegBoxNum(p) );
fprintf( pTable, "%d ", Gia_ManClockDomainNum(p) ); // fprintf( pTable, "%d ", Gia_ManClockDomainNum(p) );
fprintf( pTable, " " ); fprintf( pTable, " " );
fprintf( pTable, "%d ", nLuts ); fprintf( pTable, "%d ", p->MappedDelay );
fprintf( pTable, "%d ", p->MappedArea );
fprintf( pTable, "%d ", nFanins );
fprintf( pTable, "%d ", LevelMax ); fprintf( pTable, "%d ", LevelMax );
fprintf( pTable, "%d ", Gia_ManRegBoxNum(p) ); fprintf( pTable, "%d ", nLuts );
fprintf( pTable, "%d ", Gia_ManNonRegBoxNum(p) ); // fprintf( pTable, "%d ", Gia_ManRegBoxNum(p) );
// fprintf( pTable, "%d ", Gia_ManNonRegBoxNum(p) );
clk = Abc_Clock(); clk = Abc_Clock();
} }
else else
{ {
printf( "This part of the code is currently not used.\n" );
assert( 0 );
fprintf( pTable, " " ); fprintf( pTable, " " );
fprintf( pTable, "%d ", nLuts ); fprintf( pTable, "%d ", nLuts );
fprintf( pTable, "%d ", LevelMax ); fprintf( pTable, "%d ", LevelMax );
...@@ -2153,6 +2158,8 @@ Gia_Man_t * Gia_ManPerformMapping( Gia_Man_t * p, void * pp ) ...@@ -2153,6 +2158,8 @@ Gia_Man_t * Gia_ManPerformMapping( Gia_Man_t * p, void * pp )
pNew = Gia_ManPerformMappingInt( p, (If_Par_t *)pp ); pNew = Gia_ManPerformMappingInt( p, (If_Par_t *)pp );
Gia_ManTransferTiming( pNew, p ); Gia_ManTransferTiming( pNew, p );
} }
pNew->MappedDelay = (int)((If_Par_t *)pp)->FinalDelay;
pNew->MappedArea = (int)((If_Par_t *)pp)->FinalArea;
return pNew; return pNew;
} }
......
...@@ -159,6 +159,7 @@ struct If_Par_t_ ...@@ -159,6 +159,7 @@ struct If_Par_t_
int fUseCoAttrs; // use CO attributes int fUseCoAttrs; // use CO attributes
float DelayTargetNew;// new delay target float DelayTargetNew;// new delay target
float FinalDelay; // final delay after mapping float FinalDelay; // final delay after mapping
float FinalArea; // final area after mapping
If_LibLut_t * pLutLib; // the LUT library If_LibLut_t * pLutLib; // the LUT library
float * pTimesArr; // arrival times float * pTimesArr; // arrival times
float * pTimesReq; // required times float * pTimesReq; // required times
......
...@@ -187,6 +187,7 @@ int If_ManPerformMappingComb( If_Man_t * p ) ...@@ -187,6 +187,7 @@ int If_ManPerformMappingComb( If_Man_t * p )
} }
*/ */
p->pPars->FinalDelay = p->RequiredGlo; p->pPars->FinalDelay = p->RequiredGlo;
p->pPars->FinalArea = p->AreaGlo;
return 1; return 1;
} }
......
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