Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/gpgmm/common/BuddyMemoryAllocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace gpgmm {

uint64_t BuddyMemoryAllocator::GetMemoryIndex(uint64_t offset) const {
ASSERT(offset != kInvalidOffset);
return SafeDivison(offset, mMemorySize);
return SafeDivide(offset, mMemorySize);
}

std::unique_ptr<MemoryAllocation> BuddyMemoryAllocator::TryAllocateMemory(
Expand Down
7 changes: 3 additions & 4 deletions src/gpgmm/common/SlabMemoryAllocator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ namespace gpgmm {
}
}

Slab* pNewFreeSlab = new Slab(SafeDivison(slabSize, mBlockSize), mBlockSize);
Slab* pNewFreeSlab = new Slab(SafeDivide(slabSize, mBlockSize), mBlockSize);
pCache->FreeList.push_front(pNewFreeSlab);
pFreeSlab = pNewFreeSlab;
}
Expand Down Expand Up @@ -271,9 +271,8 @@ namespace gpgmm {
if (allowSlabPrefetch &&
mInfo.PrefetchedMemoryMissesEliminated < mInfo.PrefetchedMemoryMisses) {
const double currentCoverage =
SafeDivison(mInfo.PrefetchedMemoryMissesEliminated,
static_cast<double>(mInfo.PrefetchedMemoryMissesEliminated +
mInfo.PrefetchedMemoryMisses));
SafeDivide(mInfo.PrefetchedMemoryMissesEliminated,
mInfo.PrefetchedMemoryMissesEliminated + mInfo.PrefetchedMemoryMisses);
if (currentCoverage < kPrefetchCoverageWarnMinThreshold) {
WarnEvent(GetTypename(), EventMessageId::PrefetchFailed)
<< "Allow prefetch disabled, coverage went below threshold: ("
Expand Down
2 changes: 1 addition & 1 deletion src/gpgmm/d3d12/ResidencyManagerD3D12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ namespace gpgmm::d3d12 {
.c_str(),
(pVideoMemoryInfo->CurrentUsage > pVideoMemoryInfo->Budget)
? 100
: SafeDivison(pVideoMemoryInfo->CurrentUsage, pVideoMemoryInfo->Budget) * 100);
: SafeDivide(pVideoMemoryInfo->CurrentUsage, pVideoMemoryInfo->Budget) * 100);

// Reservations are optional.
GPGMM_TRACE_EVENT_METRIC(
Expand Down
12 changes: 4 additions & 8 deletions src/gpgmm/d3d12/ResourceAllocatorD3D12.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1122,24 +1122,20 @@ namespace gpgmm::d3d12 {

GPGMM_TRACE_EVENT_METRIC(
"GPU allocation utilization (%)",
SafeDivison(result.UsedBlockUsage,
static_cast<double>(result.UsedMemoryUsage + result.FreeMemoryUsage)) *
SafeDivide(result.UsedBlockUsage, result.UsedMemoryUsage + result.FreeMemoryUsage) *
100);

GPGMM_TRACE_EVENT_METRIC("GPU allocation free (MB)", result.FreeMemoryUsage / 1e6);

GPGMM_TRACE_EVENT_METRIC(
"GPU prefetch memory cache (%)",
SafeDivison(result.PrefetchedMemoryMissesEliminated,
static_cast<double>(result.PrefetchedMemoryMisses +
result.PrefetchedMemoryMissesEliminated)) *
SafeDivide(result.PrefetchedMemoryMissesEliminated,
result.PrefetchedMemoryMisses + result.PrefetchedMemoryMissesEliminated) *
100);

GPGMM_TRACE_EVENT_METRIC(
"GPU request cache (%)",
SafeDivison(result.CacheSizeHits,
static_cast<double>(result.CacheSizeMisses + result.CacheSizeHits)) *
100);
SafeDivide(result.CacheSizeHits, result.CacheSizeMisses + result.CacheSizeHits) * 100);

return result;
}
Expand Down
8 changes: 0 additions & 8 deletions src/gpgmm/utils/Math.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,4 @@ namespace gpgmm {
return ((n + m - 1) / m) * m;
}

double SafeDivison(double a, double b) {
if (b == 0) {
return 0.;
} else {
return a / b;
}
}

} // namespace gpgmm
9 changes: 8 additions & 1 deletion src/gpgmm/utils/Math.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,14 @@ namespace gpgmm {
uint64_t RoundUp(uint64_t n, uint64_t m);

// Evaluates a/b, avoiding division by zero.
double SafeDivison(double a, double b);
template <typename T>
double SafeDivide(T dividend, T divisor) {
if (divisor == 0) {
return 0.0;
} else {
return dividend / divisor;
}
}

} // namespace gpgmm

Expand Down
5 changes: 2 additions & 3 deletions src/gpgmm/utils/WindowsTime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace gpgmm {
LARGE_INTEGER curTime;
const bool success = QueryPerformanceCounter(&curTime);
ASSERT(success);
return SafeDivison(static_cast<double>(curTime.QuadPart), GetFrequency());
return SafeDivide(curTime.QuadPart, GetFrequency());
}

void StartElapsedTime() override {
Expand All @@ -43,8 +43,7 @@ namespace gpgmm {
LARGE_INTEGER endCount;
const bool success = QueryPerformanceCounter(&endCount);
ASSERT(success);
return SafeDivison(static_cast<double>(endCount.QuadPart - mCounterStart),
GetFrequency());
return SafeDivide(endCount.QuadPart - mCounterStart, GetFrequency());
}

private:
Expand Down