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

Modify device properties to use pool API.

Browse Source 
- Also better error code checking


[ROCm/clr commit: e738fa66b5]
This commit is contained in:
Ben Sander
2017-10-20 14:49:29 +00:00
parent 57b7937af8
commit 339cf92137
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/src/hip_hcc.cpp
+17 -12
View File
@@ -695,26 +695,26 @@ int checkAccess(hsa_agent_t agent, hsa_amd_memory_pool_t pool)
return access;
}
hsa_status_t get_region_info(hsa_region_t region, void* data)
hsa_status_t get_pool_info(hsa_amd_memory_pool_t pool, void* data)
{
hsa_status_t err;
hipDeviceProp_t* p_prop = reinterpret_cast<hipDeviceProp_t*>(data);
uint32_t region_segment;
// Get region segment
err = hsa_region_get_info(region, HSA_REGION_INFO_SEGMENT, &region_segment);
// Get pool segment
err = hsa_amd_memory_pool_get_info(pool, HSA_AMD_MEMORY_POOL_INFO_SEGMENT, &region_segment);
ErrorCheck(err);
switch(region_segment) {
case HSA_REGION_SEGMENT_READONLY:
err = hsa_region_get_info(region, HSA_REGION_INFO_SIZE, &(p_prop->totalConstMem)); break;
/* case HSA_REGION_SEGMENT_PRIVATE:
cout<<"PRIVATE"<<endl; private segment cannot be queried */
err = hsa_amd_memory_pool_get_info(pool, HSA_AMD_MEMORY_POOL_INFO_SIZE, &(p_prop->totalConstMem)); break;
case HSA_REGION_SEGMENT_GROUP:
err = hsa_region_get_info(region, HSA_REGION_INFO_SIZE, &(p_prop->sharedMemPerBlock)); break;
err = hsa_amd_memory_pool_get_info(pool, HSA_AMD_MEMORY_POOL_INFO_SIZE, &(p_prop->sharedMemPerBlock));
printf ("shared_mem err=%d mem=%zu\n", err, p_prop->sharedMemPerBlock);
break;
default: break;
}
return HSA_STATUS_SUCCESS;
return err;
}
@@ -748,8 +748,10 @@ hipError_t ihipDevice_t::initProperties(hipDeviceProp_t* prop)
// Set some defaults in case we don't find the appropriate regions:
prop->totalGlobalMem = 0;
prop->totalConstMem = 0;
prop-> maxThreadsPerMultiProcessor = 0;
prop->maxThreadsPerMultiProcessor = 0;
prop->regsPerBlock = 0;
prop->totalConstMem = 0;
prop->sharedMemPerBlock = 0;
if (_hsaAgent.handle == -1) {
return hipErrorInvalidDevice;
@@ -849,15 +851,18 @@ hipError_t ihipDevice_t::initProperties(hipDeviceProp_t* prop)
prop-> maxThreadsPerMultiProcessor = prop->warpSize*max_waves_per_cu;
// Get memory properties
err = hsa_agent_iterate_regions(_hsaAgent, get_region_info, prop);
err = hsa_amd_agent_iterate_memory_pools(_hsaAgent, get_pool_info, prop);
if (err == HSA_STATUS_INFO_BREAK) {
err = HSA_STATUS_SUCCESS;
}
DeviceErrorCheck(err);
// Get the size of the region we are using for Accelerator Memory allocations:
// Get the size of the pool we are using for Accelerator Memory allocations:
hsa_region_t *am_region = static_cast<hsa_region_t*>(_acc.get_hsa_am_region());
err = hsa_region_get_info(*am_region, HSA_REGION_INFO_SIZE, &prop->totalGlobalMem);
DeviceErrorCheck(err);
// maxSharedMemoryPerMultiProcessor should be as the same as group memory size.
// Group memory will not be paged out, so, the physical memory size is the total shared memory size, and also equal to the group region size.
// Group memory will not be paged out, so, the physical memory size is the total shared memory size, and also equal to the group pool size.
prop->maxSharedMemoryPerMultiProcessor = prop->totalGlobalMem;
// Get Max memory clock frequency