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

P4 to Git Change 1358358 by wchau@wchau_OCL_boltzmann on 2017/01/04 10:21:31

Browse Source 
SWDEV-102698 - Back out changelist 1358063

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#147 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/Makefile#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#66 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#206 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#281 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#262 edit


[ROCm/clr commit: ff99f1f762]
This commit is contained in:
foreman
2017-01-04 10:26:13 -05:00
parent e762915068
commit 028e415521
9 changed files with 26 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/rocclr/runtime/device/rocm/rocdevice.cpp
+2 -25
View File
@@ -296,7 +296,7 @@ bool NullDevice::init() {
bool isOnline = false;
//Check if the particular device is online
for (unsigned int i=0; i< devices.size(); i++) {
if (static_cast<NullDevice*>(devices[i])->deviceInfo_.hsaDeviceId_ ==
if (static_cast<NullDevice*>(devices[i])->deviceInfo_.hsaDeviceId_ ==
DeviceInfo[id].hsaDeviceId_){
isOnline = true;
}
@@ -588,29 +588,6 @@ Device::mapHSADeviceToOpenCLDevice(hsa_agent_t dev)
}
}
#if defined(WITH_LIGHTNING_COMPILER)
// create compilation object with cache support
int gfxipMajor = deviceInfo_.gfxipVersion_ / 100;
int gfxipMinor = deviceInfo_.gfxipVersion_ / 10 % 10;
int gfxipStepping = deviceInfo_.gfxipVersion_ % 10;
// Use compute capability as target (AMD:AMDGPU:major:minor:stepping)
// with dash as delimiter to be compatible with Windows directory name
std::ostringstream cacheTarget;
cacheTarget << "AMD-AMDGPU-" << gfxipMajor << "-" << gfxipMinor << "-" << gfxipStepping;
amd::CacheCompilation* compObj = new amd::CacheCompilation(cacheTarget.str(),
"_rocm",
hsaSettings->enableCodeCache_,
hsaSettings->resetCodeCache_);
if (!compObj) {
LogError("Unable to create cache compilation object!");
return false;
}
cacheCompilation_.reset(compObj);
#endif
return true;
}
@@ -1099,7 +1076,7 @@ Device::bindExternalDevice(
#else
if((flags&amd::Context::GLDeviceKhr)==0)
return false;
MesaInterop::MESA_INTEROP_KIND kind=MesaInterop::MESA_INTEROP_NONE;
MesaInterop::DisplayHandle display;
MesaInterop::ContextHandle context;