From 3fbe0620083afdfe58dc143c439fcb53fa9ab17f Mon Sep 17 00:00:00 2001 From: Aditya Atluri Date: Fri, 2 Sep 2016 09:44:00 -0500 Subject: [PATCH] added logger for return status Change-Id: Ib93012a15b1cfa90714a6ebd5153cc40e28e6566 --- hipamd/src/hip_module.cpp | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/hipamd/src/hip_module.cpp b/hipamd/src/hip_module.cpp index f81c5efa67..456d3725b8 100644 --- a/hipamd/src/hip_module.cpp +++ b/hipamd/src/hip_module.cpp @@ -104,7 +104,7 @@ hipError_t hipModuleLoad(hipModule_t *module, const char *fname){ *module = new ihipModule_t; if(module == NULL){ - return hipErrorInvalidValue; + return ihipLogStatus(hipErrorInvalidValue); } auto ctx = ihipGetTlsDefaultCtx(); @@ -117,7 +117,7 @@ hipError_t hipModuleLoad(hipModule_t *module, const char *fname){ std::ifstream in(fname, std::ios::binary | std::ios::ate); if(!in){ - return hipErrorFileNotFound; + return ihipLogStatus(hipErrorFileNotFound); }else{ @@ -130,12 +130,12 @@ hipError_t hipModuleLoad(hipModule_t *module, const char *fname){ status = hsa_memory_allocate(sysRegion, size, (void**)&p); if(status != HSA_STATUS_SUCCESS){ - return hipErrorOutOfMemory; + return ihipLogStatus(hipErrorOutOfMemory); } char *ptr = (char*)p; if(!ptr){ - return hipErrorOutOfMemory; + return ihipLogStatus(hipErrorOutOfMemory); } (*module)->ptr = p; (*module)->size = size; @@ -146,17 +146,17 @@ hipError_t hipModuleLoad(hipModule_t *module, const char *fname){ status = hsa_code_object_deserialize(ptr, size, NULL, &(*module)->object); if(status != HSA_STATUS_SUCCESS){ - return hipErrorSharedObjectInitFailed; + return ihipLogStatus(hipErrorSharedObjectInitFailed); } status = hsa_executable_create(HSA_PROFILE_FULL, HSA_EXECUTABLE_STATE_UNFROZEN, NULL, &(*module)->executable); if(status != HSA_STATUS_SUCCESS){ - return hipErrorNotInitialized; + return ihipLogStatus(hipErrorNotInitialized); } } } - return ret; + return ihipLogStatus(ret); } hipError_t hipModuleUnload(hipModule_t hmod){ @@ -172,7 +172,7 @@ hipError_t hipModuleUnload(hipModule_t hmod){ ret = hipErrorInvalidValue; } delete hmod; - return ret; + return ihipLogStatus(ret); } hipError_t ihipModuleGetFunction(hipFunction_t *func, hipModule_t hmod, const char *name){ @@ -180,7 +180,7 @@ hipError_t ihipModuleGetFunction(hipFunction_t *func, hipModule_t hmod, const ch hipError_t ret = hipSuccess; if(name == nullptr){ - return hipErrorInvalidValue; + return ihipLogStatus(hipErrorInvalidValue); } if(ctx == nullptr){ @@ -195,13 +195,13 @@ hipError_t ihipModuleGetFunction(hipFunction_t *func, hipModule_t hmod, const ch hsa_status_t status; status = hsa_executable_load_code_object(hmod->executable, gpuAgent, hmod->object, NULL); if(status != HSA_STATUS_SUCCESS){ - return hipErrorNotInitialized; + return ihipLogStatus(hipErrorNotInitialized); } status = hsa_executable_freeze(hmod->executable, NULL); status = hsa_executable_get_symbol(hmod->executable, NULL, name, gpuAgent, 0, &(*func)->kernel_symbol); if(status != HSA_STATUS_SUCCESS){ - return hipErrorNotFound; + return ihipLogStatus(hipErrorNotFound); } status = hsa_executable_symbol_get_info((*func)->kernel_symbol, @@ -209,10 +209,10 @@ hipError_t ihipModuleGetFunction(hipFunction_t *func, hipModule_t hmod, const ch &(*func)->kernel); if(status != HSA_STATUS_SUCCESS){ - return hipErrorNotFound; + return ihipLogStatus(hipErrorNotFound); } } - return ret; + return ihipLogStatus(ret); } hipError_t hipModuleGetFunction(hipFunction_t *hfunc, hipModule_t hmod, @@ -246,10 +246,10 @@ hipError_t hipModuleLaunchKernel(hipFunction_t f, if(config[0] == HIP_LAUNCH_PARAM_BUFFER_POINTER && config[2] == HIP_LAUNCH_PARAM_BUFFER_SIZE && config[4] == HIP_LAUNCH_PARAM_END){ kernSize = *(size_t*)(config[3]); }else{ - return hipErrorNotInitialized; + return ihipLogStatus(hipErrorNotInitialized); } }else{ - return hipErrorInvalidValue; + return ihipLogStatus(hipErrorInvalidValue); } /* Kernel argument preparation. @@ -282,7 +282,7 @@ Kernel argument preparation. } - return ret; + return ihipLogStatus(ret); } @@ -291,17 +291,17 @@ hipError_t hipModuleGetGlobal(hipDeviceptr_t *dptr, size_t *bytes, HIP_INIT_API(name); hipError_t ret = hipSuccess; if(dptr == NULL || bytes == NULL){ - return hipErrorInvalidValue; + return ihipLogStatus(hipErrorInvalidValue); } if(name == NULL || hmod == NULL){ - return hipErrorNotInitialized; + return ihipLogStatus(hipErrorNotInitialized); } else{ hipFunction_t func; ihipModuleGetFunction(&func, hmod, name); *bytes = PrintSymbolSizes(hmod->ptr, name) + sizeof(amd_kernel_code_t); *dptr = reinterpret_cast(func->kernel); - return ret; + return ihipLogStatus(ret); } } @@ -309,7 +309,7 @@ hipError_t hipModuleLoadData(hipModule_t *module, const void *image){ HIP_INIT_API(image); hipError_t ret = hipSuccess; if(image == NULL || module == NULL){ - return hipErrorNotInitialized; + return ihipLogStatus(hipErrorNotInitialized); }else{ auto ctx = ihipGetTlsDefaultCtx(); *module = new ihipModule_t; @@ -324,12 +324,12 @@ hipError_t hipModuleLoadData(hipModule_t *module, const void *image){ status = hsa_memory_allocate(sysRegion, size, (void**)&p); if(status != HSA_STATUS_SUCCESS){ - return hipErrorOutOfMemory; + return ihipLogStatus(hipErrorOutOfMemory); } char *ptr = (char*)p; if(!ptr){ - return hipErrorOutOfMemory; + return ihipLogStatus(hipErrorOutOfMemory); } (*module)->ptr = p; (*module)->size = size; @@ -339,15 +339,15 @@ hipError_t hipModuleLoadData(hipModule_t *module, const void *image){ status = hsa_code_object_deserialize(ptr, size, NULL, &(*module)->object); if(status != HSA_STATUS_SUCCESS){ - return hipErrorSharedObjectInitFailed; + return ihipLogStatus(hipErrorSharedObjectInitFailed); } status = hsa_executable_create(HSA_PROFILE_FULL, HSA_EXECUTABLE_STATE_UNFROZEN, NULL, &(*module)->executable); if(status != HSA_STATUS_SUCCESS){ - return hipErrorNotInitialized; + return ihipLogStatus(hipErrorNotInitialized); } } - return ret; + return ihipLogStatus(ret); }