Merge changes from multi device compile extension into core spec.

Author: aarongreig

examples/codegen/codegen.cpp

@@ -118,7 +118,7 @@ int main() {
     ur_program_handle_t hProgram;
     ur_check(urProgramCreateWithIL(hContext, spv.data(), spv.size(), nullptr,
                                    &hProgram));
-    ur_check(urProgramBuild(hContext, hProgram, nullptr));
+    ur_check(urProgramBuild(hProgram, 1, &current_device, nullptr));
 
     ur_mem_handle_t dA, dB;
     ur_check(urMemBufferCreate(hContext, UR_MEM_FLAG_READ_WRITE,

include/ur_api.h

@@ -196,9 +196,6 @@ typedef enum ur_function_t {
     UR_FUNCTION_ADAPTER_RETAIN = 179,                                          ///< Enumerator for ::urAdapterRetain
     UR_FUNCTION_ADAPTER_GET_LAST_ERROR = 180,                                  ///< Enumerator for ::urAdapterGetLastError
     UR_FUNCTION_ADAPTER_GET_INFO = 181,                                        ///< Enumerator for ::urAdapterGetInfo
-    UR_FUNCTION_PROGRAM_BUILD_EXP = 197,                                       ///< Enumerator for ::urProgramBuildExp
-    UR_FUNCTION_PROGRAM_COMPILE_EXP = 198,                                     ///< Enumerator for ::urProgramCompileExp
-    UR_FUNCTION_PROGRAM_LINK_EXP = 199,                                        ///< Enumerator for ::urProgramLinkExp
     UR_FUNCTION_LOADER_CONFIG_SET_CODE_LOCATION_CALLBACK = 200,                ///< Enumerator for ::urLoaderConfigSetCodeLocationCallback
     UR_FUNCTION_LOADER_INIT = 201,                                             ///< Enumerator for ::urLoaderInit
     UR_FUNCTION_LOADER_TEAR_DOWN = 202,                                        ///< Enumerator for ::urLoaderTearDown
@@ -4091,17 +4088,21 @@ urProgramCreateWithBinary(
 ///     - ::UR_RESULT_ERROR_DEVICE_LOST
 ///     - ::UR_RESULT_ERROR_ADAPTER_SPECIFIC
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
-///         + `NULL == hContext`
 ///         + `NULL == hProgram`
+///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
+///         + `NULL == phDevices`
 ///     - ::UR_RESULT_ERROR_INVALID_PROGRAM
 ///         + If `hProgram` isn't a valid program object.
 ///     - ::UR_RESULT_ERROR_PROGRAM_BUILD_FAILURE
 ///         + If an error occurred when building `hProgram`.
+///     - ::UR_RESULT_ERROR_INVALID_SIZE
+///         + `numDevices == 0`
 UR_APIEXPORT ur_result_t UR_APICALL
 urProgramBuild(
-    ur_context_handle_t hContext, ///< [in] handle of the context instance.
-    ur_program_handle_t hProgram, ///< [in] Handle of the program to build.
-    const char *pOptions          ///< [in][optional] pointer to build options null-terminated string.
+    ur_program_handle_t hProgram,  ///< [in] Handle of the program to build.
+    uint32_t numDevices,           ///< [in] length of `phDevices`
+    ur_device_handle_t *phDevices, ///< [in][range(0, numDevices)] pointer to array of device handles
+    const char *pOptions           ///< [in][optional] pointer to build options null-terminated string.
 );
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -4123,17 +4124,21 @@ urProgramBuild(
 ///     - ::UR_RESULT_ERROR_DEVICE_LOST
 ///     - ::UR_RESULT_ERROR_ADAPTER_SPECIFIC
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
-///         + `NULL == hContext`
 ///         + `NULL == hProgram`
+///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
+///         + `NULL == phDevices`
 ///     - ::UR_RESULT_ERROR_INVALID_PROGRAM
 ///         + If `hProgram` isn't a valid program object.
 ///     - ::UR_RESULT_ERROR_PROGRAM_BUILD_FAILURE
 ///         + If an error occurred while compiling `hProgram`.
+///     - ::UR_RESULT_ERROR_INVALID_SIZE
+///         + `numDevices == 0`
 UR_APIEXPORT ur_result_t UR_APICALL
 urProgramCompile(
-    ur_context_handle_t hContext, ///< [in] handle of the context instance.
-    ur_program_handle_t hProgram, ///< [in][out] handle of the program to compile.
-    const char *pOptions          ///< [in][optional] pointer to build options null-terminated string.
+    ur_program_handle_t hProgram,  ///< [in][out] handle of the program to compile.
+    uint32_t numDevices,           ///< [in] length of `phDevices`
+    ur_device_handle_t *phDevices, ///< [in][range(0, numDevices)] pointer to array of device handles
+    const char *pOptions           ///< [in][optional] pointer to build options null-terminated string.
 );
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -4158,17 +4163,21 @@ urProgramCompile(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hContext`
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
+///         + `NULL == phDevices`
 ///         + `NULL == phPrograms`
 ///         + `NULL == phProgram`
 ///     - ::UR_RESULT_ERROR_INVALID_PROGRAM
 ///         + If one of the programs in `phPrograms` isn't a valid program object.
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
+///         + `numDevices == 0`
 ///         + `count == 0`
 ///     - ::UR_RESULT_ERROR_PROGRAM_LINK_FAILURE
 ///         + If an error occurred while linking `phPrograms`.
 UR_APIEXPORT ur_result_t UR_APICALL
 urProgramLink(
     ur_context_handle_t hContext,          ///< [in] handle of the context instance.
+    uint32_t numDevices,                   ///< [in] number of devices
+    ur_device_handle_t *phDevices,         ///< [in][range(0, numDevices)] pointer to array of device handles
     uint32_t count,                        ///< [in] number of program handles in `phPrograms`.
     const ur_program_handle_t *phPrograms, ///< [in][range(0, count)] pointer to array of program handles.
     const char *pOptions,                  ///< [in][optional] pointer to linker options null-terminated string.
@@ -8423,131 +8432,6 @@ urKernelSuggestMaxCooperativeGroupCountExp(
     uint32_t *pGroupCountRet    ///< [out] pointer to maximum number of groups
 );
 
-#if !defined(__GNUC__)
-#pragma endregion
-#endif
-// Intel 'oneAPI' Unified Runtime Experimental APIs for multi-device compile
-#if !defined(__GNUC__)
-#pragma region multi device compile(experimental)
-#endif
-///////////////////////////////////////////////////////////////////////////////
-#ifndef UR_MULTI_DEVICE_COMPILE_EXTENSION_STRING_EXP
-/// @brief The extension string which defines support for test
-///        which is returned when querying device extensions.
-#define UR_MULTI_DEVICE_COMPILE_EXTENSION_STRING_EXP "ur_exp_multi_device_compile"
-#endif // UR_MULTI_DEVICE_COMPILE_EXTENSION_STRING_EXP
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Produces an executable program from one program, negates need for the
-///        linking step.
-///
-/// @details
-///     - The application may call this function from simultaneous threads.
-///     - Following a successful call to this entry point, the program passed
-///       will contain a binary of the ::UR_PROGRAM_BINARY_TYPE_EXECUTABLE type
-///       for each device in `phDevices`.
-///
-/// @remarks
-///   _Analogues_
-///     - **clBuildProgram**
-///
-/// @returns
-///     - ::UR_RESULT_SUCCESS
-///     - ::UR_RESULT_ERROR_UNINITIALIZED
-///     - ::UR_RESULT_ERROR_DEVICE_LOST
-///     - ::UR_RESULT_ERROR_ADAPTER_SPECIFIC
-///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
-///         + `NULL == hProgram`
-///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
-///         + `NULL == phDevices`
-///     - ::UR_RESULT_ERROR_INVALID_PROGRAM
-///         + If `hProgram` isn't a valid program object.
-///     - ::UR_RESULT_ERROR_PROGRAM_BUILD_FAILURE
-///         + If an error occurred when building `hProgram`.
-UR_APIEXPORT ur_result_t UR_APICALL
-urProgramBuildExp(
-    ur_program_handle_t hProgram,  ///< [in] Handle of the program to build.
-    uint32_t numDevices,           ///< [in] number of devices
-    ur_device_handle_t *phDevices, ///< [in][range(0, numDevices)] pointer to array of device handles
-    const char *pOptions           ///< [in][optional] pointer to build options null-terminated string.
-);
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Produces an executable program from one or more programs.
-///
-/// @details
-///     - The application may call this function from simultaneous threads.
-///     - Following a successful call to this entry point `hProgram` will
-///       contain a binary of the ::UR_PROGRAM_BINARY_TYPE_COMPILED_OBJECT type
-///       for each device in `phDevices`.
-///
-/// @remarks
-///   _Analogues_
-///     - **clCompileProgram**
-///
-/// @returns
-///     - ::UR_RESULT_SUCCESS
-///     - ::UR_RESULT_ERROR_UNINITIALIZED
-///     - ::UR_RESULT_ERROR_DEVICE_LOST
-///     - ::UR_RESULT_ERROR_ADAPTER_SPECIFIC
-///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
-///         + `NULL == hProgram`
-///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
-///         + `NULL == phDevices`
-///     - ::UR_RESULT_ERROR_INVALID_PROGRAM
-///         + If `hProgram` isn't a valid program object.
-///     - ::UR_RESULT_ERROR_PROGRAM_BUILD_FAILURE
-///         + If an error occurred while compiling `hProgram`.
-UR_APIEXPORT ur_result_t UR_APICALL
-urProgramCompileExp(
-    ur_program_handle_t hProgram,  ///< [in][out] handle of the program to compile.
-    uint32_t numDevices,           ///< [in] number of devices
-    ur_device_handle_t *phDevices, ///< [in][range(0, numDevices)] pointer to array of device handles
-    const char *pOptions           ///< [in][optional] pointer to build options null-terminated string.
-);
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Produces an executable program from one or more programs.
-///
-/// @details
-///     - The application may call this function from simultaneous threads.
-///     - Following a successful call to this entry point the program returned
-///       in `phProgram` will contain a binary of the
-///       ::UR_PROGRAM_BINARY_TYPE_EXECUTABLE type for each device in
-///       `phDevices`.
-///
-/// @remarks
-///   _Analogues_
-///     - **clLinkProgram**
-///
-/// @returns
-///     - ::UR_RESULT_SUCCESS
-///     - ::UR_RESULT_ERROR_UNINITIALIZED
-///     - ::UR_RESULT_ERROR_DEVICE_LOST
-///     - ::UR_RESULT_ERROR_ADAPTER_SPECIFIC
-///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
-///         + `NULL == hContext`
-///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
-///         + `NULL == phDevices`
-///         + `NULL == phPrograms`
-///         + `NULL == phProgram`
-///     - ::UR_RESULT_ERROR_INVALID_PROGRAM
-///         + If one of the programs in `phPrograms` isn't a valid program object.
-///     - ::UR_RESULT_ERROR_INVALID_SIZE
-///         + `count == 0`
-///     - ::UR_RESULT_ERROR_PROGRAM_LINK_FAILURE
-///         + If an error occurred while linking `phPrograms`.
-UR_APIEXPORT ur_result_t UR_APICALL
-urProgramLinkExp(
-    ur_context_handle_t hContext,          ///< [in] handle of the context instance.
-    uint32_t numDevices,                   ///< [in] number of devices
-    ur_device_handle_t *phDevices,         ///< [in][range(0, numDevices)] pointer to array of device handles
-    uint32_t count,                        ///< [in] number of program handles in `phPrograms`.
-    const ur_program_handle_t *phPrograms, ///< [in][range(0, count)] pointer to array of program handles.
-    const char *pOptions,                  ///< [in][optional] pointer to linker options null-terminated string.
-    ur_program_handle_t *phProgram         ///< [out] pointer to handle of program object created.
-);
-
 #if !defined(__GNUC__)
 #pragma endregion
 #endif
@@ -9054,68 +8938,36 @@ typedef struct ur_program_create_with_binary_params_t {
 /// @details Each entry is a pointer to the parameter passed to the function;
 ///     allowing the callback the ability to modify the parameter's value
 typedef struct ur_program_build_params_t {
-    ur_context_handle_t *phContext;
-    ur_program_handle_t *phProgram;
-    const char **ppOptions;
-} ur_program_build_params_t;
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Function parameters for urProgramBuildExp
-/// @details Each entry is a pointer to the parameter passed to the function;
-///     allowing the callback the ability to modify the parameter's value
-typedef struct ur_program_build_exp_params_t {
     ur_program_handle_t *phProgram;
     uint32_t *pnumDevices;
     ur_device_handle_t **pphDevices;
     const char **ppOptions;
-} ur_program_build_exp_params_t;
+} ur_program_build_params_t;
 
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Function parameters for urProgramCompile
 /// @details Each entry is a pointer to the parameter passed to the function;
 ///     allowing the callback the ability to modify the parameter's value
 typedef struct ur_program_compile_params_t {
-    ur_context_handle_t *phContext;
-    ur_program_handle_t *phProgram;
-    const char **ppOptions;
-} ur_program_compile_params_t;
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Function parameters for urProgramCompileExp
-/// @details Each entry is a pointer to the parameter passed to the function;
-///     allowing the callback the ability to modify the parameter's value
-typedef struct ur_program_compile_exp_params_t {
     ur_program_handle_t *phProgram;
     uint32_t *pnumDevices;
     ur_device_handle_t **pphDevices;
     const char **ppOptions;
-} ur_program_compile_exp_params_t;
+} ur_program_compile_params_t;
 
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Function parameters for urProgramLink
 /// @details Each entry is a pointer to the parameter passed to the function;
 ///     allowing the callback the ability to modify the parameter's value
 typedef struct ur_program_link_params_t {
-    ur_context_handle_t *phContext;
-    uint32_t *pcount;
-    const ur_program_handle_t **pphPrograms;
-    const char **ppOptions;
-    ur_program_handle_t **pphProgram;
-} ur_program_link_params_t;
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Function parameters for urProgramLinkExp
-/// @details Each entry is a pointer to the parameter passed to the function;
-///     allowing the callback the ability to modify the parameter's value
-typedef struct ur_program_link_exp_params_t {
     ur_context_handle_t *phContext;
     uint32_t *pnumDevices;
     ur_device_handle_t **pphDevices;
     uint32_t *pcount;
     const ur_program_handle_t **pphPrograms;
     const char **ppOptions;
     ur_program_handle_t **pphProgram;
-} ur_program_link_exp_params_t;
+} ur_program_link_params_t;
 
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Function parameters for urProgramRetain

include/ur_ddi.h

@@ -291,22 +291,26 @@ typedef ur_result_t(UR_APICALL *ur_pfnProgramCreateWithBinary_t)(
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Function-pointer for urProgramBuild
 typedef ur_result_t(UR_APICALL *ur_pfnProgramBuild_t)(
-    ur_context_handle_t,
     ur_program_handle_t,
+    uint32_t,
+    ur_device_handle_t *,
     const char *);
 
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Function-pointer for urProgramCompile
 typedef ur_result_t(UR_APICALL *ur_pfnProgramCompile_t)(
-    ur_context_handle_t,
     ur_program_handle_t,
+    uint32_t,
+    ur_device_handle_t *,
     const char *);
 
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Function-pointer for urProgramLink
 typedef ur_result_t(UR_APICALL *ur_pfnProgramLink_t)(
     ur_context_handle_t,
     uint32_t,
+    ur_device_handle_t *,
+    uint32_t,
     const ur_program_handle_t *,
     const char *,
     ur_program_handle_t *);
@@ -408,62 +412,6 @@ typedef ur_result_t(UR_APICALL *ur_pfnGetProgramProcAddrTable_t)(
     ur_api_version_t,
     ur_program_dditable_t *);
 
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Function-pointer for urProgramBuildExp
-typedef ur_result_t(UR_APICALL *ur_pfnProgramBuildExp_t)(
-    ur_program_handle_t,
-    uint32_t,
-    ur_device_handle_t *,
-    const char *);
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Function-pointer for urProgramCompileExp
-typedef ur_result_t(UR_APICALL *ur_pfnProgramCompileExp_t)(
-    ur_program_handle_t,
-    uint32_t,
-    ur_device_handle_t *,
-    const char *);
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Function-pointer for urProgramLinkExp
-typedef ur_result_t(UR_APICALL *ur_pfnProgramLinkExp_t)(
-    ur_context_handle_t,
-    uint32_t,
-    ur_device_handle_t *,
-    uint32_t,
-    const ur_program_handle_t *,
-    const char *,
-    ur_program_handle_t *);
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Table of ProgramExp functions pointers
-typedef struct ur_program_exp_dditable_t {
-    ur_pfnProgramBuildExp_t pfnBuildExp;
-    ur_pfnProgramCompileExp_t pfnCompileExp;
-    ur_pfnProgramLinkExp_t pfnLinkExp;
-} ur_program_exp_dditable_t;
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Exported function for filling application's ProgramExp table
-///        with current process' addresses
-///
-/// @returns
-///     - ::UR_RESULT_SUCCESS
-///     - ::UR_RESULT_ERROR_UNINITIALIZED
-///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
-///     - ::UR_RESULT_ERROR_UNSUPPORTED_VERSION
-UR_DLLEXPORT ur_result_t UR_APICALL
-urGetProgramExpProcAddrTable(
-    ur_api_version_t version,            ///< [in] API version requested
-    ur_program_exp_dditable_t *pDdiTable ///< [in,out] pointer to table of DDI function pointers
-);
-
-///////////////////////////////////////////////////////////////////////////////
-/// @brief Function-pointer for urGetProgramExpProcAddrTable
-typedef ur_result_t(UR_APICALL *ur_pfnGetProgramExpProcAddrTable_t)(
-    ur_api_version_t,
-    ur_program_exp_dditable_t *);
-
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Function-pointer for urKernelCreate
 typedef ur_result_t(UR_APICALL *ur_pfnKernelCreate_t)(
@@ -2306,7 +2254,6 @@ typedef struct ur_dditable_t {
     ur_context_dditable_t Context;
     ur_event_dditable_t Event;
     ur_program_dditable_t Program;
-    ur_program_exp_dditable_t ProgramExp;
     ur_kernel_dditable_t Kernel;
     ur_kernel_exp_dditable_t KernelExp;
     ur_sampler_dditable_t Sampler;