From c4731771e0606b717d4ecf2dbfa949cc7abb6572 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 27 Aug 2018 14:44:08 -0400 Subject: [PATCH] P4 to Git Change 1598525 by gandryey@gera-ocl-lc on 2018/08/27 14:28:05 SWDEV-79445 - OCL generic changes and code clean-up - Setup KernelParameterDescriptor directly from the binary's metadata without any intermediate arguments presentation. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#50 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#312 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#60 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#19 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palvirtual.cpp#122 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#66 edit [ROCm/clr commit: a144820c40a478a35f60ec1a4ec55fbd31dfa0c9] --- 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 836e7b9b69..3a2c15a4a3 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_program.cpp @@ -1706,16 +1706,18 @@ RUNTIME_ENTRY(cl_int, clGetKernelArgInfo, return amd::clGetInfo(qualifier, param_value_size, param_value, param_value_size_ret); } case CL_KERNEL_ARG_TYPE_NAME: { + const char* typeName = desc.typeName_.c_str(); // Return the argument's type name - return amd::clGetInfo(desc.typeName_, param_value_size, param_value, param_value_size_ret); + return amd::clGetInfo(typeName, param_value_size, param_value, param_value_size_ret); } case CL_KERNEL_ARG_TYPE_QUALIFIER: { cl_kernel_arg_type_qualifier qualifier = desc.typeQualifier_; return amd::clGetInfo(qualifier, param_value_size, param_value, param_value_size_ret); } case CL_KERNEL_ARG_NAME: { + const char* name = desc.name_.c_str(); // Return the argument's name - return amd::clGetInfo(desc.name_, param_value_size, param_value, param_value_size_ret); + return amd::clGetInfo(name, param_value_size, param_value, param_value_size_ret); } default: return CL_INVALID_VALUE;