diff options
| author | Alan Mishchenko <alanmi@berkeley.edu> | 2013-06-29 23:45:04 -0700 |
|---|---|---|
| committer | Alan Mishchenko <alanmi@berkeley.edu> | 2013-06-29 23:45:04 -0700 |
| commit | 4e247281d22164b6adb9bbd274f8944f9dbde268 (patch) | |
| tree | d2f215d24574fee3a7c113c466715d1c8ad7a27b /src/misc/mem | |
| parent | 2d6d5a0f0bbe6bd686d4b178e893a477a061cbe6 (diff) | |
| download | abc-4e247281d22164b6adb9bbd274f8944f9dbde268.tar.gz abc-4e247281d22164b6adb9bbd274f8944f9dbde268.tar.bz2 abc-4e247281d22164b6adb9bbd274f8944f9dbde268.zip | |
Updating new mapper.
Diffstat (limited to 'src/misc/mem')
| -rw-r--r-- | src/misc/mem/mem2.h | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/misc/mem/mem2.h b/src/misc/mem/mem2.h index bcd9a901..25670706 100644 --- a/src/misc/mem/mem2.h +++ b/src/misc/mem/mem2.h @@ -93,8 +93,8 @@ static inline void Mmr_FlexStop( Mmr_Flex_t * p ) { word * pPage; int i; - if ( 1 && Vec_PtrSize(&p->vPages) ) - printf( "Using %3d pages of %6d words each with %6d entries (max = %6d). Total memory %5.2f MB.\n", + if ( 0 && Vec_PtrSize(&p->vPages) ) + printf( "Using %3d pages of %6d words each with %6d entries (max = %6d). Total memory = %5.2f MB.\n", Vec_PtrSize(&p->vPages), p->nPageBase ? 1 << p->nPageBase : 0, p->nEntries, p->nEntriesMax, 1.0 * Vec_PtrSize(&p->vPages) * (1 << p->nPageBase) * 8 / (1 << 20) ); Vec_PtrForEachEntry( word *, &p->vPages, pPage, i ) @@ -162,8 +162,8 @@ static inline void Mmr_FixedStop( Mmr_Fixed_t * p, int fFreeLast ) { word * pPage; int i; - if ( 1 && Vec_PtrSize(&p->vPages) ) - printf( "Using %3d pages of %6d words each with %6d entries (max = %6d) of size %d. Total memory %5.2f MB.\n", + if ( 0 && Vec_PtrSize(&p->vPages) ) + printf( "Using %3d pages of %6d words each with %6d entries (max = %6d) of size %d. Total memory = %5.2f MB.\n", Vec_PtrSize(&p->vPages), p->nPageBase ? 1 << p->nPageBase : 0, p->nEntries, p->nEntriesMax, p->nEntryWords, 1.0 * Vec_PtrSize(&p->vPages) * (1 << p->nPageBase) * 8 / (1 << 20) ); Vec_PtrForEachEntry( word *, &p->vPages, pPage, i ) @@ -198,6 +198,10 @@ static inline void Mmr_FixedRecycle( Mmr_Fixed_t * p, int h ) memset( Mmr_FixedEntry(p, h), 0xFF, sizeof(word) * p->nEntryWords ); Vec_IntPush( &p->vFrees, h ); } +static inline int Mmr_FixedMemory( Mmr_Fixed_t * p ) +{ + return Vec_PtrSize(&p->vPages) * (p->PageMask + 1); +} /**Function************************************************************* @@ -247,6 +251,13 @@ static inline void Mmr_StepRecycle( Mmr_Step_t * p, int h ) p->nEntries--; Mmr_FixedRecycle( p->pMems + (h & p->uMask), (h >> p->nBits) ); } +static inline int Mmr_StepMemory( Mmr_Step_t * p ) +{ + int i, Mem = 0; + for ( i = 1; i <= p->uMask; i++ ) + Mem += Mmr_FixedMemory( p->pMems + i ); + return Mem; +} ABC_NAMESPACE_HEADER_END |