diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2012-04-09 15:06:33 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2012-04-09 15:06:33 -0700 |
| commit | 0509440a45b3f7b079de122bce070be4a723635c (patch) | |
| tree | 9ca4801c6328298bf8a24061b02f6b20d70c6582 /src/base | |
| parent | e908ff1cb9aadabf49584487b8e3f98abf55eebb (diff) | |
| download | abc-0509440a45b3f7b079de122bce070be4a723635c.tar.gz abc-0509440a45b3f7b079de122bce070be4a723635c.tar.bz2 abc-0509440a45b3f7b079de122bce070be4a723635c.zip | |
Improving printouts of critical path.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/abci/abc.c | 4 | ||||
| -rw-r--r-- | src/base/abci/abcTiming.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/base/abci/abc.c b/src/base/abci/abc.c index 8798763e..bf3abf26 100644 --- a/src/base/abci/abc.c +++ b/src/base/abci/abc.c @@ -2322,7 +2322,7 @@ int Abc_CommandPrintDelay( Abc_Frame_t * pAbc, int argc, char ** argv ) pObjOut = Abc_NtkObj( pNtk, Num ); if ( pObjOut == NULL ) { - Abc_Print( -1, "Cannot find combinational output \"%s\".\n", argv[globalUtilOptind] ); + Abc_Print( 1, "Cannot find combinational output \"%s\".\n", argv[globalUtilOptind] ); return 1; } } @@ -2336,7 +2336,7 @@ int Abc_CommandPrintDelay( Abc_Frame_t * pAbc, int argc, char ** argv ) pObjIn = Abc_NtkObj( pNtk, Num ); if ( pObjIn == NULL ) { - Abc_Print( -1, "Cannot find combinational input \"%s\".\n", argv[globalUtilOptind+1] ); + Abc_Print( 1, "Cannot find combinational input \"%s\".\n", argv[globalUtilOptind+1] ); return 1; } } diff --git a/src/base/abci/abcTiming.c b/src/base/abci/abcTiming.c index 981afcc6..a6977c07 100644 --- a/src/base/abci/abcTiming.c +++ b/src/base/abci/abcTiming.c @@ -634,7 +634,7 @@ Vec_Int_t * Abc_NtkDelayTraceSlackStart( Abc_Ntk_t * pNtk ) for ( k = 0; k < Abc_ObjFaninNum(pObj); k++ ) Vec_IntPush( vSlacks, -1 ); } - assert( Vec_IntSize(vSlacks) == Vec_IntCap(vSlacks) ); +// assert( Abc_MaxInt(16, Vec_IntSize(vSlacks)) == Vec_IntCap(vSlacks) ); return vSlacks; } @@ -893,7 +893,7 @@ float Abc_NtkDelayTrace( Abc_Ntk_t * pNtk, Abc_Obj_t * pOut, Abc_Obj_t * pIn, in int k, iFanin, Length = 0; Abc_Obj_t * pFanin; // check the additional slack - SlackAdd = (Abc_NodeRequired(pOut)->Worst == 0.0) ? 0.0 : Abc_NodeRequired(pOut)->Worst - Abc_NodeArrival(Abc_ObjFanin0(pOut))->Worst; + SlackAdd = Abc_MaxFloat( 0.0, Abc_NodeRequired(pOut)->Worst - Abc_NodeArrival(Abc_ObjFanin0(pOut))->Worst ); // collect the critical path Abc_NtkDelayTraceCritPathCollect_rec( vSlacks, Abc_ObjFanin0(pOut), vBest, vPath ); if ( pIn == NULL ) @@ -941,7 +941,7 @@ float Abc_NtkDelayTrace( Abc_Ntk_t * pNtk, Abc_Obj_t * pOut, Abc_Obj_t * pIn, in } printf( "Level %3d : ", Abc_ObjLevel(Abc_ObjFanin0(pOut)) + 1 ); printf( "Primary output \"%s\". ", Abc_ObjName(pOut) ); - if ( Abc_NodeRequired(pOut)->Worst == 0.0 ) + if ( Abc_NodeRequired(pOut)->Worst - Abc_NodeArrival(Abc_ObjFanin0(pOut))->Worst <= 0.0 ) printf( "Required time = %6.1f. ", Abc_NodeReadArrival(Abc_ObjFanin0(pOut))->Worst ); else printf( "Required time = %6.1f. ", Abc_NodeRequired(pOut)->Worst ); |