P4 to Git Change 2016080 by gandryey@gera-win10 on 2019/10/18 13:08:03

SWDEV-204511 - [NV14 XTM] OpenCL Conformance Test Fails
	- Handle different ABI versions for LC and HSAIL if single context with multiple devices was used. LC changed the locaiton of hidden arguments and HSAIL path requires patching

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#83 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#30 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#105 edit


[ROCm/clr commit: 50ad4d1a7f]
This commit is contained in:
foreman
2019-10-18 13:20:55 -04:00
parent c39962ebf4
commit b540d82392
5 changed files with 31 additions and 14 deletions
@@ -635,7 +635,8 @@ bool Program::ParseAllOptions(const std::string& options, option::Options& parse
bool Symbol::setDeviceKernel(const Device& device, const device::Kernel* func) {
if (deviceKernels_.size() == 0 ||
(func->signature().version() > KernelSignature::ABIVersion_0)) {
// Always pick the most recent version in MGPU case
(func->signature().version() > signature_.version())) {
signature_ = func->signature();
}
deviceKernels_[&device] = func;