[SYCL][E2E] Use fine-grained includes in AddressSanitizer/* tests (#13848)

Author: aelovikov-intel

sycl/test-e2e/AddressSanitizer/bad-free/bad-free-host.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: linux, cpu
 // RUN: %{build} %device_asan_flags -O0 -g -o %t
 // RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 constexpr size_t N = 64;
 

sycl/test-e2e/AddressSanitizer/bad-free/bad-free-minus1.cpp

@@ -5,7 +5,7 @@
 // RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s
 // RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t
 // RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 constexpr size_t N = 64;
 

sycl/test-e2e/AddressSanitizer/bad-free/bad-free-plus1.cpp

@@ -5,7 +5,7 @@
 // RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s
 // RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t
 // RUN: %force_device_asan_rt %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 constexpr size_t N = 64;
 

sycl/test-e2e/AddressSanitizer/common/config-red-zone-size.cpp

@@ -5,7 +5,7 @@
 // RUN: env SYCL_PREFER_UR=1 UR_LOG_SANITIZER=level:debug UR_LAYER_ASAN_OPTIONS=redzone:8 %{run} %t 2>&1 | FileCheck --check-prefixes CHECK-MIN %s
 // RUN: env SYCL_PREFER_UR=1 UR_LOG_SANITIZER=level:debug UR_LAYER_ASAN_OPTIONS=max_redzone:4096 %{run} %t 2>&1 | FileCheck --check-prefixes CHECK-MAX %s
 
-#include "sycl/sycl.hpp"
+#include <sycl/usm.hpp>
 
 int main() {
   sycl::queue q;

sycl/test-e2e/AddressSanitizer/common/kernel-debug.cpp

@@ -2,7 +2,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -o %t
 // RUN: env SYCL_PREFER_UR=1 UR_LAYER_ASAN_OPTIONS=debug:1 %{run} %t 2>&1 | FileCheck --check-prefixes CHECK-DEBUG %s
 // RUN: env SYCL_PREFER_UR=1 UR_LAYER_ASAN_OPTIONS=debug:0 %{run} %t 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 int main() {
   sycl::queue Q;

sycl/test-e2e/AddressSanitizer/double-free/double-free.cpp

@@ -5,7 +5,7 @@
 // RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS=quarantine_size_mb:1 %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-HOST %s
 // RUN: %{build} %device_asan_flags -DMALLOC_SHARED -O0 -g -o %t
 // RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS=quarantine_size_mb:1 %{run} not %t 2>&1 | FileCheck --check-prefixes CHECK,CHECK-SHARED %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 constexpr size_t N = 64;
 

sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_basic.cpp

@@ -5,7 +5,7 @@
 // RUN: env SYCL_PREFER_UR=1 %{run} not %t.out 2>&1 | FileCheck %s
 // RUN: %{build} %device_asan_flags -g -O2 -o %t.out
 // RUN: env SYCL_PREFER_UR=1 %{run} not %t.out 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 constexpr std::size_t N = 4;
 constexpr std::size_t group_size = 1;

sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_function.cpp

@@ -5,7 +5,7 @@
 // RUN: env SYCL_PREFER_UR=1 %{run} not %t.out 2>&1 | FileCheck %s
 // RUN: %{build} %device_asan_flags -g -O2 -o %t.out
 // RUN: env SYCL_PREFER_UR=1 %{run} not %t.out 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 #include <vector>
 
 constexpr std::size_t N = 8;

sycl/test-e2e/AddressSanitizer/out-of-bounds/local/local_accessor_multiargs.cpp

@@ -5,7 +5,7 @@
 // RUN: env SYCL_PREFER_UR=1 %{run} not %t.out 2>&1 | FileCheck %s
 // RUN: %{build} %device_asan_flags -g -O2 -o %t.out
 // RUN: env SYCL_PREFER_UR=1 %{run} not %t.out 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 constexpr std::size_t N = 8;
 constexpr std::size_t group_size = 4;

sycl/test-e2e/AddressSanitizer/out-of-bounds/local/multiple_source.cpp

@@ -3,7 +3,7 @@
 // RUN: %{build} %device_asan_flags -O2 -g -DUSER_CODE_2 -c -o %t2.o
 // RUN: %clangxx -fsycl %device_asan_flags -O2 -g %t1.o %t2.o -o %t.out
 // RUN: env SYCL_PREFER_UR=1 %{run} not %t.out 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 constexpr std::size_t N = 4;
 constexpr std::size_t group_size = 1;

sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-free.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: linux, cpu
 // RUN: %{build} %device_asan_flags -O0 -g -o %t
 // RUN: %force_device_asan_rt UR_LAYER_ASAN_OPTIONS=quarantine_size_mb:5 UR_LOG_SANITIZER=level:info %{run} %t 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 /// Quarantine Cache Test
 ///

sycl/test-e2e/AddressSanitizer/use-after-free/quarantine-no-free.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: linux, cpu
 // RUN: %{build} %device_asan_flags -O0 -g -o %t
 // RUN: env SYCL_PREFER_UR=1 UR_LAYER_ASAN_OPTIONS=quarantine_size_mb:5 UR_LOG_SANITIZER=level:info %{run} not %t 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 /// Quarantine Cache Test
 ///

sycl/test-e2e/AddressSanitizer/use-after-free/use-after-free.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: linux, cpu
 // RUN: %{build} %device_asan_flags -O0 -g -o %t
 // RUN: env SYCL_PREFER_UR=1 UR_LAYER_ASAN_OPTIONS=quarantine_size_mb:1 %{run} not %t 2>&1 | FileCheck %s
-#include <sycl/sycl.hpp>
+#include <sycl/usm.hpp>
 
 constexpr size_t N = 1024;