From 6c550257806542e314a4045bdc492956fe435420 Mon Sep 17 00:00:00 2001
From: Wenju He <wenju.he@intel.com>
Date: Thu, 20 Jun 2024 07:18:27 -0700
Subject: [PATCH] [NFC][SYCL][Bindless] Run passing e2e tests on DG2 linux
 (#13926)

UR PR: https://github.com/oneapi-src/unified-runtime/pull/1470

---------

Co-authored-by: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
---
 sycl/plugins/unified_runtime/CMakeLists.txt               | 8 +++++++-
 sycl/test-e2e/bindless_images/read_1D.cpp                 | 4 ++--
 sycl/test-e2e/bindless_images/read_2D.cpp                 | 4 ++--
 sycl/test-e2e/bindless_images/read_2D_dynamic.cpp         | 4 ++--
 sycl/test-e2e/bindless_images/read_3D.cpp                 | 4 ++--
 sycl/test-e2e/bindless_images/read_norm_types.cpp         | 4 ++--
 sycl/test-e2e/bindless_images/read_write_1D.cpp           | 4 ++--
 sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp | 4 ++--
 sycl/test-e2e/bindless_images/read_write_2D.cpp           | 4 ++--
 sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp | 4 ++--
 sycl/test-e2e/bindless_images/read_write_3D.cpp           | 4 ++--
 sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp | 4 ++--
 sycl/test-e2e/bindless_images/read_write_unsampled.cpp    | 4 ++--
 sycl/test-e2e/bindless_images/sampling_1D.cpp             | 4 ++--
 sycl/test-e2e/bindless_images/sampling_2D.cpp             | 4 ++--
 sycl/test-e2e/bindless_images/sampling_2D_half.cpp        | 5 ++---
 sycl/test-e2e/bindless_images/sampling_3D.cpp             | 4 ++--
 17 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt
index 45cf5865d7dce..36f7dc3a6d735 100644
--- a/sycl/plugins/unified_runtime/CMakeLists.txt
+++ b/sycl/plugins/unified_runtime/CMakeLists.txt
@@ -110,7 +110,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
 
   fetch_adapter_source(level_zero
     ${UNIFIED_RUNTIME_REPO}
-    ${UNIFIED_RUNTIME_TAG}
+    # commit ded4b88acc091011ed7b24362ee3e61ee332955d
+    # Merge: 0e5bbcb2 f8e1f07a
+    # Author: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
+    # Date:   Wed Jun 19 16:30:13 2024 +0100
+    #     Merge pull request #1470 from wenju-he/fix-bindless-L0-copy
+    #     [L0][Bindless Image] Bug fixes and sampled image support
+    ded4b88acc091011ed7b24362ee3e61ee332955d
   )
 
   fetch_adapter_source(opencl
diff --git a/sycl/test-e2e/bindless_images/read_1D.cpp b/sycl/test-e2e/bindless_images/read_1D.cpp
index c85157cf7f8b2..a1a1882964138 100644
--- a/sycl/test-e2e/bindless_images/read_1D.cpp
+++ b/sycl/test-e2e/bindless_images/read_1D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_2D.cpp b/sycl/test-e2e/bindless_images/read_2D.cpp
index 5c5dbb5fc59f9..3a696b22d1f11 100644
--- a/sycl/test-e2e/bindless_images/read_2D.cpp
+++ b/sycl/test-e2e/bindless_images/read_2D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp b/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp
index 377e0103b56c9..d8af6f2cb60a6 100644
--- a/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp
+++ b/sycl/test-e2e/bindless_images/read_2D_dynamic.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_3D.cpp b/sycl/test-e2e/bindless_images/read_3D.cpp
index b77bfaa298752..6cec05719eaec 100644
--- a/sycl/test-e2e/bindless_images/read_3D.cpp
+++ b/sycl/test-e2e/bindless_images/read_3D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_norm_types.cpp b/sycl/test-e2e/bindless_images/read_norm_types.cpp
index aa2daa29b1bad..361ca6154e459 100644
--- a/sycl/test-e2e/bindless_images/read_norm_types.cpp
+++ b/sycl/test-e2e/bindless_images/read_norm_types.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %{build} -o %t.out
-// RUN: %{run} %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %{run} %t.out
 
 #include <iostream>
 #include <limits>
diff --git a/sycl/test-e2e/bindless_images/read_write_1D.cpp b/sycl/test-e2e/bindless_images/read_write_1D.cpp
index 7f366ae682039..d6b38960b0ed4 100644
--- a/sycl/test-e2e/bindless_images/read_write_1D.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_1D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp b/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp
index 3572150cbd12f..5afb4ec5f51d7 100644
--- a/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_write_2D.cpp b/sycl/test-e2e/bindless_images/read_write_2D.cpp
index 6fa09ea4a1eea..abcd332ebb813 100644
--- a/sycl/test-e2e/bindless_images/read_write_2D.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_2D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp b/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp
index c227734d3a00a..b6c677293bf5a 100644
--- a/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_write_3D.cpp b/sycl/test-e2e/bindless_images/read_write_3D.cpp
index efb87a8ff9f4a..840bbdaa5677a 100644
--- a/sycl/test-e2e/bindless_images/read_write_3D.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_3D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp b/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp
index 6631260dc15f1..6be7e5b1a4661 100644
--- a/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
index cae8cbc32b3d2..cc54f2669fc3e 100644
--- a/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
+++ b/sycl/test-e2e/bindless_images/read_write_unsampled.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include "bindless_helpers.hpp"
 #include <iostream>
diff --git a/sycl/test-e2e/bindless_images/sampling_1D.cpp b/sycl/test-e2e/bindless_images/sampling_1D.cpp
index ef184c112568c..7180b341494d1 100644
--- a/sycl/test-e2e/bindless_images/sampling_1D.cpp
+++ b/sycl/test-e2e/bindless_images/sampling_1D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/sampling_2D.cpp b/sycl/test-e2e/bindless_images/sampling_2D.cpp
index 92a26df5afc38..5223a0953fa86 100644
--- a/sycl/test-e2e/bindless_images/sampling_2D.cpp
+++ b/sycl/test-e2e/bindless_images/sampling_2D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/sampling_2D_half.cpp b/sycl/test-e2e/bindless_images/sampling_2D_half.cpp
index aeb57976df5aa..8c6e9b5d7b307 100644
--- a/sycl/test-e2e/bindless_images/sampling_2D_half.cpp
+++ b/sycl/test-e2e/bindless_images/sampling_2D_half.cpp
@@ -1,8 +1,7 @@
-// REQUIRES: cuda
-// REQUIRES: aspect-fp16
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
diff --git a/sycl/test-e2e/bindless_images/sampling_3D.cpp b/sycl/test-e2e/bindless_images/sampling_3D.cpp
index 47d98aaf0be97..b635d00f335fa 100644
--- a/sycl/test-e2e/bindless_images/sampling_3D.cpp
+++ b/sycl/test-e2e/bindless_images/sampling_3D.cpp
@@ -1,7 +1,7 @@
-// REQUIRES: cuda
+// REQUIRES: cuda || (linux && gpu-intel-dg2)
 
 // RUN: %clangxx -fsycl -fsycl-targets=%{sycl_triple} %s -o %t.out
-// RUN: %t.out
+// RUN: env UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>