P4 to Git Change 1201490 by xcui@merged_opencl_jxcwin on 2015/10/20 10:47:18

SWDEV-41018 -  if system is equal to or less than 2GB memory, disable CPU and APU for OpenCL, and force the device to be 1.2 if it is a discrete GPU.

	precheckin:
	http://ocltc.amd.com:8111/viewModification.html?modId=60516&personal=true&buildTypeId=&tab=vcsModificationBuilds&show_all_builds=true
	code review:
	http://ocltc.amd.com/reviews/r/8738/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/cpu/cpudevice.cpp#277 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#531 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#331 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.hpp#95 edit
This commit is contained in:
foreman
2015-10-20 11:02:14 -04:00
parent 3b9fcfeb89
commit 25bfbb8085
4 changed files with 21 additions and 2 deletions
+7 -2
View File
@@ -762,9 +762,14 @@ Device::create(CALuint ordinal, CALuint numOfDevices)
{
appProfile_.init();
bool smallMemSystem = false;
if (amd::Os::hostTotalPhysicalMemory() < 2 * Gi) {
smallMemSystem = true;
}
// Open GSL device
if (!open(ordinal, appProfile_.enableHighPerformanceState(),
appProfile_.reportAsOCL12Device() || (OPENCL_VERSION < 200))) {
smallMemSystem || appProfile_.reportAsOCL12Device() || (OPENCL_VERSION < 200))) {
return false;
}
@@ -776,7 +781,7 @@ Device::create(CALuint ordinal, CALuint numOfDevices)
settings_ = new gpu::Settings();
gpu::Settings* gpuSettings = reinterpret_cast<gpu::Settings*>(settings_);
if ((gpuSettings == NULL) || !gpuSettings->create(getAttribs()
, appProfile_.reportAsOCL12Device()
, appProfile_.reportAsOCL12Device(), smallMemSystem
)) {
return false;
}