Cleaned up module api

- Moved HIP_INIT_API from internal to all public apis
- renamed hipLaunchModuleKernel to hipModuleLaunchKernel
- Changed tests according to the changed api

Change-Id: I822ff63c7c5b7dad340ece49456baf9d89428e9f
このコミットが含まれているのは:
Aditya Atluri
2016-08-28 16:48:57 -05:00
コミット 71991ed8f8
4個のファイルの変更11行の追加11行の削除
+1 -1
ファイルの表示
@@ -1152,7 +1152,7 @@ hipError_t hipModuleGetGlobal(hipDeviceptr *dptr, size_t *bytes, hipModule_t hmo
hipError_t hipModuleLoadData(hipModule_t *module, const void *image);
hipError_t hipLaunchModuleKernel(hipFunction_t f,
hipError_t hipModuleLaunchKernel(hipFunction_t f,
unsigned int gridDimX,
unsigned int gridDimY,
unsigned int gridDimZ,
+8 -8
ファイルの表示
@@ -170,7 +170,6 @@ hipError_t hipModuleUnload(hipModule_t hmod){
}
hipError_t ihipModuleGetFunction(hipFunction_t *func, hipModule_t hmod, const char *name){
HIP_INIT_API(name);
auto ctx = ihipGetTlsDefaultCtx();
hipError_t ret = hipSuccess;
@@ -206,20 +205,17 @@ hipError_t ihipModuleGetFunction(hipFunction_t *func, hipModule_t hmod, const ch
if(status != HSA_STATUS_SUCCESS){
return hipErrorNotFound;
}
}
return ret;
}
hipError_t hipModuleGetFunction(hipFunction_t *hfunc, hipModule_t hmod,
const char *name)
{
const char *name){
HIP_INIT_API(name);
return ihipModuleGetFunction(hfunc, hmod, name);
}
hipError_t hipLaunchModuleKernel(hipFunction_t f,
hipError_t hipModuleLaunchKernel(hipFunction_t f,
uint32_t gridDimX, uint32_t gridDimY, uint32_t gridDimZ,
uint32_t blockDimX, uint32_t blockDimY, uint32_t blockDimZ,
uint32_t sharedMemBytes, hipStream_t hStream,
@@ -286,6 +282,7 @@ Kernel argument preparation.
hipError_t hipModuleGetGlobal(hipDeviceptr *dptr, size_t *bytes,
hipModule_t hmod, const char* name){
HIP_INIT_API(name);
hipError_t ret = hipSuccess;
if(dptr == NULL || bytes == NULL){
return hipErrorInvalidValue;
@@ -303,7 +300,8 @@ hipError_t hipModuleGetGlobal(hipDeviceptr *dptr, size_t *bytes,
}
hipError_t hipModuleLoadData(hipModule_t *module, const void *image){
hipError_t ret;
HIP_INIT_API(image);
hipError_t ret = hipSuccess;
if(image == NULL || module == NULL){
return hipErrorNotInitialized;
}else{
@@ -345,3 +343,5 @@ hipError_t hipModuleLoadData(hipModule_t *module, const void *image){
}
return ret;
}
+1 -1
ファイルの表示
@@ -71,7 +71,7 @@ int main(){
HIP_LAUNCH_PARAM_END
};
hipLaunchModuleKernel(Function, 1, 1, 1, LEN, 1, 1, 0, stream, NULL, (void**)&config);
hipModuleLaunchKernel(Function, 1, 1, 1, LEN, 1, 1, 0, stream, NULL, (void**)&config);
hipStreamDestroy(stream);
+1 -1
ファイルの表示
@@ -24,7 +24,7 @@ THE SOFTWARE.
#define fileName "vcpy_isa.co"
int main(){
hipModule module;
hipModule_t module;
hipModuleLoad(&module, fileName);
hipModuleUnload(module);
}