Merge remote-tracking branch 'upstream/main' into uwe/native_cpu

uwedolinsky · uwedolinsky · commit c212ec2fa2e0 · 2023-08-03T10:11:18.000+01:00
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -81,6 +81,9 @@ jobs:
     - name: Generate source from spec, check for uncommitted diff
       if: matrix.os == 'ubuntu-22.04'
       run: cmake --build ${{github.workspace}}/build --target check-generated
+    
+    - name: Verify that each source file contains a license
+      run: cmake --build ${{github.workspace}}/build --target verify-licenses
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build -j $(nproc)
diff --git 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.6.0)
+project(unified-runtime VERSION 0.7.0)
 
 include(GNUInstallDirs)
 include(CheckCXXSourceCompiles)
@@ -157,6 +157,7 @@ endif()
 
 # Obtain files for clang-format
 set(format_glob)
+set(license_glob)
 foreach(dir examples include source test tools)
     list(APPEND format_glob
         "${dir}/*.h"
@@ -167,8 +168,26 @@ foreach(dir examples include source test tools)
         "${dir}/**/*.hpp"
         "${dir}/**/*.c"
         "${dir}/**/*.cpp")
+    list(APPEND license_glob
+        "${dir}/*.yml"
+        "${dir}/**/*.yml"
+        "${dir}/*.py"
+        "${dir}/**/*.py"
+        "${dir}/**/CMakeLists.txt"
+        "${dir}/CMakeLists.txt"
+    )
 endforeach()
 file(GLOB_RECURSE format_src ${format_glob})
+file(GLOB_RECURSE license_src ${license_glob})
+
+# check for licence
+list(FILTER license_src EXCLUDE REGEX "registry.yml")
+add_custom_target(verify-licenses
+    COMMAND ${Python3_EXECUTABLE}
+        "${PROJECT_SOURCE_DIR}/scripts/verify_license.py"
+        "--files" ${format_src} ${license_src}
+    COMMENT "Verify all files contain a license."
+)
 
 # Add code formatter target
 add_custom_target(cppformat)
diff --git a/cmake/helpers.cmake b/cmake/helpers.cmake
@@ -66,7 +66,6 @@ function(add_ur_target_compile_options name)
             $<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=always>
             $<$<CXX_COMPILER_ID:Clang,AppleClang>:-fcolor-diagnostics>
         )
-
         if (CMAKE_BUILD_TYPE STREQUAL "Release")
             target_compile_definitions(${name} PRIVATE -D_FORTIFY_SOURCE=2)
         endif()
@@ -84,27 +83,46 @@ function(add_ur_target_compile_options name)
             /MD$<$<CONFIG:Debug>:d>
             /GS
         )
-        add_link_options(
+
+        if(UR_DEVELOPER_MODE)
+            target_compile_options(${name} PRIVATE /WX /GS)
+        endif()
+    endif()
+endfunction()
+
+function(add_ur_target_link_options name)
+    if(NOT MSVC)
+        if (NOT APPLE)
+            target_link_options(${name} PRIVATE "LINKER:-z,relro,-z,now")
+        endif()
+    elseif(MSVC)
+        target_link_options(${name} PRIVATE
             /DYNAMICBASE
             /HIGHENTROPYVA
-            /ALLOWISOLATION
             /NXCOMPAT
         )
+    endif()
+endfunction()
 
-        if(UR_DEVELOPER_MODE)
-            target_compile_options(${name} PRIVATE /WX /GS)
-        endif()
+function(add_ur_target_exec_options name)
+    if(MSVC)
+        target_link_options(${name} PRIVATE
+            /ALLOWISOLATION
+        )
     endif()
 endfunction()
 
 function(add_ur_executable name)
     add_executable(${name} ${ARGN})
     add_ur_target_compile_options(${name})
+    add_ur_target_exec_options(${name})
+    add_ur_target_link_options(${name})
 endfunction()
 
 function(add_ur_library name)
     add_library(${name} ${ARGN})
     add_ur_target_compile_options(${name})
+    add_ur_target_link_options(${name})
 endfunction()
 
 include(FetchContent)
diff --git 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.6-r0
+ @version v0.7-r0
 
  """
 import platform
@@ -569,7 +569,8 @@ def __str__(self):
 ##       ::UR_MAJOR_VERSION and ::UR_MINOR_VERSION
 class ur_api_version_v(IntEnum):
     _0_6 = UR_MAKE_VERSION( 0, 6 )                  ## version 0.6
-    CURRENT = UR_MAKE_VERSION( 0, 6 )               ## latest known version
+    _0_7 = UR_MAKE_VERSION( 0, 7 )                  ## version 0.7
+    CURRENT = UR_MAKE_VERSION( 0, 7 )               ## 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
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  * @file ur_api.h
- * @version v0.6-r0
+ * @version v0.7-r0
  *
  */
 #ifndef UR_API_H_INCLUDED
@@ -1021,7 +1021,8 @@ urPlatformGetInfo(
 ///       ::UR_MAJOR_VERSION and ::UR_MINOR_VERSION
 typedef enum ur_api_version_t {
     UR_API_VERSION_0_6 = UR_MAKE_VERSION(0, 6),     ///< version 0.6
-    UR_API_VERSION_CURRENT = UR_MAKE_VERSION(0, 6), ///< latest known version
+    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
     /// @cond
     UR_API_VERSION_FORCE_UINT32 = 0x7fffffff
     /// @endcond
diff --git 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.6-r0
+ * @version v0.7-r0
  *
  */
 #ifndef UR_DDI_H_INCLUDED
diff --git 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.6
+PROJECT_NUMBER         = v0.7
 
 # 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/core/exp-bindless-images.yml b/scripts/core/exp-bindless-images.yml
@@ -1,3 +1,12 @@
+#
+# Copyright (C) 2023 Intel Corporation
+#
+# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.TXT
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# See YaML.md for syntax definition
+#
 --- #--------------------------------------------------------------------------
 type: header
 desc: "Bindless Images Extension APIs"
diff --git a/scripts/core/exp-usm-import-release.yml b/scripts/core/exp-usm-import-release.yml
@@ -1,3 +1,12 @@
+#
+# Copyright (C) 2023 Intel Corporation
+#
+# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+# See LICENSE.TXT
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+# See YaML.md for syntax definition
+#
 --- #--------------------------------------------------------------------------
 type: header
 desc: "Intel $OneApi USM Import/Release Extension APIs"
diff --git a/scripts/core/platform.yml b/scripts/core/platform.yml
@@ -130,6 +130,9 @@ etors:
     - name: "0_6"
       value: "$X_MAKE_VERSION( 0, 6 )"
       desc: "version 0.6"
+    - name: "0_7"
+      value: "$X_MAKE_VERSION( 0, 7 )"
+      desc: "version 0.7"
 --- #--------------------------------------------------------------------------
 type: function
 desc: "Returns the API version supported by the specified platform"
diff --git a/scripts/parse_specs.py b/scripts/parse_specs.py
@@ -18,8 +18,8 @@
 import ctypes
 import itertools
 
-default_version = "0.5"
-all_versions = ["0.5", "1.0", "1.1", "2.0"]
+default_version = "0.7"
+all_versions = ["0.6", "0.7"]
 
 """
     preprocess object
@@ -915,9 +915,9 @@ def parse(section, version, tags, meta, ref):
                 for c in '_-':
                     name = name.replace(c, ' ')
             elif header:
-                # for d in _make_versions(d, float(version)):
-                objects.append(d)
-                meta = _generate_meta(d, header['ordinal'], meta)
+                for d in _make_versions(d, float(version)):
+                    objects.append(d)
+                    meta = _generate_meta(d, header['ordinal'], meta)
 
         if header:
             specs.append({
diff --git a/scripts/templates/__init__.py b/scripts/templates/__init__.py
@@ -0,0 +1,8 @@
+"""
+ Copyright (C) 2023 Intel Corporation
+
+ Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+ See LICENSE.TXT
+ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+"""
diff --git a/scripts/verify_license.py b/scripts/verify_license.py
@@ -0,0 +1,28 @@
+"""
+ Copyright (C) 2023 Intel Corporation
+
+ Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions.
+ See LICENSE.TXT
+ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+"""
+
+import sys
+import argparse
+
+def verify_file_has_license(file):
+    with open(file, 'r') as in_file:
+        contents = in_file.read(300)
+        if "SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception" not in contents:
+            raise Exception(f"{file} does not contain a license!")
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-f', '--files', nargs='+', default=[])
+    args = parser.parse_args()
+    for file in args.files:
+        verify_file_has_license(file)
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/source/common/logger/ur_sinks.hpp b/source/common/logger/ur_sinks.hpp
@@ -28,7 +28,7 @@ class Sink {
 
         format(buffer, fmt, std::forward<Args &&>(args)...);
 
-        std::scoped_lock lock(output_mutex);
+        std::scoped_lock<std::mutex> lock(output_mutex);
         *ostream << buffer.str();
         if (level >= flush_level) {
             ostream->flush();
diff --git a/source/loader/layers/ur_proxy_layer.hpp b/source/loader/layers/ur_proxy_layer.hpp
@@ -20,7 +20,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 class __urdlllocal proxy_layer_context_t {
   public:
-    ur_api_version_t version = UR_API_VERSION_0_6;
+    ur_api_version_t version = UR_API_VERSION_CURRENT;
 
     virtual std::vector<std::string> getNames() const = 0;
     virtual bool isAvailable() const = 0;
diff --git a/source/loader/ur_loader.hpp b/source/loader/ur_loader.hpp
@@ -30,7 +30,7 @@ using platform_vector_t = std::vector<platform_t>;
 
 class context_t {
   public:
-    ur_api_version_t version = UR_API_VERSION_0_6;
+    ur_api_version_t version = UR_API_VERSION_CURRENT;
 
     platform_vector_t platforms;
     AdapterRegistry adapter_registry;
diff --git 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.6-r0
+ * @version v0.7-r0
  *
  */
 #include "ur_api.h"
diff --git a/test/conformance/enqueue/urEnqueueKernelLaunch.cpp b/test/conformance/enqueue/urEnqueueKernelLaunch.cpp
@@ -120,3 +120,93 @@ TEST_P(urEnqueueKernelLaunch3DTest, Success) {
     ASSERT_SUCCESS(urQueueFinish(queue));
     ValidateBuffer(buffer, buffer_size, val);
 }
+
+struct urEnqueueKernelLaunchWithVirtualMemory : uur::urKernelExecutionTest {
+
+    void SetUp() override {
+        program_name = "fill_usm";
+        UUR_RETURN_ON_FATAL_FAILURE(uur::urKernelExecutionTest::SetUp());
+
+        ur_bool_t virtual_memory_support = false;
+        ASSERT_SUCCESS(urDeviceGetInfo(
+            device, UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT, sizeof(ur_bool_t),
+            &virtual_memory_support, nullptr));
+        if (!virtual_memory_support) {
+            GTEST_SKIP() << "Virtual memory is not supported.";
+        }
+
+        ASSERT_SUCCESS(urVirtualMemGranularityGetInfo(
+            context, device, UR_VIRTUAL_MEM_GRANULARITY_INFO_MINIMUM,
+            sizeof(granularity), &granularity, nullptr));
+
+        alloc_size = 1024;
+        virtual_page_size =
+            uur::RoundUpToNearestFactor(alloc_size, granularity);
+
+        ASSERT_SUCCESS(urPhysicalMemCreate(context, device, virtual_page_size,
+                                           nullptr, &physical_mem));
+
+        ASSERT_SUCCESS(urVirtualMemReserve(context, nullptr, virtual_page_size,
+                                           &virtual_ptr));
+
+        ASSERT_SUCCESS(urVirtualMemMap(context, virtual_ptr, virtual_page_size,
+                                       physical_mem, 0,
+                                       UR_VIRTUAL_MEM_ACCESS_FLAG_READ_WRITE));
+
+        int pattern = 0;
+        ASSERT_SUCCESS(urEnqueueUSMFill(queue, virtual_ptr, sizeof(pattern),
+                                        &pattern, virtual_page_size, 0, nullptr,
+                                        nullptr));
+        ASSERT_SUCCESS(urQueueFinish(queue));
+    }
+
+    void TearDown() override {
+
+        if (virtual_ptr) {
+            EXPECT_SUCCESS(
+                urVirtualMemUnmap(context, virtual_ptr, virtual_page_size));
+            EXPECT_SUCCESS(
+                urVirtualMemFree(context, virtual_ptr, virtual_page_size));
+        }
+
+        if (physical_mem) {
+            EXPECT_SUCCESS(urPhysicalMemRelease(physical_mem));
+        }
+
+        UUR_RETURN_ON_FATAL_FAILURE(uur::urKernelExecutionTest::TearDown());
+    }
+
+    size_t granularity = 0;
+    size_t alloc_size = 0;
+    size_t virtual_page_size = 0;
+    ur_physical_mem_handle_t physical_mem = nullptr;
+    void *virtual_ptr = nullptr;
+};
+UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urEnqueueKernelLaunchWithVirtualMemory);
+
+TEST_P(urEnqueueKernelLaunchWithVirtualMemory, Success) {
+    size_t work_dim = 1;
+    size_t global_offset = 0;
+    size_t global_size = alloc_size / sizeof(uint32_t);
+    uint32_t fill_val = 42;
+
+    ASSERT_SUCCESS(urKernelSetArgPointer(kernel, 0, nullptr, virtual_ptr));
+    ASSERT_SUCCESS(
+        urKernelSetArgValue(kernel, 1, sizeof(fill_val), nullptr, &fill_val));
+
+    ur_event_handle_t kernel_evt;
+    ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, kernel, work_dim,
+                                         &global_offset, &global_size, nullptr,
+                                         0, nullptr, &kernel_evt));
+
+    std::vector<uint32_t> data(global_size);
+    ASSERT_SUCCESS(urEnqueueUSMMemcpy(queue, true, data.data(), virtual_ptr,
+                                      alloc_size, 1, &kernel_evt, nullptr));
+
+    ASSERT_SUCCESS(urQueueFinish(queue));
+
+    // verify fill worked
+    for (size_t i = 0; i < data.size(); i++) {
+        ASSERT_EQ(fill_val, data.at(i));
+    }
+}
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
diff --git a/test/tools/urtrace/CMakeLists.txt b/test/tools/urtrace/CMakeLists.txt
diff --git a/test/tools/urtrace/null_hello_begin.match b/test/tools/urtrace/null_hello_begin.match
diff --git a/test/tools/urtrace/null_hello_json.match b/test/tools/urtrace/null_hello_json.match

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception`
`8`	`8`	`*`
`9`	`9`	`* @file ur_ddi.h`
`10`		`- * @version v0.6-r0`
	`10`	`+ * @version v0.7-r0`
`11`	`11`	`*`
`12`	`12`	`*/`
`13`	`13`	`#ifndef UR_DDI_H_INCLUDED`