From ccfe405f9335fc26a1480a4811b9ef9ba121468f Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 14 Sep 2017 16:26:32 -0400 Subject: [PATCH] P4 to Git Change 1459027 by wchau@wchau_OCL_boltzmann on 2017/09/14 15:39:04 SWDEV-111439 - Add query for preferred constant size Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#67 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp#7 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h#18 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp#9 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h#34 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp#6 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h#11 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp#5 edit ... //depot/stg/opencl/drivers/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h#5 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#291 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#575 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#61 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#61 edit [ROCm/clr commit: 86c8a6705995681c6a62d2ca9c74881e36b79a84] --- projects/clr/opencl/api/opencl/amdocl/cl_device.cpp | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp | 3 +++ .../opencl/api/opencl/khronos/headers/opencl1.2/CL/cl_ext.h | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp | 3 +++ .../opencl/api/opencl/khronos/headers/opencl2.0/CL/cl_ext.h | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp | 3 +++ .../opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h | 1 + .../clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp | 3 +++ .../opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h | 1 + 9 files changed, 17 insertions(+) diff --git a/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp b/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp index 3882a98df2..6e5f8d7f35 100644 --- a/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp +++ b/projects/clr/opencl/api/opencl/amdocl/cl_device.cpp @@ -290,6 +290,7 @@ RUNTIME_ENTRY(cl_int, clGetDeviceInfo, CASE(CL_DEVICE_GLOBAL_MEM_CACHE_SIZE, globalMemCacheSize_); CASE(CL_DEVICE_GLOBAL_MEM_SIZE, globalMemSize_); CASE(CL_DEVICE_MAX_CONSTANT_BUFFER_SIZE, maxConstantBufferSize_); + CASE(CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD, preferredConstantBufferSize_); CASE(CL_DEVICE_MAX_CONSTANT_ARGS, maxConstantArgs_); CASE(CL_DEVICE_LOCAL_MEM_TYPE, localMemType_); CASE(CL_DEVICE_LOCAL_MEM_SIZE, localMemSize_); diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp b/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp index bd64d4b3bd..71e55e0678 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl1.2/CL/cl.hpp @@ -1547,6 +1547,9 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AM #ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t) #endif +#ifdef CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD +__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD, ::size_t) +#endif #ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint) 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 d1940d40de..063a05dc04 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 @@ -209,6 +209,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / #define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C #define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030 #define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031 +#define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033 typedef union { diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp index bd64d4b3bd..71e55e0678 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.0/CL/cl.hpp @@ -1547,6 +1547,9 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AM #ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t) #endif +#ifdef CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD +__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD, ::size_t) +#endif #ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint) 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 09d722c44c..b5cda826a9 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 @@ -228,6 +228,7 @@ typedef CL_API_ENTRY cl_program #define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C #define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030 #define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031 +#define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033 typedef union { diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp index bd64d4b3bd..71e55e0678 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl.hpp @@ -1547,6 +1547,9 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AM #ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t) #endif +#ifdef CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD +__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD, ::size_t) +#endif #ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint) diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h index e9976ae44b..06ff98af6d 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.1/CL/cl_ext.h @@ -209,6 +209,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / #define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C #define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030 #define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031 +#define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033 typedef union { diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp index bd64d4b3bd..71e55e0678 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl.hpp @@ -1547,6 +1547,9 @@ __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AM #ifdef CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD, ::size_t) #endif +#ifdef CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD +__CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD, ::size_t) +#endif #ifdef CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV __CL_DECLARE_PARAM_TRAITS(cl_device_info, CL_DEVICE_COMPUTE_CAPABILITY_MAJOR_NV, cl_uint) diff --git a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h index 5535f5b5d9..2c0eab3c62 100644 --- a/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h +++ b/projects/clr/opencl/api/opencl/khronos/headers/opencl2.2/CL/cl_ext.h @@ -209,6 +209,7 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *clTerminateContextKHR_fn)(cl_context / #define CL_DEVICE_AVAILABLE_ASYNC_QUEUES_AMD 0x404C #define CL_DEVICE_PREFERRED_WORK_GROUP_SIZE_AMD 0x4030 #define CL_DEVICE_MAX_WORK_GROUP_SIZE_AMD 0x4031 +#define CL_DEVICE_PREFERRED_CONSTANT_BUFFER_SIZE_AMD 0x4033 typedef union {