Merge branch 'main' into cl_khr_unified_svm

Author: bashbaug

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2021-2024 Ben Ashbaugh
+# Copyright (c) 2021-2025 Ben Ashbaugh
 #
 # SPDX-License-Identifier: MIT or Apache-2.0
 
@@ -78,6 +78,7 @@ set_target_properties(OpenCLExt PROPERTIES FOLDER "OpenCLExtensionLoader")
 set_target_properties(OpenCLExt PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 target_include_directories(OpenCLExt PRIVATE ${OPENCL_EXTENSION_LOADER_INCLUDE_DIRS})
 target_compile_definitions(OpenCLExt PRIVATE CL_TARGET_OPENCL_VERSION=300)
+target_compile_definitions(OpenCLExt PRIVATE CL_ENABLE_BETA_EXTENSIONS)
 if (OPENCL_EXTENSION_LOADER_SINGLE_PLATFORM_ONLY)
     target_compile_definitions(OpenCLExt PRIVATE CLEXT_SINGLE_PLATFORM_ONLY)
 endif()

LICENSE-MIT

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 Ben Ashbaugh
+Copyright (c) 2021-2025 Ben Ashbaugh
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

scripts/call_all.c.mako

@@ -59,6 +59,7 @@ defaultValueForType = {
     'cl_kernel_exec_info_arm'           : 'CL_KERNEL_EXEC_INFO_SVM_PTRS_ARM',
     'cl_kernel_sub_group_info'          : 'CL_KERNEL_MAX_SUB_GROUP_SIZE_FOR_NDRANGE_KHR',
     'cl_mem_advice_intel'               : '0',
+    'cl_mem_device_address_ext'         : '0',
     'cl_mutable_command_info_khr'       : 'CL_MUTABLE_COMMAND_COMMAND_BUFFER_KHR',
     'cl_map_flags'                      : 'CL_MAP_READ',
     'cl_mem_flags'                      : 'CL_MEM_READ_WRITE',
@@ -122,7 +123,7 @@ def getCallArgs(params):
     return callstr
 
 %>/*******************************************************************************
-// Copyright (c) 2021-2024 Ben Ashbaugh
+// Copyright (c) 2021-2025 Ben Ashbaugh
 //
 // SPDX-License-Identifier: MIT or Apache-2.0
 */

scripts/gen_openclext.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Copyright (c) 2021-2024 Ben Ashbaugh
+# Copyright (c) 2021-2025 Ben Ashbaugh
 #
 # SPDX-License-Identifier: MIT or Apache-2.0
 

scripts/openclext.cpp.mako

@@ -116,7 +116,7 @@ def getCParameterStrings(params):
     return strings
 
 %>/*******************************************************************************
-// Copyright (c) 2021-2024 Ben Ashbaugh
+// Copyright (c) 2021-2025 Ben Ashbaugh
 //
 // SPDX-License-Identifier: MIT or Apache-2.0
 */

src/openclext.cpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
-// Copyright (c) 2021-2024 Ben Ashbaugh
+// Copyright (c) 2021-2025 Ben Ashbaugh
 //
 // SPDX-License-Identifier: MIT or Apache-2.0
 */
@@ -787,6 +787,17 @@ typedef cl_int (CL_API_CALL* clGetSVMSuggestedTypeIndexKHR_clextfn)(
 #pragma message("Define for cl_khr_unified_svm was not found!  Please update your headers.")
 #endif // defined(cl_khr_unified_svm)
 
+#if defined(cl_ext_buffer_device_address)
+
+typedef cl_int (CL_API_CALL* clSetKernelArgDevicePointerEXT_clextfn)(
+    cl_kernel kernel,
+    cl_uint arg_index,
+    cl_mem_device_address_ext arg_value);
+
+#else
+#pragma message("Define for cl_ext_buffer_device_address was not found!  Please update your headers.")
+#endif // defined(cl_ext_buffer_device_address)
+
 #if defined(cl_ext_device_fission)
 
 typedef cl_int (CL_API_CALL* clReleaseDeviceEXT_clextfn)(
@@ -1483,6 +1494,10 @@ struct openclext_dispatch_table {
     clGetSVMSuggestedTypeIndexKHR_clextfn clGetSVMSuggestedTypeIndexKHR;
 #endif // defined(cl_khr_unified_svm)
 
+#if defined(cl_ext_buffer_device_address)
+    clSetKernelArgDevicePointerEXT_clextfn clSetKernelArgDevicePointerEXT;
+#endif // defined(cl_ext_buffer_device_address)
+
 #if defined(cl_ext_device_fission)
     clReleaseDeviceEXT_clextfn clReleaseDeviceEXT;
     clRetainDeviceEXT_clextfn clRetainDeviceEXT;
@@ -1766,6 +1781,10 @@ static void _init(cl_platform_id platform, openclext_dispatch_table* dispatch_pt
     CLEXT_GET_EXTENSION(clGetSVMSuggestedTypeIndexKHR);
 #endif // defined(cl_khr_unified_svm)
 
+#if defined(cl_ext_buffer_device_address)
+    CLEXT_GET_EXTENSION(clSetKernelArgDevicePointerEXT);
+#endif // defined(cl_ext_buffer_device_address)
+
 #if defined(cl_ext_device_fission)
     CLEXT_GET_EXTENSION(clReleaseDeviceEXT);
     CLEXT_GET_EXTENSION(clRetainDeviceEXT);
@@ -3544,6 +3563,25 @@ cl_int CL_API_CALL clGetSVMSuggestedTypeIndexKHR(
 
 #endif // defined(cl_khr_unified_svm)
 
+#if defined(cl_ext_buffer_device_address)
+
+cl_int CL_API_CALL clSetKernelArgDevicePointerEXT(
+    cl_kernel kernel,
+    cl_uint arg_index,
+    cl_mem_device_address_ext arg_value)
+{
+    struct openclext_dispatch_table* dispatch_ptr = _get_dispatch(kernel);
+    if (dispatch_ptr == nullptr || dispatch_ptr->clSetKernelArgDevicePointerEXT == nullptr) {
+        return CL_INVALID_OPERATION;
+    }
+    return dispatch_ptr->clSetKernelArgDevicePointerEXT(
+        kernel,
+        arg_index,
+        arg_value);
+}
+
+#endif // defined(cl_ext_buffer_device_address)
+
 #if defined(cl_ext_device_fission)
 
 cl_int CL_API_CALL clReleaseDeviceEXT(

tests/call_all.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
-// Copyright (c) 2021-2024 Ben Ashbaugh
+// Copyright (c) 2021-2025 Ben Ashbaugh
 //
 // SPDX-License-Identifier: MIT or Apache-2.0
 */
@@ -168,6 +168,10 @@ void call_all(void)
     clGetSVMSuggestedTypeIndexKHR(NULL, CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR, CL_SVM_TYPE_MACRO_COARSE_GRAIN_BUFFER_KHR, NULL, 0, NULL);
 #endif // cl_khr_unified_svm
 
+#ifdef cl_ext_buffer_device_address
+    clSetKernelArgDevicePointerEXT(NULL, 0, 0);
+#endif // cl_ext_buffer_device_address
+
 #ifdef cl_ext_device_fission
     clReleaseDeviceEXT(NULL);
     clRetainDeviceEXT(NULL);

tests/dx_sharing_prototypes.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
-// Copyright (c) 2021-2024 Ben Ashbaugh
+// Copyright (c) 2021-2025 Ben Ashbaugh
 //
 // SPDX-License-Identifier: MIT or Apache-2.0
 */

tests/loader_info_prototypes.h

@@ -1,5 +1,5 @@
 /*******************************************************************************
-// Copyright (c) 2023-2024 Ben Ashbaugh
+// Copyright (c) 2023-2025 Ben Ashbaugh
 //
 // SPDX-License-Identifier: MIT or Apache-2.0
 */

tests/test_extension_loader.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
-// Copyright (c) 2021-2024 Ben Ashbaugh
+// Copyright (c) 2021-2025 Ben Ashbaugh
 //
 // SPDX-License-Identifier: MIT or Apache-2.0
 */