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
 {