From 76666662c479d8fa1301e99d1c6c7fa9735d2f1b Mon Sep 17 00:00:00 2001 From: Brandon Yates Date: Tue, 2 Mar 2021 16:52:00 -0500 Subject: [PATCH] Updating L0 loader to 1.2.3 in manifest Signed-off-by: Brandon Yates --- .../api/extensions/public/CMakeLists.txt | 11 --- .../api/extensions/public/ze_exp_ext.cpp | 27 -------- level_zero/api/extensions/public/ze_exp_ext.h | 68 ------------------- .../core/source/driver/driver_handle_imp.h | 1 - .../zello_world_global_work_offset.cpp | 4 +- manifests/manifest.yml | 2 +- 6 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 level_zero/api/extensions/public/CMakeLists.txt delete mode 100644 level_zero/api/extensions/public/ze_exp_ext.cpp delete mode 100644 level_zero/api/extensions/public/ze_exp_ext.h diff --git a/level_zero/api/extensions/public/CMakeLists.txt b/level_zero/api/extensions/public/CMakeLists.txt deleted file mode 100644 index 524075a734..0000000000 --- a/level_zero/api/extensions/public/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -# -# Copyright (C) 2020 Intel Corporation -# -# SPDX-License-Identifier: MIT -# - -set(L0_EXTENSIONS_SRCS_API - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/ze_exp_ext.cpp -) -set_property(GLOBAL PROPERTY L0_EXTENSIONS_SRCS_API ${L0_EXTENSIONS_SRCS_API}) diff --git a/level_zero/api/extensions/public/ze_exp_ext.cpp b/level_zero/api/extensions/public/ze_exp_ext.cpp deleted file mode 100644 index fd43070122..0000000000 --- a/level_zero/api/extensions/public/ze_exp_ext.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "level_zero/api/extensions/public/ze_exp_ext.h" - -#include "level_zero/core/source/kernel/kernel.h" - -#if defined(__cplusplus) -extern "C" { -#endif - -ZE_APIEXPORT ze_result_t ZE_APICALL -zeKernelSetGlobalOffsetExp( - ze_kernel_handle_t hKernel, - uint32_t offsetX, - uint32_t offsetY, - uint32_t offsetZ) { - return L0::Kernel::fromHandle(hKernel)->setGlobalOffsetExp(offsetX, offsetY, offsetZ); -} - -#if defined(__cplusplus) -} // extern "C" -#endif diff --git a/level_zero/api/extensions/public/ze_exp_ext.h b/level_zero/api/extensions/public/ze_exp_ext.h deleted file mode 100644 index 4c785a8c22..0000000000 --- a/level_zero/api/extensions/public/ze_exp_ext.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2020 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#pragma once - -#include - -/////////////////////////////////////////////////////////////////////////////// -// Intel 'oneAPI' Level-Zero Extension for supporting module programs. -/////////////////////////////////////////////////////////////////////////////// -#ifndef ZE_MODULE_PROGRAM_EXP_NAME -/// @brief Module Program Extension Name -#define ZE_MODULE_PROGRAM_EXP_NAME "ZE_experimental_module_program" -#endif // ZE_MODULE_PROGRAM_EXP_NAME - -/////////////////////////////////////////////////////////////////////////////// -/// @brief Module Program Extension Version(s) -typedef enum _ze_module_program_exp_version_t { - ZE_MODULE_PROGRAM_EXP_VERSION_1_0 = ZE_MAKE_VERSION(1, 0), ///< version 1.0 - ZE_MODULE_PROGRAM_EXP_VERSION_CURRENT = ZE_MAKE_VERSION(1, 0), ///< latest known version - ZE_MODULE_PROGRAM_EXP_VERSION_FORCE_UINT32 = 0x7fffffff - -} ze_module_program_exp_version_t; - -/////////////////////////////////////////////////////////////////////////////// -/// @brief Module extended descriptor to support multiple input modules. -/// -/// @details -/// - Implementation must support ::ZE_experimental_module_program extension -/// - pInputModules, pBuildFlags, and pConstants from ::ze_module_desc_t is -/// ignored. -/// - Format in ::ze_module_desc_t needs to be set to -/// ::ZE_MODULE_FORMAT_IL_SPIRV. -typedef struct _ze_module_program_exp_desc_t { - ze_structure_type_t stype; ///< [in] type of this structure - const void *pNext; ///< [in][optional] pointer to extension-specific structure - uint32_t count; ///< [in] Count of input modules - const size_t *inputSizes; ///< [in][range(0, count)] sizes of each input IL module in pInputModules. - const uint8_t **pInputModules; ///< [in][range(0, count)] pointer to an array of IL (e.g. SPIR-V modules). - ///< Valid only for SPIR-V input. - const char **pBuildFlags; ///< [in][optional][range(0, count)] array of strings containing build - ///< flags. See pBuildFlags in ::ze_module_desc_t. - const ze_module_constants_t **pConstants; ///< [in][optional][range(0, count)] pointer to array of specialization - ///< constant strings. Valid only for SPIR-V input. This must be set to - ///< nullptr if no specialization constants are provided. - -} ze_module_program_exp_desc_t; - -/////////////////////////////////////////////////////////////////////////////// -// Intel 'oneAPI' Level-Zero Extension for supporting global work offset -/////////////////////////////////////////////////////////////////////////////// -#ifndef ZE_GLOBAL_OFFSET_EXP_NAME -/// @brief Global Offset Extension Name -#define ZE_GLOBAL_OFFSET_EXP_NAME "ZE_experimental_global_offset" -#endif // ZE_GLOBAL_OFFSET_EXP_NAME - -/////////////////////////////////////////////////////////////////////////////// -/// @brief Global work offset Extension Version(s) -typedef enum _ze_global_offset_exp_version_t { - ZE_GLOBAL_OFFSET_EXP_VERSION_1_0 = ZE_MAKE_VERSION(1, 0), ///< version 1.0 - ZE_GLOBAL_OFFSET_EXP_VERSION_CURRENT = ZE_MAKE_VERSION(1, 0), ///< latest known version - ZE_GLOBAL_OFFSET_EXP_VERSION_FORCE_UINT32 = 0x7fffffff - -} ze_global_offset_exp_version_t; \ No newline at end of file diff --git a/level_zero/core/source/driver/driver_handle_imp.h b/level_zero/core/source/driver/driver_handle_imp.h index 89c6e88aa5..02ceced5ad 100644 --- a/level_zero/core/source/driver/driver_handle_imp.h +++ b/level_zero/core/source/driver/driver_handle_imp.h @@ -9,7 +9,6 @@ #include "shared/source/os_interface/os_library.h" -#include "level_zero/api/extensions/public/ze_exp_ext.h" #include "level_zero/core/source/driver/driver_handle.h" #include "level_zero/core/source/get_extension_function_lookup_map.h" diff --git a/level_zero/core/test/black_box_tests/zello_world_global_work_offset.cpp b/level_zero/core/test/black_box_tests/zello_world_global_work_offset.cpp index 4a6f79ca69..0c1c139d65 100644 --- a/level_zero/core/test/black_box_tests/zello_world_global_work_offset.cpp +++ b/level_zero/core/test/black_box_tests/zello_world_global_work_offset.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 Intel Corporation + * Copyright (C) 2020-2021 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,6 @@ #include "shared/offline_compiler/source/ocloc_api.h" -#include "level_zero/api/extensions/public/ze_exp_ext.h" - #include "zello_common.h" #include diff --git a/manifests/manifest.yml b/manifests/manifest.yml index e47d9b9fd7..1de11ca4f6 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -30,7 +30,7 @@ components: branch: master dest_dir: level_zero repository: https://github.com/oneapi-src/level-zero - revision: v1.1.0 + revision: v1.2.3 type: git libva: dest_dir: libva