[SYCL][E2E] Switch AtomicRef/* tests to use <sycl/detail/core.hpp> (#13118)

aelovikov-intel · web-flow · commit d7d1731b9427 · 2024-03-22T16:13:16.000-07:00
diff --git a/sycl/test-e2e/AtomicRef/add.h b/sycl/test-e2e/AtomicRef/add.h
@@ -8,10 +8,14 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <type_traits>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/and.h b/sycl/test-e2e/AtomicRef/and.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/assignment.h b/sycl/test-e2e/AtomicRef/assignment.h
@@ -3,9 +3,13 @@
 #include <algorithm>
 #include <cassert>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/atomic_memory_order.h b/sycl/test-e2e/AtomicRef/atomic_memory_order.h
@@ -1,7 +1,10 @@
 #pragma once
 
 #include <algorithm>
-#include <sycl/sycl.hpp>
+
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
 
 using namespace sycl;
 
diff --git a/sycl/test-e2e/AtomicRef/atomic_memory_order_seq_cst.cpp b/sycl/test-e2e/AtomicRef/atomic_memory_order_seq_cst.cpp
@@ -2,6 +2,7 @@
 // RUN: %{run} %t.out
 
 #include "atomic_memory_order.h"
+#include <cmath>
 #include <iostream>
 #include <numeric>
 using namespace sycl;
@@ -12,8 +13,8 @@ size_t CalculateIterations(device &device, size_t iter_cap) {
   uint64_t max_chars_alloc =
       device.get_info<info::device::max_mem_alloc_size>() / sizeof(char);
   size_t max_iter =
-      (sycl::sqrt(static_cast<double>(max_chars_alloc)) - 1) / (N_items / 2);
-  return sycl::min(max_iter, iter_cap);
+      (std::sqrt(static_cast<double>(max_chars_alloc)) - 1) / (N_items / 2);
+  return std::min(max_iter, iter_cap);
 }
 
 void check(queue &q, buffer<int, 2> &res_buf, size_t N_iters) {
diff --git a/sycl/test-e2e/AtomicRef/compare_exchange.h b/sycl/test-e2e/AtomicRef/compare_exchange.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/exchange.h b/sycl/test-e2e/AtomicRef/exchange.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/load.h b/sycl/test-e2e/AtomicRef/load.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/max.h b/sycl/test-e2e/AtomicRef/max.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/min.h b/sycl/test-e2e/AtomicRef/min.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/or.h b/sycl/test-e2e/AtomicRef/or.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/store.h b/sycl/test-e2e/AtomicRef/store.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/sub.h b/sycl/test-e2e/AtomicRef/sub.h
@@ -8,10 +8,14 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <type_traits>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
diff --git a/sycl/test-e2e/AtomicRef/xor.h b/sycl/test-e2e/AtomicRef/xor.h
@@ -8,9 +8,13 @@
 #include <cassert>
 #include <iostream>
 #include <numeric>
-#include <sycl/sycl.hpp>
 #include <vector>
 
+#include <sycl/detail/core.hpp>
+
+#include <sycl/atomic_ref.hpp>
+#include <sycl/usm.hpp>
+
 using namespace sycl;
 
 template <template <typename, memory_order, memory_scope, access::address_space>
