rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-01-05 19:46:15 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Improve logging in case of memory errors

Browse Source
This commit is contained in:
Philip Rebohle 2023-01-14 02:26:42 +01:00
parent 2922b780c1
commit 1c2df54bdf
2 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/dxvk/dxvk_memory.cpp
View File

@ -1,4 +1,6 @@
#include <algorithm> #include <algorithm>
#include <iomanip>
#include <sstream>
#include "dxvk_device.h" #include "dxvk_device.h"
#include "dxvk_memory.h" #include "dxvk_memory.h"
@ -276,26 +278,8 @@ namespace dxvk {
} }
// We weren't able to allocate memory for this resource form any type // We weren't able to allocate memory for this resource form any type
DxvkAdapterMemoryInfo memHeapInfo = m_device->adapter()->getMemoryHeapInfo(); this->logMemoryError(req.core.memoryRequirements);
this->logMemoryStats();
Logger::err(str::format(
"DxvkMemoryAllocator: Memory allocation failed",
"\n Size: ", req.core.memoryRequirements.size,
"\n Alignment: ", req.core.memoryRequirements.alignment,
"\n Mem types: ", "0x", std::hex, req.core.memoryRequirements.memoryTypeBits));
for (uint32_t i = 0; i < m_memProps.memoryHeapCount; i++) {
Logger::err(str::format("Heap ", i, ": ",
(m_memHeaps[i].stats.memoryAllocated >> 20), " MB allocated, ",
(m_memHeaps[i].stats.memoryUsed >> 20), " MB used, ",
m_device->features().extMemoryBudget
? str::format(
(memHeapInfo.heaps[i].memoryAllocated >> 20), " MB allocated (driver), ",
(memHeapInfo.heaps[i].memoryBudget >> 20), " MB budget (driver), ",
(m_memHeaps[i].properties.size >> 20), " MB total")
: str::format(
(m_memHeaps[i].properties.size >> 20), " MB total")));
}
throw DxvkError("DxvkMemoryAllocator: Memory allocation failed"); throw DxvkError("DxvkMemoryAllocator: Memory allocation failed");
} }
@ -653,4 +637,51 @@ namespace dxvk {
return typeMask; return typeMask;
} }
void DxvkMemoryAllocator::logMemoryError(const VkMemoryRequirements& req) const {
std::stringstream sstr;
sstr << "DxvkMemoryAllocator: Memory allocation failed" << std::endl
<< " Size: " << req.size << std::endl
<< " Alignment: " << req.alignment << std::endl
<< " Mem types: ";
uint32_t memTypes = req.memoryTypeBits;
while (memTypes) {
uint32_t index = bit::tzcnt(memTypes);
sstr << index;
if ((memTypes &= memTypes - 1))
sstr << ",";
else
sstr << std::endl;
}
Logger::err(sstr.str());
}
void DxvkMemoryAllocator::logMemoryStats() const {
DxvkAdapterMemoryInfo memHeapInfo = m_device->adapter()->getMemoryHeapInfo();
std::stringstream sstr;
sstr << "Heap Size (MiB) Allocated Used Reserved Budget" << std::endl;
for (uint32_t i = 0; i < m_memProps.memoryHeapCount; i++) {
sstr << std::setw(2) << i << ": "
<< std::setw(6) << (m_memHeaps[i].properties.size >> 20) << " "
<< std::setw(6) << (m_memHeaps[i].stats.memoryAllocated >> 20) << " "
<< std::setw(6) << (m_memHeaps[i].stats.memoryUsed >> 20) << " ";
if (m_device->features().extMemoryBudget) {
sstr << std::setw(6) << (memHeapInfo.heaps[i].memoryAllocated >> 20) << " "
<< std::setw(6) << (memHeapInfo.heaps[i].memoryBudget >> 20) << " " << std::endl;
} else {
sstr << " n/a n/a" << std::endl;
}
}
Logger::err(sstr.str());
}
} }

5
src/dxvk/dxvk_memory.h
View File

@ -403,6 +403,11 @@ namespace dxvk {
uint32_t determineSparseMemoryTypes( uint32_t determineSparseMemoryTypes(
DxvkDevice* device) const; DxvkDevice* device) const;
void logMemoryError(
const VkMemoryRequirements& req) const;
void logMemoryStats() const;
}; };
} }