From c619b319bd288a948ad78880fcc125e652f2cbe6 Mon Sep 17 00:00:00 2001
From: Igor Chorazewicz <igor.chorazewicz@intel.com>
Date: Fri, 16 Aug 2024 17:05:39 +0200
Subject: [PATCH] [L0 v2] fix use of device->Id

---
 source/adapters/level_zero/v2/event_pool.hpp    | 2 +-
 test/adapters/level_zero/v2/event_pool_test.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/adapters/level_zero/v2/event_pool.hpp b/source/adapters/level_zero/v2/event_pool.hpp
index 12e2e81ef4..4262d9ecf8 100644
--- a/source/adapters/level_zero/v2/event_pool.hpp
+++ b/source/adapters/level_zero/v2/event_pool.hpp
@@ -37,7 +37,7 @@ class event_pool {
   event_pool(const event_pool &) = delete;
   event_pool &operator=(const event_pool &) = delete;
 
-  DeviceId Id() { return provider->device()->Id; };
+  DeviceId Id() { return provider->device()->Id.value(); };
 
   ur_event_handle_t_ *allocate();
   void free(ur_event_handle_t_ *event);
diff --git a/test/adapters/level_zero/v2/event_pool_test.cpp b/test/adapters/level_zero/v2/event_pool_test.cpp
index 5ef392b158..21df08c6bf 100644
--- a/test/adapters/level_zero/v2/event_pool_test.cpp
+++ b/test/adapters/level_zero/v2/event_pool_test.cpp
@@ -139,7 +139,7 @@ TEST_P(EventPoolTest, Basic) {
         ur_event_handle_t first;
         ze_event_handle_t zeFirst;
         {
-            auto pool = cache->borrow(device->Id);
+            auto pool = cache->borrow(device->Id.value());
 
             first = pool->allocate();
             zeFirst = first->getZeEvent();
@@ -148,7 +148,7 @@ TEST_P(EventPoolTest, Basic) {
         ur_event_handle_t second;
         ze_event_handle_t zeSecond;
         {
-            auto pool = cache->borrow(device->Id);
+            auto pool = cache->borrow(device->Id.value());
 
             second = pool->allocate();
             zeSecond = second->getZeEvent();
@@ -165,7 +165,7 @@ TEST_P(EventPoolTest, Threaded) {
     for (int iters = 0; iters < 3; ++iters) {
         for (int th = 0; th < 10; ++th) {
             threads.emplace_back([&] {
-                auto pool = cache->borrow(device->Id);
+                auto pool = cache->borrow(device->Id.value());
                 std::vector<ur_event_handle_t> events;
                 for (int i = 0; i < 100; ++i) {
                     events.push_back(pool->allocate());
@@ -183,7 +183,7 @@ TEST_P(EventPoolTest, Threaded) {
 }
 
 TEST_P(EventPoolTest, ProviderNormalUseMostFreePool) {
-    auto pool = cache->borrow(device->Id);
+    auto pool = cache->borrow(device->Id.value());
     std::list<ur_event_handle_t> events;
     for (int i = 0; i < 128; ++i) {
         events.push_back(pool->allocate());