From 09d6e70f9fd1a05a2c623453e7cecdb19b97b772 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 8 Jan 2019 12:13:48 -0500 Subject: [PATCH] P4 to Git Change 1727393 by gandryey@gera-w8 on 2019/01/08 11:35:08 SWDEV-79445 - OCL generic changes and code clean-up - Allow LC to execute 64bit GPU binaries with 32 bit OCL runtime. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#51 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#122 edit [ROCm/clr commit: 3574cc00d36b199d4eb9d57b378aec589ed774c8] --- projects/clr/opencl/api/opencl/amdocl/cl_program.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp index 3a2c15a4a3..7bd772a8f9 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp @@ -1562,8 +1562,10 @@ RUNTIME_ENTRY(cl_int, clSetKernelArg, } } if ((!is_local && (arg_size != desc.size_)) || (is_local && (arg_size == 0))) { - as_amd(kernel)->parameters().reset(static_cast(arg_index)); - return CL_INVALID_ARG_SIZE; + if (LP64_ONLY(true ||) (desc.type_ != T_POINTER) || (arg_size != sizeof(void*))) { + as_amd(kernel)->parameters().reset(static_cast(arg_index)); + return CL_INVALID_ARG_SIZE; + } } as_amd(kernel)->parameters().set(static_cast(arg_index), arg_size, arg_value);