[NFC][SYCL][Bindless] Run passing e2e tests on DG2 linux (#13926)

UR PR: oneapi-src/unified-runtime#1470 --------- Co-authored-by: Kenneth Benzie (Benie) <k.benzie@codeplay.com>
intel · Jun 20, 2024 · 6c55025 · 6c55025
1 parent d7c0fa3
commit 6c55025
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 34 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>