diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cdd736733..032b788413 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR) -project(unified-runtime VERSION 0.7.0) +project(unified-runtime VERSION 0.8.0) include(GNUInstallDirs) include(CheckCXXSourceCompiles) diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake index 3c90d41236..eb1bb48c00 100644 --- a/cmake/helpers.cmake +++ b/cmake/helpers.cmake @@ -78,7 +78,7 @@ function(add_ur_target_compile_options name) endif() elseif(MSVC) target_compile_options(${name} PRIVATE - /MP + $<$:/MP> # clang-cl.exe does not support /MP /W3 /MD$<$:d> /GS diff --git a/include/ur.py b/include/ur.py index 2b49088119..f606ce4127 100644 --- a/include/ur.py +++ b/include/ur.py @@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception @file ur.py - @version v0.7-r0 + @version v0.8-r0 """ import platform @@ -570,7 +570,8 @@ def __str__(self): class ur_api_version_v(IntEnum): _0_6 = UR_MAKE_VERSION( 0, 6 ) ## version 0.6 _0_7 = UR_MAKE_VERSION( 0, 7 ) ## version 0.7 - CURRENT = UR_MAKE_VERSION( 0, 7 ) ## latest known version + _0_8 = UR_MAKE_VERSION( 0, 8 ) ## version 0.8 + CURRENT = UR_MAKE_VERSION( 0, 8 ) ## latest known version class ur_api_version_t(c_int): def __str__(self): diff --git a/include/ur_api.h b/include/ur_api.h index 677c31005f..c9f29a1535 100644 --- a/include/ur_api.h +++ b/include/ur_api.h @@ -7,7 +7,7 @@ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception * * @file ur_api.h - * @version v0.7-r0 + * @version v0.8-r0 * */ #ifndef UR_API_H_INCLUDED @@ -1022,7 +1022,8 @@ urPlatformGetInfo( typedef enum ur_api_version_t { UR_API_VERSION_0_6 = UR_MAKE_VERSION(0, 6), ///< version 0.6 UR_API_VERSION_0_7 = UR_MAKE_VERSION(0, 7), ///< version 0.7 - UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 7), ///< latest known version + UR_API_VERSION_0_8 = UR_MAKE_VERSION(0, 8), ///< version 0.8 + UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 8), ///< latest known version /// @cond UR_API_VERSION_FORCE_UINT32 = 0x7fffffff /// @endcond diff --git a/include/ur_ddi.h b/include/ur_ddi.h index a0c2a5012d..a61cbee653 100644 --- a/include/ur_ddi.h +++ b/include/ur_ddi.h @@ -7,7 +7,7 @@ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception * * @file ur_ddi.h - * @version v0.7-r0 + * @version v0.8-r0 * */ #ifndef UR_DDI_H_INCLUDED diff --git a/scripts/Doxyfile b/scripts/Doxyfile index c038d5276d..0134f27418 100644 --- a/scripts/Doxyfile +++ b/scripts/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "Intel One API Unified Runtime API" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v0.7 +PROJECT_NUMBER = v0.8 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/scripts/ci.py b/scripts/ci.py deleted file mode 100644 index 05a9141248..0000000000 --- a/scripts/ci.py +++ /dev/null @@ -1,80 +0,0 @@ -import os -import sys -import argparse -import re -import fileinput -from distutils import dir_util -import util - -script_dir = os.path.dirname(os.path.abspath(__file__)) -root_dir = os.path.dirname(script_dir) - - -""" -Entry-point: - publishes HTML for GitLab pages -""" -def publish_gitlab_html(): - src_html_dir = os.path.join(root_dir, "docs", "html") - src_img_dir = os.path.join(root_dir, "images") - tmp_dir = os.path.join(root_dir, ".public") - tmp_img_dir = os.path.join(root_dir, ".public/images") - publishing_dir = os.path.join(root_dir, "public") - - # Remove dest dirs - if os.path.exists(tmp_dir): - print("Deleting temp dir: %s" % tmp_dir) - util.removePath(tmp_dir) - if os.path.exists(publishing_dir): - print("Deleting publishing dir: %s" % publishing_dir) - util.removePath(publishing_dir) - - # Copy over generated content to new folder - print("Copying html files from '%s' to '%s'" % (src_html_dir, tmp_dir)) - dir_util.copy_tree(src_html_dir, tmp_dir) - - # Fixes html files by converting paths relative to root html folder instead of repo - print("Fixing paths in html files in '%s' to be relative to root..." % (tmp_dir)) - regex_pattern = re.compile(r'\.\.[\/|\\]images') - files = util.findFiles(tmp_dir, "*.html") - print("Found %s files" % (len(files))) - with fileinput.FileInput(files=files, inplace=True) as f: - for line in f: - print(re.sub(regex_pattern, './images', line), end='') - - # Publish new folder to GitLab Pages folder (/public) - print("Publishing to GitLab pages by renaming '%s' to '%s'" % (tmp_dir, publishing_dir)) - os.rename(tmp_dir, publishing_dir) - - -""" -Entry-point: - main() -""" -def main(args=sys.argv[1:]): - # Define args - parser = argparse.ArgumentParser() - parser.add_argument( - "--publish-html", - help="Publish html", - action="store_true") - - # Parse args - options = parser.parse_args(args) - - # Publish GitLab html - if options.publish_html: - try: - publish_gitlab_html() - except Exception as e: - print(e) - print("Failed") - return 1 - - print("Done") - return 0 - - -if __name__ == '__main__': - sys.exit(main()) -# END OF FILE diff --git a/scripts/core/INTRO.rst b/scripts/core/INTRO.rst index 4c3a1a9d2d..8b9938cfb2 100644 --- a/scripts/core/INTRO.rst +++ b/scripts/core/INTRO.rst @@ -296,6 +296,15 @@ Specific environment variables can be set to control the behavior of unified run This environment variable is ignored when :envvar:`UR_ADAPTERS_FORCE_LOAD` environment variable is used. +.. envvar:: UR_ADAPTERS_DEEP_BIND + + If set, the loader will use `RTLD_DEEPBIND` when opening adapter libraries. This might be useful if an adapter + requires a different version of a shared library compared to the rest of the applcation. + + .. note:: + + This environment variable is Linux-only. + .. envvar:: UR_ENABLE_LAYERS Holds a comma-separated list of layers to enable in addition to any specified via ``urInit``. diff --git a/scripts/core/platform.yml b/scripts/core/platform.yml index f7020b4138..dbbbe312a9 100644 --- a/scripts/core/platform.yml +++ b/scripts/core/platform.yml @@ -133,6 +133,9 @@ etors: - name: "0_7" value: "$X_MAKE_VERSION( 0, 7 )" desc: "version 0.7" + - name: "0_8" + value: "$X_MAKE_VERSION( 0, 8 )" + desc: "version 0.8" --- #-------------------------------------------------------------------------- type: function desc: "Returns the API version supported by the specified platform" diff --git a/scripts/parse_specs.py b/scripts/parse_specs.py index 07ae086efd..414b25d8e0 100644 --- a/scripts/parse_specs.py +++ b/scripts/parse_specs.py @@ -18,8 +18,8 @@ import ctypes import itertools -default_version = "0.7" -all_versions = ["0.6", "0.7"] +default_version = "0.8" +all_versions = ["0.6", "0.7", "0.8"] """ preprocess object diff --git a/scripts/templates/params.hpp.mako b/scripts/templates/params.hpp.mako index 863c3d37ea..de971c481f 100644 --- a/scripts/templates/params.hpp.mako +++ b/scripts/templates/params.hpp.mako @@ -36,6 +36,8 @@ from templates import helper as th ${x}_params::serializePtr(os, ${caller.body()}); %elif th.type_traits.is_handle(itype): ${x}_params::serializePtr(os, ${caller.body()}); + %elif iname and iname.startswith("pfn"): + os << reinterpret_cast(${caller.body()}); %else: os << ${caller.body()}; %endif @@ -104,7 +106,7 @@ template <> struct is_handle<${th.make_type_name(n, tags, obj)}> : std::true_typ %endfor template inline constexpr bool is_handle_v = is_handle::value; -template inline void serializePtr(std::ostream &os, T *ptr); +template inline void serializePtr(std::ostream &os, const T *ptr); template inline void serializeFlag(std::ostream &os, uint32_t flag); template inline void serializeTagged(std::ostream &os, const void *ptr, T value, size_t size); @@ -192,7 +194,11 @@ template inline void serializeTagged(std::ostream &os, const void * case ${ename}: { %if th.value_traits.is_array(vtype): <% atype = th.value_traits.get_array_name(vtype) %> + %if 'void' in atype: + const ${atype} const *tptr = (const ${atype} const*)ptr; + %else: const ${atype} *tptr = (const ${atype} *)ptr; + %endif %if "char" in atype: ## print char* arrays as simple NULL-terminated strings serializePtr(os, tptr); %else: @@ -209,12 +215,16 @@ template inline void serializeTagged(std::ostream &os, const void * os << "}"; %endif %else: + %if 'void' in vtype: + const ${vtype} const *tptr = (const ${vtype} const *)ptr; + %else: const ${vtype} *tptr = (const ${vtype} *)ptr; + %endif if (sizeof(${vtype}) > size) { os << "invalid size (is: " << size << ", expected: >=" << sizeof(${vtype}) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; <%call expr="member(tptr, vtype, False)"> *tptr @@ -237,7 +247,7 @@ template inline void serializeTagged(std::ostream &os, const void * } ## structure type enum value must be first - enum ${th.make_enum_name(n, tags, obj)} *value = (enum ${th.make_enum_name(n, tags, obj)} *)ptr; + const enum ${th.make_enum_name(n, tags, obj)} *value = (const enum ${th.make_enum_name(n, tags, obj)} *)ptr; switch (*value) { %for n, item in enumerate(obj['etors']): <% @@ -362,21 +372,21 @@ inline std::ostream &operator<<(std::ostream &os, const struct ${th.make_pfncb_p namespace ${x}_params { -template inline void serializePtr(std::ostream &os, T *ptr) { +template inline void serializePtr(std::ostream &os, const T *ptr) { if (ptr == nullptr) { os << "nullptr"; } else if constexpr (std::is_pointer_v) { - os << (void *)(ptr) << " ("; + os << (const void *)(ptr) << " ("; serializePtr(os, *ptr); os << ")"; } else if constexpr (std::is_void_v || is_handle_v) { - os << (void *)ptr; + os << (const void *)ptr; } else if constexpr (std::is_same_v, char>) { - os << (void *)(ptr) << " ("; + os << (const void *)(ptr) << " ("; os << ptr; os << ")"; } else { - os << (void *)(ptr) << " ("; + os << (const void *)(ptr) << " ("; os << *ptr; os << ")"; } diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt index f240f9908b..5c6fb231da 100644 --- a/source/common/CMakeLists.txt +++ b/source/common/CMakeLists.txt @@ -3,28 +3,25 @@ # See LICENSE.TXT # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -add_library(ur_common INTERFACE) +add_subdirectory(unified_malloc_framework) +add_subdirectory(umf_pools) + +add_ur_library(ur_common STATIC + umf_helpers.hpp + ur_pool_manager.hpp + $<$:windows/ur_lib_loader.cpp> + $<$:linux/ur_lib_loader.cpp> +) add_library(${PROJECT_NAME}::common ALIAS ur_common) -target_include_directories(ur_common INTERFACE +target_include_directories(ur_common PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ) -add_subdirectory(unified_malloc_framework) -add_subdirectory(umf_pools) -target_link_libraries(ur_common INTERFACE unified_malloc_framework disjoint_pool ${CMAKE_DL_LIBS} ${PROJECT_NAME}::headers) - -if(WIN32) - target_sources(ur_common - INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/windows/ur_lib_loader.cpp - umf_helpers.hpp ur_pool_manager.hpp - ) -else() - target_sources(ur_common - INTERFACE - ${CMAKE_CURRENT_SOURCE_DIR}/linux/ur_lib_loader.cpp - umf_helpers.hpp ur_pool_manager.hpp - ) -endif() +target_link_libraries(ur_common PUBLIC + unified_malloc_framework + disjoint_pool + ${CMAKE_DL_LIBS} + ${PROJECT_NAME}::headers +) diff --git a/source/common/linux/ur_lib_loader.cpp b/source/common/linux/ur_lib_loader.cpp index 1c5e0af89b..d316e48b74 100644 --- a/source/common/linux/ur_lib_loader.cpp +++ b/source/common/linux/ur_lib_loader.cpp @@ -12,12 +12,7 @@ #include "logger/ur_logger.hpp" #include "ur_lib_loader.hpp" -#if defined(SANITIZER_ANY) || defined(__APPLE__) -#define LOAD_DRIVER_LIBRARY(NAME) dlopen(NAME, RTLD_LAZY | RTLD_LOCAL) -#else -#define LOAD_DRIVER_LIBRARY(NAME) \ - dlopen(NAME, RTLD_LAZY | RTLD_LOCAL | RTLD_DEEPBIND) -#endif +#define DEEP_BIND_ENV "UR_ADAPTERS_DEEP_BIND" namespace ur_loader { @@ -34,8 +29,21 @@ void LibLoader::freeAdapterLibrary(HMODULE handle) { std::unique_ptr LibLoader::loadAdapterLibrary(const char *name) { - return std::unique_ptr( - LOAD_DRIVER_LIBRARY(name)); + int mode = RTLD_LAZY | RTLD_LOCAL; +#if !defined(__APPLE__) + bool deepbind = getenv_tobool(DEEP_BIND_ENV); + if (deepbind) { +#if defined(SANITIZER_ANY) + logger::warning( + "Enabling RTLD_DEEPBIND while running under a sanitizer is likely " + "to cause issues. Consider disabling {} environment variable.", + DEEP_BIND_ENV); +#endif + mode |= RTLD_DEEPBIND; + } +#endif + + return std::unique_ptr(dlopen(name, mode)); } void *LibLoader::getFunctionPtr(HMODULE handle, const char *func_name) { diff --git a/source/common/ur_params.hpp b/source/common/ur_params.hpp index 4c1c90e993..76641dcb65 100644 --- a/source/common/ur_params.hpp +++ b/source/common/ur_params.hpp @@ -40,7 +40,7 @@ struct is_handle : std::true_type {}; template <> struct is_handle : std::true_type {}; template inline constexpr bool is_handle_v = is_handle::value; -template inline void serializePtr(std::ostream &os, T *ptr); +template inline void serializePtr(std::ostream &os, const T *ptr); template inline void serializeFlag(std::ostream &os, uint32_t flag); template @@ -1323,7 +1323,8 @@ inline void serializeStruct(std::ostream &os, const void *ptr) { return; } - enum ur_structure_type_t *value = (enum ur_structure_type_t *)ptr; + const enum ur_structure_type_t *value = + (const enum ur_structure_type_t *)ptr; switch (*value) { case UR_STRUCTURE_TYPE_CONTEXT_PROPERTIES: { @@ -2076,7 +2077,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -2123,7 +2124,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_adapter_backend_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -2137,7 +2138,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -2263,7 +2264,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_platform_backend_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -2945,7 +2946,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_device_type_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -2959,7 +2960,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -2973,7 +2974,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -2987,7 +2988,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3001,7 +3002,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3030,7 +3031,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3046,7 +3047,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -3062,7 +3063,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -3078,7 +3079,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -3092,7 +3093,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_queue_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -3106,7 +3107,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3120,7 +3121,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3134,7 +3135,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3148,7 +3149,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3162,7 +3163,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3176,7 +3177,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3190,7 +3191,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3204,7 +3205,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3218,7 +3219,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3232,7 +3233,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3246,7 +3247,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3260,7 +3261,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3274,7 +3275,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3288,7 +3289,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3302,7 +3303,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3316,7 +3317,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3330,7 +3331,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3344,7 +3345,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3358,7 +3359,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3372,7 +3373,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3386,7 +3387,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3400,7 +3401,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3414,7 +3415,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3428,7 +3429,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3442,7 +3443,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3456,7 +3457,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3470,7 +3471,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3484,7 +3485,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3498,7 +3499,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3512,7 +3513,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3526,7 +3527,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3540,7 +3541,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3555,7 +3556,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_device_mem_cache_type_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3569,7 +3570,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3583,7 +3584,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3597,7 +3598,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3611,7 +3612,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3625,7 +3626,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3639,7 +3640,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3654,7 +3655,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_device_local_mem_type_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3668,7 +3669,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3682,7 +3683,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3696,7 +3697,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3710,7 +3711,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3724,7 +3725,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3738,7 +3739,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3752,7 +3753,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3766,7 +3767,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3782,7 +3783,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -3796,7 +3797,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_queue_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -3810,7 +3811,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_queue_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -3830,7 +3831,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_platform_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -3844,7 +3845,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3906,7 +3907,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3920,7 +3921,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3934,7 +3935,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_device_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -3963,7 +3964,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -3979,7 +3980,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4009,7 +4010,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4023,7 +4024,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4053,7 +4054,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << sizeof(ur_device_usm_access_capability_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4069,7 +4070,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << sizeof(ur_device_usm_access_capability_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4085,7 +4086,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << sizeof(ur_device_usm_access_capability_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4101,7 +4102,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << sizeof(ur_device_usm_access_capability_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4117,7 +4118,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << sizeof(ur_device_usm_access_capability_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4144,7 +4145,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4158,7 +4159,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4172,7 +4173,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4186,7 +4187,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4200,7 +4201,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4214,7 +4215,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4228,7 +4229,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4242,7 +4243,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4256,7 +4257,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4270,7 +4271,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4286,7 +4287,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4302,7 +4303,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4318,7 +4319,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4334,7 +4335,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -4348,7 +4349,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4362,7 +4363,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4376,7 +4377,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4390,7 +4391,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4419,7 +4420,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4433,7 +4434,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4447,7 +4448,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4461,7 +4462,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4475,7 +4476,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4489,7 +4490,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4503,7 +4504,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4517,7 +4518,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4531,7 +4532,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4545,7 +4546,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4559,7 +4560,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4573,7 +4574,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4587,7 +4588,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4601,7 +4602,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4615,7 +4616,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4629,7 +4630,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4643,7 +4644,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4657,7 +4658,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4671,7 +4672,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4685,7 +4686,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4699,7 +4700,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4713,7 +4714,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -4727,7 +4728,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -5648,7 +5649,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -5677,7 +5678,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -5691,7 +5692,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -5705,7 +5706,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -5721,7 +5722,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -5737,7 +5738,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -5753,7 +5754,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -5769,7 +5770,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -5985,7 +5986,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -5999,7 +6000,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_context_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -6203,7 +6204,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_image_format_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6217,7 +6218,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6231,7 +6232,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6245,7 +6246,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6259,7 +6260,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6273,7 +6274,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6287,7 +6288,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6594,7 +6595,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6608,7 +6609,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_context_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -6622,7 +6623,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6638,7 +6639,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6653,7 +6654,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_sampler_filter_mode_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6944,7 +6945,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_usm_type_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6952,13 +6953,13 @@ inline void serializeTagged(std::ostream &os, const void *ptr, } break; case UR_USM_ALLOC_INFO_BASE_PTR: { - const void **tptr = (const void **)ptr; + const void *const *tptr = (const void *const *)ptr; if (sizeof(void *) > size) { os << "invalid size (is: " << size << ", expected: >=" << sizeof(void *) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6972,7 +6973,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -6986,7 +6987,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_device_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -7000,7 +7001,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_usm_pool_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -7414,7 +7415,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -7428,7 +7429,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_context_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -7476,7 +7477,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -7490,7 +7491,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -7607,7 +7608,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -7869,7 +7870,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -7883,7 +7884,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_context_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -7897,7 +7898,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -7953,7 +7954,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8065,7 +8066,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_program_build_status_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8092,7 +8093,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_program_binary_type_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8242,7 +8243,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8256,7 +8257,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8270,7 +8271,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_context_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -8284,7 +8285,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_program_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -8304,7 +8305,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8382,7 +8383,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8411,7 +8412,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8425,7 +8426,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8439,7 +8440,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(size_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8494,7 +8495,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8508,7 +8509,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8522,7 +8523,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8536,7 +8537,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8608,7 +8609,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8617,7 +8618,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, case UR_KERNEL_EXEC_INFO_USM_PTRS: { - const void **tptr = (const void **)ptr; + const void *const *tptr = (const void *const *)ptr; os << "{"; size_t nelems = size / sizeof(void *); for (size_t i = 0; i < nelems; ++i) { @@ -8638,7 +8639,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_kernel_cache_config_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8799,7 +8800,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_queue_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -8813,7 +8814,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_device_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -8827,7 +8828,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_queue_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -8841,7 +8842,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_queue_flags_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializeFlag(os, *tptr); @@ -8855,7 +8856,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8869,7 +8870,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -8883,7 +8884,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_bool_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9359,7 +9360,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_queue_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -9373,7 +9374,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_context_handle_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; ur_params::serializePtr(os, *tptr); @@ -9387,7 +9388,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_command_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9401,7 +9402,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(ur_event_status_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9415,7 +9416,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9474,7 +9475,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9488,7 +9489,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9502,7 +9503,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9516,7 +9517,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9530,7 +9531,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint64_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9933,7 +9934,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -9947,7 +9948,7 @@ inline void serializeTagged(std::ostream &os, const void *ptr, << ", expected: >=" << sizeof(uint32_t) << ")"; return; } - os << (void *)(tptr) << " ("; + os << (const void *)(tptr) << " ("; os << *tptr; @@ -11342,7 +11343,7 @@ operator<<(std::ostream &os, os << ", "; os << ".pfnDeleter = "; - os << *(params->ppfnDeleter); + os << reinterpret_cast(*(params->ppfnDeleter)); os << ", "; os << ".pUserData = "; @@ -12995,7 +12996,7 @@ operator<<(std::ostream &os, os << ", "; os << ".pfnNotify = "; - os << *(params->ppfnNotify); + os << reinterpret_cast(*(params->ppfnNotify)); os << ", "; os << ".pUserData = "; @@ -15310,21 +15311,21 @@ operator<<(std::ostream &os, namespace ur_params { -template inline void serializePtr(std::ostream &os, T *ptr) { +template inline void serializePtr(std::ostream &os, const T *ptr) { if (ptr == nullptr) { os << "nullptr"; } else if constexpr (std::is_pointer_v) { - os << (void *)(ptr) << " ("; + os << (const void *)(ptr) << " ("; serializePtr(os, *ptr); os << ")"; } else if constexpr (std::is_void_v || is_handle_v) { - os << (void *)ptr; + os << (const void *)ptr; } else if constexpr (std::is_same_v, char>) { - os << (void *)(ptr) << " ("; + os << (const void *)(ptr) << " ("; os << ptr; os << ")"; } else { - os << (void *)(ptr) << " ("; + os << (const void *)(ptr) << " ("; os << *ptr; os << ")"; } diff --git a/source/loader/ur_adapter_registry.hpp b/source/loader/ur_adapter_registry.hpp index 877206c062..67ddca9890 100644 --- a/source/loader/ur_adapter_registry.hpp +++ b/source/loader/ur_adapter_registry.hpp @@ -113,10 +113,11 @@ class AdapterRegistry { // to load the adapter. std::vector> adaptersLoadPaths; - static constexpr std::array knownAdapterNames{ + static constexpr std::array knownAdapterNames{ MAKE_LIBRARY_NAME("ur_adapter_level_zero", "0"), - MAKE_LIBRARY_NAME("ur_adapter_cuda", "0"), - MAKE_LIBRARY_NAME("ur_adapter_hip", "0")}; + MAKE_LIBRARY_NAME("ur_adapter_hip", "0"), + MAKE_LIBRARY_NAME("ur_adapter_opencl", "0"), + MAKE_LIBRARY_NAME("ur_adapter_cuda", "0")}; std::optional> getEnvAdapterSearchPaths() { std::optional> pathStringsOpt; diff --git a/source/ur_api.cpp b/source/ur_api.cpp index fac4d47c2d..456c584d68 100644 --- a/source/ur_api.cpp +++ b/source/ur_api.cpp @@ -7,7 +7,7 @@ * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception * * @file ur_api.cpp - * @version v0.7-r0 + * @version v0.8-r0 * */ #include "ur_api.h" diff --git a/test/conformance/context/context_adapter_level_zero.match b/test/conformance/context/context_adapter_level_zero.match index b66630d2e7..e43bf4d5b8 100644 --- a/test/conformance/context/context_adapter_level_zero.match +++ b/test/conformance/context/context_adapter_level_zero.match @@ -1,4 +1 @@ -urContextCreateWithNativeHandleTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_ -{{OPT}}urContextGetInfoTestWithInfoParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_CONTEXT_INFO_USM_MEMCPY2D_SUPPORT -{{OPT}}urContextGetInfoTestWithInfoParam.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}___UR_CONTEXT_INFO_USM_FILL2D_SUPPORT urContextSetExtendedDeleterTest.Success/Intel_R__oneAPI_Unified_Runtime_over_Level_Zero___{{.*}}_ diff --git a/test/conformance/context/urContextCreateWithNativeHandle.cpp b/test/conformance/context/urContextCreateWithNativeHandle.cpp index 04ef93c0f0..69771362b4 100644 --- a/test/conformance/context/urContextCreateWithNativeHandle.cpp +++ b/test/conformance/context/urContextCreateWithNativeHandle.cpp @@ -20,7 +20,7 @@ TEST_P(urContextCreateWithNativeHandleTest, Success) { // and perform some query on it to verify that it works. ur_context_handle_t ctx = nullptr; ur_context_native_properties_t props{}; - ASSERT_SUCCESS(urContextCreateWithNativeHandle(native_context, 0, nullptr, + ASSERT_SUCCESS(urContextCreateWithNativeHandle(native_context, 1, &device, &props, &ctx)); ASSERT_NE(ctx, nullptr); diff --git a/test/loader/loader_config/CMakeLists.txt b/test/loader/loader_config/CMakeLists.txt index b2c2ffc4ec..db07bec990 100644 --- a/test/loader/loader_config/CMakeLists.txt +++ b/test/loader/loader_config/CMakeLists.txt @@ -3,7 +3,7 @@ # See LICENSE.TXT # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -add_executable(test-loader-config +add_ur_executable(test-loader-config urLoaderConfigCreate.cpp urLoaderConfigGetInfo.cpp urLoaderConfigEnableLayer.cpp