From fb5a2cf1c3c437c864a24a21e5ee3baaa5e23120 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 3 Feb 2015 10:13:23 -0500 Subject: [PATCH] P4 to Git Change 1117979 by jatang@jatang-opencl-hsa-stg1 on 2015/02/03 10:05:21 EPR #412821 - Add CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD to cl_amd_device_attribute_query. Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#56 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#8 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#15 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#239 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#493 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#105 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#43 edit [ROCm/clr commit: 1ebc42fdf920c8263b4941b0d0f0fc75c3a64af0] --- projects/clr/opencl/api/opencl/amdocl/cl_device.cpp | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h | 1 + 3 files changed, 3 insertions(+) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp index ce29653566..4d2e35c943 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp @@ -644,6 +644,7 @@ RUNTIME_ENTRY(cl_int, clGetDeviceInfo, ( return amd::clGetInfo( minor, param_value_size, param_value, param_value_size_ret); } + CASE(CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD, numAsyncQueues_); default: break; } diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h index 1ff16d8906..0c07213657 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h @@ -235,6 +235,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clGetKernelSubGroupInfoKHR_fn)( #define CL_DEVICE_THREAD_TRACE_SUPPORTED_AMD 0x4049 #define CL_DEVICE_GFXIP_MAJOR_AMD 0x404A #define CL_DEVICE_GFXIP_MINOR_AMD 0x404B +#define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C typedef union { diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h index 3a27c92089..b866f561bb 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h @@ -200,6 +200,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / #define CL_DEVICE_THREAD_TRACE_SUPPORTED_AMD 0x4049 #define CL_DEVICE_GFXIP_MAJOR_AMD 0x404A #define CL_DEVICE_GFXIP_MINOR_AMD 0x404B +#define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C typedef union {