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

changed flag in hipHostRegister

Browse Source
This commit is contained in:
Aditya Atluri
2016-03-16 08:01:53 -05:00
parent b768568902
commit 1e588e56e0
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hip_hcc.cpp
+3 -11
View File
@@ -2055,9 +2055,7 @@ hipError_t hipHostAlloc(void** ptr, size_t sizeBytes, unsigned int flags){
if(device){ if(device){
if(flags == hipHostAllocDefault){ if(flags == hipHostAllocDefault){
const unsigned am_flags = amHostPinned; *ptr = hc::am_alloc(sizeBytes, device->_acc, amHostPinned);
*ptr = hc::am_alloc(sizeBytes, device->_acc, am_flags);
if(sizeBytes && (*ptr == NULL)){ if(sizeBytes && (*ptr == NULL)){
hip_status = hipErrorMemoryAllocation; hip_status = hipErrorMemoryAllocation;
}else{ }else{
@@ -2066,17 +2064,11 @@ hipError_t hipHostAlloc(void** ptr, size_t sizeBytes, unsigned int flags){
tprintf(DB_MEM, " %s: pinned ptr=%p\n", __func__, *ptr); tprintf(DB_MEM, " %s: pinned ptr=%p\n", __func__, *ptr);
} }
if(flags & hipHostAllocMapped){ if(flags & hipHostAllocMapped){
const unsigned am_flags = amHostPinned; *ptr = hc::am_alloc(sizeBytes, device->_acc, amHostPinned);
*ptr = hc::am_alloc(sizeBytes, device->_acc, am_flags);
if(sizeBytes && (*ptr == NULL)){ if(sizeBytes && (*ptr == NULL)){
hip_status = hipErrorMemoryAllocation; hip_status = hipErrorMemoryAllocation;
}else{ }else{
hc::am_memtracker_update(*ptr, device->_device_index, flags); hc::am_memtracker_update(*ptr, device->_device_index, flags);
// void *srcPtr;
// hsa_status_t hsa_status = hsa_amd_memory_lock((*ptr), sizeBytes, &device->_hsa_agent, 1, &srcPtr);
// assert(hsa_status == HSA_STATUS_SUCCESS);
// hc::am_memtracker_add(srcPtr, sizeBytes, device->_acc, false);
} }
tprintf(DB_MEM, " %s: pinned ptr=%p\n", __func__, *ptr); tprintf(DB_MEM, " %s: pinned ptr=%p\n", __func__, *ptr);
} }
@@ -2142,7 +2134,7 @@ hipError_t hipHostRegister(void *hostPtr, size_t sizeBytes, unsigned int flags)
return ihipLogStatus(hipErrorInvalidValue); return ihipLogStatus(hipErrorInvalidValue);
} }
if(device){ if(device){
if(flags == hipHostAllocDefault){ if(flags == hipHostRegisterDefault){
hsa_status_t hsa_status = hsa_amd_memory_lock(hostPtr, sizeBytes, &device->_hsa_agent, 1, &srcPtr); hsa_status_t hsa_status = hsa_amd_memory_lock(hostPtr, sizeBytes, &device->_hsa_agent, 1, &srcPtr);
if(hsa_status == HSA_STATUS_SUCCESS){ if(hsa_status == HSA_STATUS_SUCCESS){
hip_status = hipSuccess; hip_status = hipSuccess;