Merge branch 'adapters' into petr/level_zero

Author: veselypeta

.github/workflows/cmake.yml

@@ -58,12 +58,15 @@ jobs:
         cd ..
 
     - name: Download DPC++
+      if: matrix.os == 'ubuntu-22.04'
       run: |
         sudo apt install libncurses5
-        wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/sycl-nightly%2F20230626/dpcpp-compiler.tar.gz
-        tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz
+        wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2023-09-21/sycl_linux.tar.gz
+        mkdir -p ${{github.workspace}}/dpcpp_compiler
+        tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz -C ${{github.workspace}}/dpcpp_compiler
 
     - name: Configure CMake
+      if: matrix.os == 'ubuntu-22.04'
       run: >
         cmake
         -B${{github.workspace}}/build
@@ -77,6 +80,20 @@ jobs:
         ${{matrix.libbacktrace}}
         ${{matrix.pool_tracking}}
 
+    - name: Configure CMake
+      if: matrix.os == 'ubuntu-20.04'
+      run: >
+        cmake
+        -B${{github.workspace}}/build
+        -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
+        -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
+        -DUR_ENABLE_TRACING=ON
+        -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
+        -DUR_BUILD_TESTS=ON
+        -DUR_FORMAT_CPP_STYLE=ON
+        ${{matrix.libbacktrace}}
+        ${{matrix.pool_tracking}}
+
     - name: Generate source from spec, check for uncommitted diff
       if: matrix.os == 'ubuntu-22.04'
       run: cmake --build ${{github.workspace}}/build --target check-generated
@@ -159,7 +176,7 @@ jobs:
 
     - name: Download DPC++
       run: |
-        wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2023-08-31/sycl_linux.tar.gz
+        wget -O ${{github.workspace}}/dpcpp_compiler.tar.gz https://github.com/intel/llvm/releases/download/nightly-2023-09-21/sycl_linux.tar.gz
         mkdir dpcpp_compiler
         tar -xvf ${{github.workspace}}/dpcpp_compiler.tar.gz -C dpcpp_compiler
 
@@ -222,9 +239,10 @@ jobs:
         -DUR_BUILD_TESTS=ON
         -DUR_FORMAT_CPP_STYLE=ON
 
-    - name: Generate source from spec, check for uncommitted diff
-      if: matrix.os == 'windows-2022'
-      run: cmake --build ${{github.workspace}}/build --target check-generated --config ${{matrix.build_type}}
+    # TODO: re-enable when check-generated is fixed for windows runners see #888
+    # - name: Generate source from spec, check for uncommitted diff
+    #   if: matrix.os == 'windows-2022'
+    #   run: cmake --build ${{github.workspace}}/build --target check-generated --config ${{matrix.build_type}}
 
     - name: Build all
       run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}} -j 2

CMakeLists.txt

@@ -18,29 +18,29 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
   set(CMAKE_FIND_FRAMEWORK NEVER)
 endif()
 
-find_package(Python3 COMPONENTS Interpreter)
+find_package(Python3 COMPONENTS Interpreter REQUIRED)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
 # Build Options
-option(UR_DEVELOPER_MODE "enable developer checks, treats warnings as errors" OFF)
 option(UR_BUILD_TESTS "Build unit tests." ON)
+option(UR_BUILD_TOOLS "build ur tools" ON)
 option(UR_FORMAT_CPP_STYLE "format code style of C++ sources" OFF)
+option(UR_DEVELOPER_MODE "enable developer checks, treats warnings as errors" OFF)
 option(UR_USE_ASAN "enable AddressSanitizer" OFF)
 option(UR_USE_UBSAN "enable UndefinedBehaviorSanitizer" OFF)
 option(UR_USE_MSAN "enable MemorySanitizer" OFF)
 option(UR_USE_TSAN "enable ThreadSanitizer" OFF)
-option(UMF_BUILD_SHARED_LIBRARY "Build UMF as shared library" OFF)
 option(UR_ENABLE_TRACING "enable api tracing through xpti" OFF)
-option(VAL_USE_LIBBACKTRACE_BACKTRACE "enable libbacktrace validation backtrace for linux" OFF)
-option(UR_BUILD_TOOLS "build ur tools" ON)
+option(UMF_BUILD_SHARED_LIBRARY "Build UMF as shared library" OFF)
 option(UMF_ENABLE_POOL_TRACKING "Build UMF with pool tracking" OFF)
 option(UR_BUILD_ADAPTER_L0 "build level 0 adapter from SYCL" OFF)
 option(UR_BUILD_ADAPTER_OPENCL "build opencl adapter from SYCL" OFF)
 option(UR_BUILD_ADAPTER_CUDA "build cuda adapter from SYCL" OFF)
 option(UR_BUILD_ADAPTER_HIP "build hip adapter from SYCL" OFF)
 option(UR_BUILD_EXAMPLE_CODEGEN "Build the codegen example." OFF)
+option(VAL_USE_LIBBACKTRACE_BACKTRACE "enable libbacktrace validation backtrace for linux" OFF)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -135,23 +135,15 @@ if(UR_USE_MSAN)
     add_sanitizer_flag(memory)
 endif()
 
-# Allow custom third_party folder
-if(NOT DEFINED THIRD_PARTY_DIR)
-    set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
-endif()
-
-find_program(CLANG_FORMAT NAMES clang-format-15 clang-format-15.0 clang-format)
-
-set(CLANG_FORMAT_REQUIRED "15.0")
+# Check if clang-format (in correct version) is available for Cpp code formatting.
+if(UR_FORMAT_CPP_STYLE)
+    find_program(CLANG_FORMAT NAMES clang-format-15 clang-format-15.0 clang-format)
 
-if(CLANG_FORMAT)
-    get_program_version_major_minor(${CLANG_FORMAT} CLANG_FORMAT_VERSION)
-    message(STATUS "Found clang-format: ${CLANG_FORMAT} (version: ${CLANG_FORMAT_VERSION})")
-endif()
+    if(CLANG_FORMAT)        
+        get_program_version_major_minor(${CLANG_FORMAT} CLANG_FORMAT_VERSION)
+        message(STATUS "Found clang-format: ${CLANG_FORMAT} (version: ${CLANG_FORMAT_VERSION})")
 
-# Check if the correct version of clang-format is available
-if(UR_FORMAT_CPP_STYLE)
-    if(CLANG_FORMAT)
+        set(CLANG_FORMAT_REQUIRED "15.0")
         if(NOT (CLANG_FORMAT_VERSION VERSION_EQUAL CLANG_FORMAT_REQUIRED))
             message(FATAL_ERROR "required clang-format version is ${CLANG_FORMAT_REQUIRED}")
         endif()
@@ -160,7 +152,7 @@ if(UR_FORMAT_CPP_STYLE)
     endif()
 endif()
 
-# Obtain files for clang-format
+# Obtain files for clang-format and license check
 set(format_glob)
 set(license_glob)
 foreach(dir examples include source test tools)
@@ -185,7 +177,7 @@ endforeach()
 file(GLOB_RECURSE format_src ${format_glob})
 file(GLOB_RECURSE license_src ${license_glob})
 
-# check for licence
+# Add license check target
 list(FILTER license_src EXCLUDE REGEX "registry.yml")
 add_custom_target(verify-licenses
     COMMAND ${Python3_EXECUTABLE}
@@ -196,9 +188,13 @@ add_custom_target(verify-licenses
 
 # Add code formatter target
 add_custom_target(cppformat)
+# ... and all source files to the formatter
+add_cppformat(all-sources ${format_src})
 
-# Add files to the formatter
-add_cppformat(src-formatter ${format_src})
+# Allow custom third_party folder
+if(NOT DEFINED THIRD_PARTY_DIR)
+    set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
+endif()
 
 add_subdirectory(${THIRD_PARTY_DIR})
 
@@ -278,5 +274,5 @@ if(UR_FORMAT_CPP_STYLE)
         DEPENDS generate
     )
 else()
-    message(WARNING "UR_FORMAT_CPP_STYLE not set. Targets: 'generate' and 'check-generated' and not available")
+    message(STATUS "  UR_FORMAT_CPP_STYLE not set. Targets: 'generate' and 'check-generated' are not available")
 endif()

README.md

@@ -22,6 +22,7 @@ see cmake options for details.
     - [Weekly tags](#weekly-tags)
   - [Third-Party tools](#third-party-tools)
   - [Building](#building)
+    - [Requirements](#requirements)
     - [Windows](#windows)
     - [Linux](#linux)
     - [CMake standard options](#cmake-standard-options)
@@ -79,9 +80,14 @@ Tools can be acquired via instructions in [third_party](/third_party/README.md).
 
 ## Building
 
-Requirements:
+### Requirements
+
+Required packages:
 - C++ compiler with C++17 support
 - [CMake](https://cmake.org/) >= 3.14.0
+- Python v3.6.6 or later
+
+For development and contributions:
 - clang-format-15.0 (can be installed with `python -m pip install clang-format==15.0.7`)
 
 ### Windows

cmake/match.cmake

@@ -71,9 +71,7 @@ execute_process(
 )
 
 if(TEST_RESULT)
-    file(READ ${OUT_FILE} OUTPUT)
-    file(READ ${MATCH_FILE} MATCH_STRING)
-    message(FATAL_ERROR "Failed: The output of ${OUT_FILE}:\n  ${OUTPUT}\n does not match ${MATCH_FILE}:\n ${MATCH_STRING} (${TEST_RESULT})")
+    message(FATAL_ERROR "Failed (${TEST_RESULT}): The output of ${OUT_FILE} does not match ${MATCH_FILE}")
 elseif()
     message("Passed: The output ${OUT_FILE} matches ${MATCH_FILE}")
 endif()

cmake/match.py

@@ -30,7 +30,7 @@
 for i, match_line in enumerate(match_lines):
     if match_line.startswith(opt):
         optional_line = True
-        match_line = match_line.removeprefix(opt)
+        match_line = match_line[len(opt):]
     else:
         optional_line = False
 
@@ -60,6 +60,11 @@
             print("Line " + str(i+1) + " does not match")
             print("is:       " + input_line)
             print("expected: " + match_line.strip())
+            print("--- Input Lines " + "-" * 64)
+            print("".join(input_lines).strip())
+            print("--- Match Lines " + "-" * 64)
+            print("".join(match_lines).strip())
+            print("-" * 80)
             sys.exit(1)
     else:
         if (input_idx == len(input_lines) - 1):

include/ur.py

@@ -641,6 +641,10 @@ def __str__(self):
 ## @brief AMD GCN
 UR_DEVICE_BINARY_TARGET_AMDGCN = "amdgcn"
 
+###############################################################################
+## @brief Native CPU
+UR_DEVICE_BINARY_TARGET_NATIVE_CPU = "native_cpu"
+
 ###############################################################################
 ## @brief Device Binary Type
 class ur_device_binary_t(Structure):
@@ -828,6 +832,7 @@ class ur_device_info_v(IntEnum):
                                                     ## is implementation-defined, but newer devices should have a higher
                                                     ## version than older devices.
     VIRTUAL_MEMORY_SUPPORT = 114                    ## [::ur_bool_t] return true if the device supports virtual memory.
+    ESIMD_SUPPORT = 115                             ## [::ur_bool_t] return true if the device supports ESIMD.
     BINDLESS_IMAGES_SUPPORT_EXP = 0x2000            ## [::ur_bool_t] returns true if the device supports the creation of
                                                     ## bindless images
     BINDLESS_IMAGES_SHARED_USM_SUPPORT_EXP = 0x2001 ## [::ur_bool_t] returns true if the device supports the creation of

include/ur_api.h

@@ -1225,6 +1225,12 @@ typedef enum ur_platform_backend_t {
 #define UR_DEVICE_BINARY_TARGET_AMDGCN "amdgcn"
 #endif // UR_DEVICE_BINARY_TARGET_AMDGCN
 
+///////////////////////////////////////////////////////////////////////////////
+#ifndef UR_DEVICE_BINARY_TARGET_NATIVE_CPU
+/// @brief Native CPU
+#define UR_DEVICE_BINARY_TARGET_NATIVE_CPU "native_cpu"
+#endif // UR_DEVICE_BINARY_TARGET_NATIVE_CPU
+
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Device Binary Type
 typedef struct ur_device_binary_t {
@@ -1455,6 +1461,7 @@ typedef enum ur_device_info_t {
                                                                     ///< is implementation-defined, but newer devices should have a higher
                                                                     ///< version than older devices.
     UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT = 114,                    ///< [::ur_bool_t] return true if the device supports virtual memory.
+    UR_DEVICE_INFO_ESIMD_SUPPORT = 115,                             ///< [::ur_bool_t] return true if the device supports ESIMD.
     UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP = 0x2000,            ///< [::ur_bool_t] returns true if the device supports the creation of
                                                                     ///< bindless images
     UR_DEVICE_INFO_BINDLESS_IMAGES_SHARED_USM_SUPPORT_EXP = 0x2001, ///< [::ur_bool_t] returns true if the device supports the creation of
@@ -4408,8 +4415,6 @@ urProgramCreateWithNativeHandle(
 /// @brief Create kernel object from a program.
 ///
 /// @details
-///     - Multiple calls to this function will return identical device handles,
-///       in the same order.
 ///     - The application may call this function from simultaneous threads.
 ///     - The implementation of this function should be lock-free.
 ///

scripts/core/device.yml

@@ -61,6 +61,11 @@ desc: "AMD GCN"
 name: "$X_DEVICE_BINARY_TARGET_AMDGCN"
 value: "\"amdgcn\""
 --- #--------------------------------------------------------------------------
+type: macro
+desc: "Native CPU"
+name: "$X_DEVICE_BINARY_TARGET_NATIVE_CPU"
+value: "\"native_cpu\""
+--- #--------------------------------------------------------------------------
 type: struct
 desc: "Device Binary Type"
 name: $x_device_binary_t
@@ -385,6 +390,8 @@ etors:
       desc: "[uint32_t] The device IP version. The meaning of the device IP version is implementation-defined, but newer devices should have a higher version than older devices."
     - name: VIRTUAL_MEMORY_SUPPORT
       desc: "[$x_bool_t] return true if the device supports virtual memory."
+    - name: ESIMD_SUPPORT
+      desc: "[$x_bool_t] return true if the device supports ESIMD."
 --- #--------------------------------------------------------------------------
 type: function
 desc: "Retrieves various information about device"

scripts/core/kernel.yml

@@ -19,7 +19,6 @@ name: Create
 decl: static
 ordinal: "0"
 details:
-    - "Multiple calls to this function will return identical device handles, in the same order."
     - "The application may call this function from simultaneous threads."
     - "The implementation of this function should be lock-free."
 params:

source/adapters/CMakeLists.txt

@@ -30,7 +30,7 @@ endfunction()
 
 add_subdirectory(null)
 
-set(INTEL_LLVM_TAG nightly-2023-08-20)
+set(INTEL_LLVM_TAG nightly-2023-09-20)
 
 if(UR_BUILD_ADAPTER_L0)
     add_subdirectory(level_zero)