From 2c9d980e12e6a26dad6074e42c1e07ad7c3cdb70 Mon Sep 17 00:00:00 2001
From: Steffen Larsen <steffen.larsen@intel.com>
Date: Fri, 20 Sep 2024 10:19:51 +0200
Subject: [PATCH] [SYCL][E2E] Disable and fix address sanitizer tests for DG2
 (#15450)

This commit disables the
AddressSanitizer/invalid-argument/out-of-bounds.cpp and
sycl/test-e2e/AddressSanitizer/invalid-argument/released-pointer.cpp
tests for DG2, following the enabling of address sanitizer tests for DG2
in https://github.com/intel/llvm/pull/14891.

Additionally, it fixes the compilation failure in
sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp which
should hopefully allow it to pass as expected.

Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
---
 .../AddressSanitizer/invalid-argument/out-of-bounds.cpp      | 3 +++
 .../AddressSanitizer/invalid-argument/released-pointer.cpp   | 3 +++
 .../test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/sycl/test-e2e/AddressSanitizer/invalid-argument/out-of-bounds.cpp b/sycl/test-e2e/AddressSanitizer/invalid-argument/out-of-bounds.cpp
index 54491aaed6c7b..ac5473b18646a 100644
--- a/sycl/test-e2e/AddressSanitizer/invalid-argument/out-of-bounds.cpp
+++ b/sycl/test-e2e/AddressSanitizer/invalid-argument/out-of-bounds.cpp
@@ -2,6 +2,9 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t
 // RUN: env SYCL_PREFER_UR=1 UR_LAYER_ASAN_OPTIONS="detect_kernel_arguments:1" %{run} not %t 2>&1 | FileCheck %s
 
+// See https://github.com/intel/llvm/issues/15449
+// UNSUPPORTED: gpu-intel-dg2
+
 #include <sycl/detail/core.hpp>
 
 #include <sycl/usm.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/invalid-argument/released-pointer.cpp b/sycl/test-e2e/AddressSanitizer/invalid-argument/released-pointer.cpp
index 589d2f4c5ff1a..e78d9a4c15775 100644
--- a/sycl/test-e2e/AddressSanitizer/invalid-argument/released-pointer.cpp
+++ b/sycl/test-e2e/AddressSanitizer/invalid-argument/released-pointer.cpp
@@ -2,6 +2,9 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t
 // RUN: env SYCL_PREFER_UR=1 UR_LAYER_ASAN_OPTIONS="quarantine_size_mb:1;detect_kernel_arguments:1" %{run} not %t 2>&1 | FileCheck %s
 
+// See https://github.com/intel/llvm/issues/15449
+// UNSUPPORTED: gpu-intel-dg2
+
 #include <sycl/detail/core.hpp>
 
 #include <sycl/usm.hpp>
diff --git a/sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp b/sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp
index 1904564b9e3be..2154cb797d23c 100644
--- a/sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp
+++ b/sycl/test-e2e/AddressSanitizer/nullpointer/global_nullptr.cpp
@@ -8,6 +8,8 @@
 
 #include <sycl/detail/core.hpp>
 
+#include <sycl/ext/oneapi/experimental/address_cast.hpp>
+
 int main() {
   sycl::queue Q;
   constexpr std::size_t N = 4;
@@ -18,8 +20,7 @@ int main() {
         sycl::nd_range<1>(N, 1), [=](sycl::nd_item<1> item) {
           auto private_array =
               sycl::ext::oneapi::experimental::static_address_cast<
-                  sycl::access::address_space::private_space,
-                  sycl::access::decorated::no>(array);
+                  sycl::access::address_space::private_space>(array);
           private_array[0] = 0;
         });
     Q.wait();