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

P4 to Git Change 1552021 by gandryey@gera-w8 on 2018/05/08 15:00:13

Browse Source 
SWDEV-151981 - Removal of CPU support on Windows
	- Part 5. Remove runtime logic that considered CPU device support.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd.cpp#33 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#47 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/command.cpp#83 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/memory.cpp#130 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#92 edit
This commit is contained in:
foreman
2018-05-08 15:47:58 -04:00
parent 32bca51906
commit dc9e8417cb
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opencl/api/opencl/amdocl/cl_icd.cpp
+1 -2
View File
@@ -222,8 +222,7 @@ CL_API_ENTRY cl_int CL_API_CALL clIcdGetPlatformIDsKHR(cl_uint num_entries,
}
if (num_platforms != NULL && platforms == NULL) {
int numDevices = amd::Device::numDevices(CL_DEVICE_TYPE_CPU, false) +
amd::Device::numDevices(CL_DEVICE_TYPE_GPU, false);
int numDevices = amd::Device::numDevices(CL_DEVICE_TYPE_GPU, false);
if (numDevices == 0) {
*num_platforms = 0;
return CL_INVALID_PLATFORM;
opencl/api/opencl/amdocl/cl_program.cpp
+7 -20
View File
@@ -1913,11 +1913,8 @@ RUNTIME_ENTRY(cl_int, clGetKernelSubGroupInfo,
workGroupSize *= ((size_t*)input_value)[i];
}
// Get the subgroup size. CPU devices only have one subgroup
// per workgroup. GPU devices sub-groups are wavefronts.
size_t subGroupSize = as_amd(device)->type() == CL_DEVICE_TYPE_CPU
? workGroupSize
: as_amd(device)->info().wavefrontWidth_;
// Get the subgroup size. GPU devices sub-groups are wavefronts.
size_t subGroupSize = as_amd(device)->info().wavefrontWidth_;
size_t numSubGroups = (workGroupSize + subGroupSize - 1) / subGroupSize;
@@ -1933,8 +1930,7 @@ RUNTIME_ENTRY(cl_int, clGetKernelSubGroupInfo,
}
case CL_KERNEL_MAX_NUM_SUB_GROUPS: {
size_t waveSize = as_amd(device)->info().wavefrontWidth_;
size_t numSubGroups = as_amd(device)->type() == CL_DEVICE_TYPE_CPU
? 1 : (devKernel->workGroupInfo()->size_ + waveSize - 1) / waveSize;
size_t numSubGroups = (devKernel->workGroupInfo()->size_ + waveSize - 1) / waveSize;
return amd::clGetInfo(numSubGroups, param_value_size, param_value, param_value_size_ret);
}
case CL_KERNEL_LOCAL_SIZE_FOR_SUB_GROUP_COUNT: {
@@ -1951,19 +1947,10 @@ RUNTIME_ENTRY(cl_int, clGetKernelSubGroupInfo,
*not_null(param_value_size_ret) = param_value_size;
size_t localSize;
if (as_amd(device)->type() == CL_DEVICE_TYPE_CPU) {
if (numSubGroups != 1) {
::memset(param_value, '\0', dims * sizeof(size_t));
return CL_SUCCESS;
}
localSize = devKernel->workGroupInfo()->size_;
}
else {
localSize = numSubGroups * as_amd(device)->info().wavefrontWidth_;
if (localSize > devKernel->workGroupInfo()->size_) {
::memset(param_value, '\0', dims * sizeof(size_t));
return CL_SUCCESS;
}
localSize = numSubGroups * as_amd(device)->info().wavefrontWidth_;
if (localSize > devKernel->workGroupInfo()->size_) {
::memset(param_value, '\0', dims * sizeof(size_t));
return CL_SUCCESS;
}
switch (dims) {