AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-336024 - Clear device heap to 0 in ROCr path

Browse Source 
Change-Id: Id100ca6d6d5bd7fb16ca8c98ff0b12c9df1d69ab


[ROCm/clr commit: 830898753d]
This commit is contained in:
German Andryeyev
2022-05-19 09:24:47 -04:00
parent d9722102c0
commit df01016c97
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/rocclr/device/pal/paldevice.cpp
+7 -1
View File
@@ -1087,6 +1087,7 @@ void PAL_STDCALL Device::PalDeveloperCallback(void* pPrivateData, const Pal::uin
#endif // PAL_GPUOPEN_OCL #endif // PAL_GPUOPEN_OCL
} }
// ================================================================================================
bool Device::initializeHeapResources() { bool Device::initializeHeapResources() {
amd::ScopedLock k(lockForInitHeap_); amd::ScopedLock k(lockForInitHeap_);
if (!heapInitComplete_) { if (!heapInitComplete_) {
@@ -1154,13 +1155,18 @@ bool Device::initializeHeapResources() {
xferQueue_->enableSyncedBlit(); xferQueue_->enableSyncedBlit();
if (amd::IS_HIP) { if (amd::IS_HIP) {
// Allocate initial heap for device memory allocator // Allocate initial heap for device memory allocator
static constexpr size_t HeapBufferSize = 1024 * Ki; static constexpr size_t HeapBufferSize = 128 * Ki;
heap_buffer_ = createMemory(HeapBufferSize); heap_buffer_ = createMemory(HeapBufferSize);
if (heap_buffer_ == nullptr) {
LogError("Heap buffer allocation failed!");
return false;
}
} }
} }
return true; return true;
} }
// ================================================================================================
device::VirtualDevice* Device::createVirtualDevice(amd::CommandQueue* queue) { device::VirtualDevice* Device::createVirtualDevice(amd::CommandQueue* queue) {
bool profiling = false; bool profiling = false;
uint rtCUs = amd::CommandQueue::RealTimeDisabled; uint rtCUs = amd::CommandQueue::RealTimeDisabled;
projects/clr/rocclr/device/rocm/rocdevice.cpp
+11 -1
View File
@@ -540,6 +540,7 @@ void Device::tearDown() {
hsa_shut_down(); hsa_shut_down();
} }
// ================================================================================================
bool Device::create() { bool Device::create() {
char agent_name[64] = {0}; char agent_name[64] = {0};
if (HSA_STATUS_SUCCESS != hsa_agent_get_info(bkendDevice_, HSA_AGENT_INFO_NAME, agent_name)) { if (HSA_STATUS_SUCCESS != hsa_agent_get_info(bkendDevice_, HSA_AGENT_INFO_NAME, agent_name)) {
@@ -788,13 +789,22 @@ bool Device::create() {
if (amd::IS_HIP) { if (amd::IS_HIP) {
// Allocate initial heap for device memory allocator // Allocate initial heap for device memory allocator
static constexpr size_t HeapBufferSize = 1024 * Ki; static constexpr size_t HeapBufferSize = 128 * Ki;
heap_buffer_ = createMemory(HeapBufferSize); heap_buffer_ = createMemory(HeapBufferSize);
// Clear memory to 0 for device library logic
if ((heap_buffer_ == nullptr) ||
(HSA_STATUS_SUCCESS != hsa_amd_memory_fill(
reinterpret_cast<void*>(HeapBuffer()->virtualAddress()), 0,
HeapBufferSize / sizeof(uint32_t)))) {
LogError("Heap buffer allocation failed!");
return false;
}
} }
return true; return true;
} }
// ================================================================================================
device::Program* NullDevice::createProgram(amd::Program& owner, amd::option::Options* options) { device::Program* NullDevice::createProgram(amd::Program& owner, amd::option::Options* options) {
device::Program* program; device::Program* program;
if (settings().useLightning_) { if (settings().useLightning_) {