Merge pull request #1893 from igchor/event_no_return

[L0 v2] event improvements
oneapi-src · Aug 9, 2024 · 89dc3a5 · 89dc3a5
2 parents b99d93b + 5a2c169
commit 89dc3a5
Show file tree

Hide file tree

Showing 28 changed files with 1,114 additions and 276 deletions.
diff --git a/.github/workflows/build-hw-reusable.yml b/.github/workflows/build-hw-reusable.yml
@@ -4,7 +4,10 @@ name: Build - Adapters on HW - Reusable
 on:
   workflow_call:
     inputs:
-      name:
+      adapter_name:
+        required: true
+        type: string
+      runner_name:
         required: true
         type: string
       platform:
@@ -33,7 +36,7 @@ jobs:
     strategy:
       matrix:
         adapter: [
-          {name: "${{inputs.name}}", platform: "${{inputs.platform}}", static_Loader: "${{inputs.static_loader}}"},
+          {name: "${{inputs.adapter_name}}", platform: "${{inputs.platform}}", static_Loader: "${{inputs.static_loader}}"},
         ]
         build_type: [Debug, Release]
         compiler: [{c: gcc, cxx: g++}, {c: clang, cxx: clang++}]
@@ -47,7 +50,7 @@ jobs:
          - adapter: {static_Loader: ON}
            compiler: {c: clang, cxx: clang++}
 
-    runs-on: ${{matrix.adapter.name}}
+    runs-on: ${{inputs.runner_name}}
 
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -138,39 +138,52 @@ jobs:
     name: Level Zero
     uses: ./.github/workflows/build-hw-reusable.yml
     with:
-      name: L0
+      adapter_name: L0
+      runner_name: L0
+
+  level-zero-v2:
+    name: Level Zero V2
+    uses: ./.github/workflows/build-hw-reusable.yml
+    with:
+      adapter_name: L0_V2
+      runner_name: L0
 
   level-zero-static:
     name: Level Zero static
     uses: ./.github/workflows/build-hw-reusable.yml
     with:
-      name: L0
+      adapter_name: L0
+      runner_name: L0
       static_loader: ON
 
   opencl:
     name: OpenCL
     uses: ./.github/workflows/build-hw-reusable.yml
     with:
-      name: OPENCL
+      adapter_name: OPENCL
+      runner_name: OPENCL
       platform: "Intel(R) OpenCL"
 
   cuda:
     name: CUDA
     uses: ./.github/workflows/build-hw-reusable.yml
     with:
-      name: CUDA
+      adapter_name: CUDA
+      runner_name: CUDA
 
   hip:
     name: HIP
     uses: ./.github/workflows/build-hw-reusable.yml
     with:
-      name: HIP
+      adapter_name: HIP
+      runner_name: HIP
 
   native-cpu:
     name: Native CPU
     uses: ./.github/workflows/build-hw-reusable.yml
     with:
-      name: NATIVE_CPU
+      adapter_name: NATIVE_CPU
+      runner_name: NATIVE_CPU
 
   e2e-level-zero:
     name: E2E L0
@@ -202,15 +215,20 @@ jobs:
       matrix:
         os: ['windows-2019', 'windows-2022']
         adapter: [
-          {name: None, var: ''}, {name: L0, var: '-DUR_BUILD_ADAPTER_L0=ON'}
+          {name: None, var: ''}, {name: L0, var: '-DUR_BUILD_ADAPTER_L0=ON'},
+          {name: None, var: ''}, {name: L0_V2, var: '-DUR_BUILD_ADAPTER_L0_V2=ON'}
         ]
 
         # TODO: building level zero loader on windows-2019 and clang-cl is currently broken
         exclude:
          - os: 'windows-2019'
            adapter: {name: L0, var: '-DUR_BUILD_ADAPTER_L0=ON'}
+         - os: 'windows-2019'
+           adapter: {name: L0_V2, var: '-DUR_BUILD_ADAPTER_L0_V2=ON'}
          - adapter: {name: L0, var: '-DUR_BUILD_ADAPTER_L0=ON'}
            compiler: {c: clang-cl, cxx: clang-cl}
+         - adapter: {name: L0_V2, var: '-DUR_BUILD_ADAPTER_L0_V2=ON'}
+           compiler: {c: clang-cl, cxx: clang-cl}
 
         build_type: [Debug, Release]
         compiler: [{c: cl, cxx: cl}, {c: clang-cl, cxx: clang-cl}]

diff --git a/source/adapters/CMakeLists.txt b/source/adapters/CMakeLists.txt
@@ -46,7 +46,7 @@ function(add_ur_adapter_subdirectory name)
     endif()
 endfunction()
 
-if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_ALL)
+if(UR_BUILD_ADAPTER_L0 OR UR_BUILD_ADAPTER_L0_V2 OR UR_BUILD_ADAPTER_ALL)
     add_ur_adapter_subdirectory(level_zero)
 endif()
 

diff --git a/source/adapters/level_zero/CMakeLists.txt b/source/adapters/level_zero/CMakeLists.txt
@@ -3,8 +3,6 @@
 # See LICENSE.TXT
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-
-set(TARGET_NAME ur_adapter_level_zero)
 set(UR_LEVEL_ZERO_LOADER_LIBRARY "" CACHE FILEPATH "Path of the Level Zero Loader library")
 set(UR_LEVEL_ZERO_INCLUDE_DIR "" CACHE FILEPATH "Directory containing the Level Zero Headers")
 set(UR_LEVEL_ZERO_LOADER_REPO "" CACHE STRING "Github repo to get the Level Zero loader sources from")
@@ -13,15 +11,15 @@ set(UR_LEVEL_ZERO_LOADER_TAG "" CACHE STRING " GIT tag of the Level Loader taken
 # Copy Level Zero loader/headers locally to the build to avoid leaking their path.
 set(LEVEL_ZERO_COPY_DIR ${CMAKE_CURRENT_BINARY_DIR}/level_zero_loader)
 if (NOT UR_LEVEL_ZERO_LOADER_LIBRARY STREQUAL "")
-  get_filename_component(LEVEL_ZERO_LIB_NAME "${UR_LEVEL_ZERO_LOADER_LIBRARY}" NAME)
-  set(LEVEL_ZERO_LIBRARY ${LEVEL_ZERO_COPY_DIR}/${LEVEL_ZERO_LIB_NAME})
-  message(STATUS "Level Zero Adapter: Copying Level Zero loader to local build tree")
-  file(COPY ${UR_LEVEL_ZERO_LOADER_LIBRARY} DESTINATION ${LEVEL_ZERO_COPY_DIR} FOLLOW_SYMLINK_CHAIN)
+    get_filename_component(LEVEL_ZERO_LIB_NAME "${UR_LEVEL_ZERO_LOADER_LIBRARY}" NAME)
+    set(LEVEL_ZERO_LIBRARY ${LEVEL_ZERO_COPY_DIR}/${LEVEL_ZERO_LIB_NAME})
+    message(STATUS "Level Zero Adapter: Copying Level Zero loader to local build tree")
+    file(COPY ${UR_LEVEL_ZERO_LOADER_LIBRARY} DESTINATION ${LEVEL_ZERO_COPY_DIR} FOLLOW_SYMLINK_CHAIN)
 endif()
 if (NOT UR_LEVEL_ZERO_INCLUDE_DIR STREQUAL "")
-  set(LEVEL_ZERO_INCLUDE_DIR ${LEVEL_ZERO_COPY_DIR})
-  message(STATUS "Level Zero Adapter: Copying Level Zero headers to local build tree")
-  file(COPY ${UR_LEVEL_ZERO_INCLUDE_DIR}/ DESTINATION ${LEVEL_ZERO_COPY_DIR})
+    set(LEVEL_ZERO_INCLUDE_DIR ${LEVEL_ZERO_COPY_DIR})
+    message(STATUS "Level Zero Adapter: Copying Level Zero headers to local build tree")
+    file(COPY ${UR_LEVEL_ZERO_INCLUDE_DIR}/ DESTINATION ${LEVEL_ZERO_COPY_DIR})
 endif()
 
 if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
@@ -93,81 +91,83 @@ target_include_directories(LevelZeroLoader-Headers
     INTERFACE "${LEVEL_ZERO_INCLUDE_DIR}"
 )
 
-add_ur_adapter(${TARGET_NAME}
-    SHARED
-    ${CMAKE_CURRENT_SOURCE_DIR}/ur_interface_loader.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/adapter.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/adapter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_buffer.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/command_buffer.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/common.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/context.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/event.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/usm.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/memory.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/physical_mem.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/program.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/queue_api.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/queue.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/ur_level_zero.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/common.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/context.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_native.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/usm.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/usm_p2p.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/virtual_mem.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/memory.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/physical_mem.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/program.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/queue_api.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/queue.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/sampler.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/image.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../ur/ur.cpp
-)
-
-if(NOT WIN32)
-    target_sources(ur_adapter_level_zero
-        PRIVATE
-            ${CMAKE_CURRENT_SOURCE_DIR}/adapter_lib_init_linux.cpp
+if(UR_BUILD_ADAPTER_L0)
+    add_ur_adapter(ur_adapter_level_zero
+        SHARED
+        ${CMAKE_CURRENT_SOURCE_DIR}/ur_interface_loader.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/adapter.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/adapter.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/command_buffer.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/command_buffer.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/common.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/context.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/device.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/event.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usm.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/memory.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/kernel.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/physical_mem.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/platform.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/program.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/queue_api.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/queue.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/sampler.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/ur_level_zero.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/common.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/context.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_native.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/event.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usm.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/usm_p2p.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/virtual_mem.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/memory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/physical_mem.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/platform.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/program.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/queue_api.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/queue.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/sampler.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/image.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../ur/ur.cpp
     )
-endif()
 
-# TODO: fix level_zero adapter conversion warnings
-target_compile_options(${TARGET_NAME} PRIVATE
-    $<$<CXX_COMPILER_ID:MSVC>:/wd4805 /wd4244>
-)
+    if(NOT WIN32)
+        target_sources(ur_adapter_level_zero
+            PRIVATE
+                ${CMAKE_CURRENT_SOURCE_DIR}/adapter_lib_init_linux.cpp
+        )
+    endif()
 
-set_target_properties(${TARGET_NAME} PROPERTIES
-    VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
-    SOVERSION "${PROJECT_VERSION_MAJOR}"
-)
+    # TODO: fix level_zero adapter conversion warnings
+    target_compile_options(ur_adapter_level_zero PRIVATE
+        $<$<CXX_COMPILER_ID:MSVC>:/wd4805 /wd4244>
+    )
 
-if (WIN32)
- # 0x800: Search for the DLL only in the System32 folder
- target_link_options(ur_adapter_level_zero PUBLIC /DEPENDENTLOADFLAG:0x800)
-endif()
+    set_target_properties(ur_adapter_level_zero PROPERTIES
+        VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+        SOVERSION "${PROJECT_VERSION_MAJOR}"
+    )
 
-target_link_libraries(${TARGET_NAME} PRIVATE
-    ${PROJECT_NAME}::headers
-    ${PROJECT_NAME}::common
-    ${PROJECT_NAME}::umf
-    LevelZeroLoader
-    LevelZeroLoader-Headers
-)
+    if (WIN32)
+    # 0x800: Search for the DLL only in the System32 folder
+    target_link_options(ur_adapter_level_zero PUBLIC /DEPENDENTLOADFLAG:0x800)
+    endif()
 
-target_include_directories(${TARGET_NAME} PRIVATE
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../"
-    LevelZeroLoader-Headers
-)
+    target_link_libraries(ur_adapter_level_zero PRIVATE
+        ${PROJECT_NAME}::headers
+        ${PROJECT_NAME}::common
+        ${PROJECT_NAME}::umf
+        LevelZeroLoader
+        LevelZeroLoader-Headers
+    )
+
+    target_include_directories(ur_adapter_level_zero PRIVATE
+        "${CMAKE_CURRENT_SOURCE_DIR}/../../"
+        LevelZeroLoader-Headers
+    )
+endif()
 
 if(UR_BUILD_ADAPTER_L0_V2)
     add_ur_adapter(ur_adapter_level_zero_v2
@@ -207,11 +207,11 @@ if(UR_BUILD_ADAPTER_L0_V2)
         ${CMAKE_CURRENT_SOURCE_DIR}/v2/queue_immediate_in_order.cpp
     )
 
-    # api.cpp contains NOT_SUPPORTED functions-only
-    set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/v2/api.cpp
-        PROPERTIES APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-unused-parameter")
-
     if(NOT WIN32)
+        # api.cpp contains NOT_SUPPORTED functions-only
+        set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/v2/api.cpp
+            PROPERTIES APPEND_STRING PROPERTY COMPILE_FLAGS "-Wno-unused-parameter")
+
         target_sources(ur_adapter_level_zero_v2
             PRIVATE
                 ${CMAKE_CURRENT_SOURCE_DIR}/adapter_lib_init_linux.cpp

diff --git a/source/adapters/level_zero/v2/api.cpp b/source/adapters/level_zero/v2/api.cpp
@@ -538,16 +538,6 @@ ur_result_t UR_APICALL urEventWait(uint32_t numEvents,
   return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
 }
 
-ur_result_t UR_APICALL urEventRetain(ur_event_handle_t hEvent) {
-  logger::error("{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
-ur_result_t UR_APICALL urEventRelease(ur_event_handle_t hEvent) {
-  logger::error("{} function not implemented!", __FUNCTION__);
-  return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;
-}
-
 ur_result_t UR_APICALL urEventGetNativeHandle(
     ur_event_handle_t hEvent, ur_native_handle_t *phNativeEvent) {
   logger::error("{} function not implemented!", __FUNCTION__);