diff --git a/CL/cl_ext.h b/CL/cl_ext.h
index 657cca92..d98e81d9 100644
--- a/CL/cl_ext.h
+++ b/CL/cl_ext.h
@@ -2301,20 +2301,12 @@ clRetainSemaphoreKHR(
     "cl_arm_import_memory"
 
 
-#define CL_ARM_IMPORT_MEMORY_EXTENSION_VERSION CL_MAKE_VERSION(0, 0, 0)
+#define CL_ARM_IMPORT_MEMORY_EXTENSION_VERSION CL_MAKE_VERSION(1, 1, 0)
 
 typedef intptr_t            cl_import_properties_arm;
 
 /* cl_import_properties_arm */
 #define CL_IMPORT_TYPE_ARM                                  0x40B2
-#define CL_IMPORT_TYPE_HOST_ARM                             0x40B3
-#define CL_IMPORT_TYPE_DMA_BUF_ARM                          0x40B4
-#define CL_IMPORT_TYPE_PROTECTED_ARM                        0x40B5
-#define CL_IMPORT_TYPE_ANDROID_HARDWARE_BUFFER_ARM          0x41E2
-#define CL_IMPORT_DMA_BUF_DATA_CONSISTENCY_WITH_HOST_ARM    0x41E3
-#define CL_IMPORT_MEMORY_WHOLE_ALLOCATION_ARM               SIZE_MAX
-#define CL_IMPORT_ANDROID_HARDWARE_BUFFER_PLANE_INDEX_ARM   0x41EF
-#define CL_IMPORT_ANDROID_HARDWARE_BUFFER_LAYER_INDEX_ARM   0x41F0
 
 
 typedef cl_mem CL_API_CALL
@@ -2569,23 +2561,6 @@ clSetKernelExecInfoARM(
 
 #endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
 
-/***************************************************************
-* cl_arm_get_core_id
-***************************************************************/
-#if defined(CL_VERSION_1_2)
-
-#define cl_arm_get_core_id 1
-#define CL_ARM_GET_CORE_ID_EXTENSION_NAME \
-    "cl_arm_get_core_id"
-
-
-#define CL_ARM_GET_CORE_ID_EXTENSION_VERSION CL_MAKE_VERSION(0, 0, 0)
-
-/* cl_device_info */
-#define CL_DEVICE_COMPUTE_UNITS_BITFIELD_ARM                0x40BF
-
-#endif /* defined(CL_VERSION_1_2) */
-
 /***************************************************************
 * cl_arm_job_slot_selection
 ***************************************************************/
@@ -4590,6 +4565,129 @@ clSetKernelArgDevicePointerEXT(
 /* cl_mem_flags */
 #define CL_MEM_IMMUTABLE_EXT                                (1 << 6)
 
+/***************************************************************
+* cl_arm_core_id
+***************************************************************/
+#if defined(CL_VERSION_1_2)
+
+#define cl_arm_core_id 1
+#define CL_ARM_CORE_ID_EXTENSION_NAME \
+    "cl_arm_core_id"
+
+
+#define CL_ARM_CORE_ID_EXTENSION_VERSION CL_MAKE_VERSION(0, 0, 0)
+
+/* cl_device_info */
+#define CL_DEVICE_COMPUTE_UNITS_BITFIELD_ARM                0x40BF
+
+#endif /* defined(CL_VERSION_1_2) */
+
+/***************************************************************
+* cl_arm_import_memory_android_hardware_buffer
+***************************************************************/
+#define cl_arm_import_memory_android_hardware_buffer 1
+#define CL_ARM_IMPORT_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME \
+    "cl_arm_import_memory_android_hardware_buffer"
+
+
+#define CL_ARM_IMPORT_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_VERSION CL_MAKE_VERSION(1, 1, 0)
+
+/* cl_import_properties_arm */
+#define CL_IMPORT_TYPE_ANDROID_HARDWARE_BUFFER_ARM          0x41E2
+#define CL_IMPORT_ANDROID_HARDWARE_BUFFER_PLANE_INDEX_ARM   0x41EF
+#define CL_IMPORT_ANDROID_HARDWARE_BUFFER_LAYER_INDEX_ARM   0x41F0
+#define CL_IMPORT_MEMORY_WHOLE_ALLOCATION_ARM               SIZE_MAX
+
+/***************************************************************
+* cl_arm_import_memory_dma_buf
+***************************************************************/
+#define cl_arm_import_memory_dma_buf 1
+#define CL_ARM_IMPORT_MEMORY_DMA_BUF_EXTENSION_NAME \
+    "cl_arm_import_memory_dma_buf"
+
+
+#define CL_ARM_IMPORT_MEMORY_DMA_BUF_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
+/* cl_import_properties_arm */
+#define CL_IMPORT_TYPE_DMA_BUF_ARM                          0x40B4
+#define CL_IMPORT_DMA_BUF_DATA_CONSISTENCY_WITH_HOST_ARM    0x41E3
+
+/***************************************************************
+* cl_arm_import_memory_host
+***************************************************************/
+#define cl_arm_import_memory_host 1
+#define CL_ARM_IMPORT_MEMORY_HOST_EXTENSION_NAME \
+    "cl_arm_import_memory_host"
+
+
+#define CL_ARM_IMPORT_MEMORY_HOST_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
+/* cl_import_properties_arm */
+#define CL_IMPORT_TYPE_HOST_ARM                             0x40B3
+
+/***************************************************************
+* cl_arm_import_memory_protected
+***************************************************************/
+#define cl_arm_import_memory_protected 1
+#define CL_ARM_IMPORT_MEMORY_PROTECTED_EXTENSION_NAME \
+    "cl_arm_import_memory_protected"
+
+
+#define CL_ARM_IMPORT_MEMORY_PROTECTED_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
+/* cl_import_properties_arm */
+#define CL_IMPORT_TYPE_PROTECTED_ARM                        0x40B5
+
+/***************************************************************
+* cl_arm_integer_dot_product_accumulate_int16
+***************************************************************/
+#define cl_arm_integer_dot_product_accumulate_int16 1
+#define CL_ARM_INTEGER_DOT_PRODUCT_ACCUMULATE_INT16_EXTENSION_NAME \
+    "cl_arm_integer_dot_product_accumulate_int16"
+
+
+#define CL_ARM_INTEGER_DOT_PRODUCT_ACCUMULATE_INT16_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
+/***************************************************************
+* cl_arm_integer_dot_product_accumulate_int8
+***************************************************************/
+#define cl_arm_integer_dot_product_accumulate_int8 1
+#define CL_ARM_INTEGER_DOT_PRODUCT_ACCUMULATE_INT8_EXTENSION_NAME \
+    "cl_arm_integer_dot_product_accumulate_int8"
+
+
+#define CL_ARM_INTEGER_DOT_PRODUCT_ACCUMULATE_INT8_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
+/***************************************************************
+* cl_arm_integer_dot_product_accumulate_saturate_int8
+***************************************************************/
+#define cl_arm_integer_dot_product_accumulate_saturate_int8 1
+#define CL_ARM_INTEGER_DOT_PRODUCT_ACCUMULATE_SATURATE_INT8_EXTENSION_NAME \
+    "cl_arm_integer_dot_product_accumulate_saturate_int8"
+
+
+#define CL_ARM_INTEGER_DOT_PRODUCT_ACCUMULATE_SATURATE_INT8_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
+/***************************************************************
+* cl_arm_integer_dot_product_int8
+***************************************************************/
+#define cl_arm_integer_dot_product_int8 1
+#define CL_ARM_INTEGER_DOT_PRODUCT_INT8_EXTENSION_NAME \
+    "cl_arm_integer_dot_product_int8"
+
+
+#define CL_ARM_INTEGER_DOT_PRODUCT_INT8_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
+/***************************************************************
+* cl_arm_non_uniform_work_group_size
+***************************************************************/
+#define cl_arm_non_uniform_work_group_size 1
+#define CL_ARM_NON_UNIFORM_WORK_GROUP_SIZE_EXTENSION_NAME \
+    "cl_arm_non_uniform_work_group_size"
+
+
+#define CL_ARM_NON_UNIFORM_WORK_GROUP_SIZE_EXTENSION_VERSION CL_MAKE_VERSION(1, 0, 0)
+
 /***************************************************************
 * cl_img_cancel_command
 ***************************************************************/
@@ -4621,6 +4719,23 @@ clCancelCommandsIMG(
 
 #endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
 
+/***************************************************************
+* cl_img_external_semaphore_fast_path (beta)
+***************************************************************/
+#if defined(CL_ENABLE_BETA_EXTENSIONS)
+
+#define cl_img_external_semaphore_fast_path 1
+#define CL_IMG_EXTERNAL_SEMAPHORE_FAST_PATH_EXTENSION_NAME \
+    "cl_img_external_semaphore_fast_path"
+
+
+#define CL_IMG_EXTERNAL_SEMAPHORE_FAST_PATH_EXTENSION_VERSION CL_MAKE_VERSION(0, 2, 0)
+
+/* cl_semaphore_properties_khr */
+#define CL_SEMAPHORE_FAST_PATH_IMG                          0x422D
+
+#endif /* defined(CL_ENABLE_BETA_EXTENSIONS) */
+
 /***************************************************************
 * cl_img_safety_mechanisms
 ***************************************************************/
@@ -4653,6 +4768,36 @@ typedef cl_bitfield         cl_context_safety_properties_img;
 #define CL_GENERAL_FAULT_IMG                                -1129
 #define CL_ECC_UNRECOVERED_IMG                              -1130
 
+/***************************************************************
+* cl_img_scheduling_controls
+***************************************************************/
+#define cl_img_scheduling_controls 1
+#define CL_IMG_SCHEDULING_CONTROLS_EXTENSION_NAME \
+    "cl_img_scheduling_controls"
+
+
+#define CL_IMG_SCHEDULING_CONTROLS_EXTENSION_VERSION CL_MAKE_VERSION(0, 3, 0)
+
+/* Types */
+typedef cl_bitfield         cl_device_scheduling_controls_capabilities_img;
+
+/* cl_device_scheduling_controls_capabilities_img */
+#define CL_DEVICE_WORK_GROUP_SCHEDULING_ALGORITHM_LINEAR_ORDER_IMG (1 << 0)
+#define CL_DEVICE_WORK_GROUP_SCHEDULING_ALGORITHM_MORTON_ORDER_IMG (1 << 1)
+#define CL_DEVICE_WORK_GROUP_SCHEDULING_ALGORITHM_TWOD_MORTON_ORDER_IMG (1 << 2)
+#define CL_DEVICE_WORK_GROUP_SCHEDULING_ALGORITHM_THREED_MORTON_ORDER_IMG (1 << 3)
+#define CL_DEVICE_WORK_GROUP_ARBITRATION_ALGORITHM_TASK_DEMAND_IMG (1 << 8)
+#define CL_DEVICE_WORK_GROUP_ARBITRATION_ALGORITHM_ROUND_ROBIN_IMG (1 << 9)
+#define CL_DEVICE_WORK_GROUP_EXECUTE_COUNT_IMG              (1 << 10)
+
+/* cl_device_info */
+#define CL_DEVICE_SCHEDULING_CONTROLS_CAPABILITIES_IMG      0x4222
+
+/* cl_queue_properties */
+#define CL_COMMAND_QUEUE_SCHEDULING_WORK_GROUP_SCHEDULING_ALGORITHM_IMG 0x4223
+#define CL_COMMAND_QUEUE_SCHEDULING_WORK_GROUP_ARBITRATION_ALGORITHM_IMG 0x4224
+#define CL_COMMAND_QUEUE_SCHEDULING_WORK_GROUP_EXECUTE_COUNT_IMG 0x422B
+
 /***************************************************************
 * cl_img_unified_svm_external_memory_dma_buf (beta)
 ***************************************************************/