diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2016-01-07 16:50:01 -0800 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2016-01-07 16:50:01 -0800 |
| commit | a4f977638849d8ba679cbdfd66e3a74c9bf91fe3 (patch) | |
| tree | c215da8bb3fba0244cd65ce0c61f7a7b5aa5788b /src/map/mio | |
| parent | 15a891f97a954a67b4a65079b8371b41fb499dc9 (diff) | |
| download | abc-a4f977638849d8ba679cbdfd66e3a74c9bf91fe3.tar.gz abc-a4f977638849d8ba679cbdfd66e3a74c9bf91fe3.tar.bz2 abc-a4f977638849d8ba679cbdfd66e3a74c9bf91fe3.zip | |
Consolidating timing manager Scl_Con_t and propagating changes.
Diffstat (limited to 'src/map/mio')
| -rw-r--r-- | src/map/mio/mio.h | 3 | ||||
| -rw-r--r-- | src/map/mio/mioUtils.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/map/mio/mio.h b/src/map/mio/mio.h index 06a461ab..63246d91 100644 --- a/src/map/mio/mio.h +++ b/src/map/mio/mio.h @@ -70,9 +70,6 @@ struct Mio_Cell2_t_ void * pMioGate; // gate pointer }; -#define MIO_NUM 1000 -#define MIO_NUMINV 0.001 - //////////////////////////////////////////////////////////////////////// /// GLOBAL VARIABLES /// //////////////////////////////////////////////////////////////////////// diff --git a/src/map/mio/mioUtils.c b/src/map/mio/mioUtils.c index e03159f3..101d5d0f 100644 --- a/src/map/mio/mioUtils.c +++ b/src/map/mio/mioUtils.c @@ -22,7 +22,9 @@ #include "exp.h" #include "misc/util/utilTruth.h" #include "opt/dau/dau.h" +#include "misc/util/utilNam.h" #include "map/scl/sclLib.h" +#include "map/scl/sclCon.h" ABC_NAMESPACE_IMPL_START @@ -655,13 +657,13 @@ static inline void Mio_CollectCopy2( Mio_Cell2_t * pCell, Mio_Gate_t * pGate ) pCell->vExpr = pGate->vExpr; pCell->uTruth = pGate->uTruth; pCell->AreaF = pGate->dArea; - pCell->AreaW = (word)(MIO_NUM * pGate->dArea); + pCell->AreaW = (word)(SCL_NUM * pGate->dArea); pCell->nFanins = pGate->nInputs; pCell->pMioGate = pGate; pCell->iDelayAve = 0; for ( k = 0, pPin = pGate->pPins; pPin; pPin = pPin->pNext, k++ ) { - pCell->iDelays[k] = (int)(MIO_NUM/2 * pPin->dDelayBlockRise + MIO_NUM/2 * pPin->dDelayBlockFall); + pCell->iDelays[k] = (int)(SCL_NUM/2 * pPin->dDelayBlockRise + SCL_NUM/2 * pPin->dDelayBlockFall); pCell->iDelayAve += pCell->iDelays[k]; } if ( pCell->nFanins ) @@ -758,7 +760,7 @@ Mio_Cell2_t * Mio_CollectRootsNew2( Mio_Library_t * pLib, int nInputs, int * pnG printf( "None\n" ); else printf( "%-20s In = %d N = %3d A = %12.6f D = %12.6f\n", - pCell->pName, pCell->nFanins, pCounts[i], pCell->AreaF, MIO_NUMINV*pCell->iDelayAve ); + pCell->pName, pCell->nFanins, pCounts[i], pCell->AreaF, Scl_Int2Flt(pCell->iDelayAve) ); } ABC_FREE( pCounts ); } |