[SYCL][NFC] Reduce amount of includes in in-tree tests

sycl/include/sycl/specialization_id.hpp

@@ -8,9 +8,13 @@
 
 #pragma once
 
+#include <sycl/detail/defines_elementary.hpp>
+
 namespace sycl {
 __SYCL_INLINE_VER_NAMESPACE(_V1) {
 
+enum class bundle_state : char;
+
 /// Declaring a specialization constant
 ///
 /// \ingroup sycl_api

sycl/include/sycl/sycl_span.hpp

@@ -135,6 +135,8 @@ template<class Container>
 #define _SYCL_SPAN_TEMPLATE_VIS
 #define _SYCL_SPAN_INLINE_VISIBILITY inline
 
+#include <sycl/detail/defines_elementary.hpp>
+
 namespace sycl {
 __SYCL_INLINE_VER_NAMESPACE(_V1) {
 

sycl/test/basic_tests/address_space_traits.cpp

@@ -1,38 +1,32 @@
 // RUN: %clangxx -fsycl -fsycl-device-only -D__ENABLE_USM_ADDR_SPACE__ -fsycl-targets=%sycl_triple %s -c
 
-#include <cassert>
-#include <sycl/sycl.hpp>
+#include <sycl/access/access.hpp>
 
 using namespace sycl;
-int main() {
 
-  queue myQueue;
-  myQueue.submit([&](handler &cgh) {
-    cgh.single_task<class dummy>([=]() {
-      static_assert(
-          detail::deduce_AS<__attribute__((opencl_global)) int>::value ==
-              access::address_space::global_space,
-          "Unexpected address space");
-      static_assert(
-          detail::deduce_AS<__attribute__((opencl_local)) int>::value ==
-              access::address_space::local_space,
-          "Unexpected address space");
-      static_assert(
-          detail::deduce_AS<__attribute__((opencl_private)) int>::value ==
-              access::address_space::private_space,
-          "Unexpected address space");
-      static_assert(
-          detail::deduce_AS<__attribute__((opencl_constant)) int>::value ==
-              access::address_space::constant_space,
-          "Unexpected address space");
-      static_assert(
-          detail::deduce_AS<__attribute__((opencl_global_device)) int>::value ==
-              access::address_space::ext_intel_global_device_space,
-          "Unexpected address space");
-      static_assert(
-          detail::deduce_AS<__attribute__((opencl_global_host)) int>::value ==
-              access::address_space::ext_intel_global_host_space,
-          "Unexpected address space");
-    });
-  });
+int main() {
+  static_assert(
+      detail::deduce_AS<__attribute__((opencl_global)) int>::value ==
+          access::address_space::global_space,
+      "Unexpected address space");
+  static_assert(
+      detail::deduce_AS<__attribute__((opencl_local)) int>::value ==
+          access::address_space::local_space,
+      "Unexpected address space");
+  static_assert(
+      detail::deduce_AS<__attribute__((opencl_private)) int>::value ==
+          access::address_space::private_space,
+      "Unexpected address space");
+  static_assert(
+      detail::deduce_AS<__attribute__((opencl_constant)) int>::value ==
+          access::address_space::constant_space,
+      "Unexpected address space");
+  static_assert(
+      detail::deduce_AS<__attribute__((opencl_global_device)) int>::value ==
+          access::address_space::ext_intel_global_device_space,
+      "Unexpected address space");
+  static_assert(
+      detail::deduce_AS<__attribute__((opencl_global_host)) int>::value ==
+          access::address_space::ext_intel_global_host_space,
+      "Unexpected address space");
 }

sycl/test/basic_tests/aliases.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -fsyntax-only -o %t.out
 //==------------ aliases.cpp - SYCL type aliases test ----------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <sycl/sycl.hpp>
+#include <sycl/aliases.hpp>
 
 #include <type_traits>
 

sycl/test/basic_tests/define_vendors.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -c -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -fsyntax-only -o %t.out
 #include <sycl/sycl.hpp>
 
 #if !defined(SYCL_IMPLEMENTATION_ONEAPI)

sycl/test/basic_tests/generic_type_traits.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -fsyntax-only -o %t.out
 
 #include <cassert>
 #include <iostream>

sycl/test/basic_tests/id.cpp

@@ -10,9 +10,11 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+#include <sycl/id.hpp>
+#include <sycl/item.hpp>
+
 #include <cassert>
 #include <iostream>
-#include <sycl/sycl.hpp>
 
 using sycl::detail::Builder;
 

sycl/test/basic_tests/id_ctad.cpp

@@ -7,7 +7,9 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#include <sycl/sycl.hpp>
+#include <sycl/id.hpp>
+
+#include <type_traits>
 
 using namespace std;
 int main() {

sycl/test/basic_tests/known_identity.cpp

@@ -5,9 +5,13 @@
 // This test performs basic checks of has_known_identity and known_identity
 // type traits.
 
+#include <sycl/functional.hpp>
+#include <sycl/known_identity.hpp>
+#include <sycl/marray.hpp>
+#include <sycl/types.hpp>
+
 #include <cassert>
 #include <cstddef>
-#include <sycl/sycl.hpp>
 
 using namespace sycl;
 

sycl/test/basic_tests/marray/marray.cpp

@@ -10,6 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <sycl/sycl.hpp>
+
 using namespace sycl;
 
 int main() {

sycl/test/basic_tests/nd_item.cpp

@@ -7,9 +7,10 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+#include <sycl/nd_item.hpp>
+
 #include <cassert>
 #include <iostream>
-#include <sycl/sycl.hpp>
 
 using namespace std;
 using sycl::detail::Builder;

sycl/test/basic_tests/range.cpp

@@ -9,7 +9,7 @@
 //===----------------------------------------------------------------------===//
 #include <cassert>
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/range.hpp>
 
 using namespace std;
 int main() {

sycl/test/basic_tests/range_ctad.cpp

@@ -7,9 +7,11 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#include <sycl/sycl.hpp>
+#include <sycl/range.hpp>
+#include <sycl/nd_range.hpp>
+
+#include <type_traits>
 
-using namespace std;
 int main() {
   sycl::range one_dim_range(64);
   sycl::range two_dim_range(64, 1);

sycl/test/basic_tests/range_error.cpp

@@ -1,31 +1,8 @@
 // RUN: %clangxx %s %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning
-#include <cassert>
-#include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/range.hpp>
 
 using namespace std;
 int main() {
-  sycl::range<1> one_dim_range(64);
-  sycl::range<2> two_dim_range(64, 1);
-  sycl::range<3> three_dim_range(64, 1, 2);
-  assert(one_dim_range.size() ==64);
-  assert(one_dim_range.get(0) ==64);
-  assert(one_dim_range[0] ==64);
-  cout << "one_dim_range passed " << endl;
-  assert(two_dim_range.size() ==64);
-  assert(two_dim_range.get(0) ==64);
-  assert(two_dim_range[0] ==64);
-  assert(two_dim_range.get(1) ==1);
-  assert(two_dim_range[1] ==1);
-  cout << "two_dim_range passed " << endl;
-  assert(three_dim_range.size() ==128);
-  assert(three_dim_range.get(0) ==64);
-  assert(three_dim_range[0] ==64);
-  assert(three_dim_range.get(1) ==1);
-  assert(three_dim_range[1] ==1);
-  assert(three_dim_range.get(2) ==2);
-  assert(three_dim_range[2] ==2);
-  cout << "three_dim_range passed " << endl;
   // expected-error@+1 {{no matching constructor for initialization of 'sycl::range<1>'}}
   sycl::range<1> one_dim_range_f1(64, 2, 4);
   // expected-error@+1 {{no matching constructor for initialization of 'sycl::range<2>'}}

sycl/test/basic_tests/span.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -c %s
+// RUN: %clangxx -fsycl -fsyntax-only %s
 
 //==--------------- span.cpp - SYCL span test ------------------------------==//
 //
@@ -8,7 +8,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <sycl/sycl.hpp>
+#include <sycl/sycl_span.hpp>
+
+#include <vector>
 
 int main() {
   // test the various span declarations, especially unspecialized ones.

sycl/test/basic_tests/types.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -fsyntax-only -o %t.out
 //==--------------- types.cpp - SYCL types test ----------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -7,7 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <sycl/sycl.hpp>
+#include <sycl/marray.hpp>
+#include <sycl/specialization_id.hpp>
+#include <sycl/types.hpp>
 
 #include <cfloat>
 #include <cstdint>

sycl/test/basic_tests/vectors/ctad.cpp

@@ -7,7 +7,9 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#include <sycl/sycl.hpp>
+#include <sycl/types.hpp>
+
+#include <type_traits>
 
 int main() {
   sycl::vec v1(1);

sycl/test/basic_tests/vectors/ctad_fail.cpp

@@ -1,5 +1,5 @@
 // RUN: %clangxx %fsycl-host-only -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected %s
-#include <sycl/sycl.hpp>
+#include <sycl/types.hpp>
 
 int main() {
   sycl::vec v(1, .1); // expected-error {{no viable constructor or deduction guide for deduction of template arguments of 'vec'}}

sycl/test/extensions/fpga.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl %s -o %t.out
+// RUN: %clangxx -fsycl -fsyntax-only %s -o %t.out
 
 #include <sycl/ext/intel/fpga_extensions.hpp>
 #include <sycl/sycl.hpp>

sycl/test/matrix/query.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -o query %s
+// RUN: %clangxx -fsycl -fsyntax-only -o query %s
 #include <iostream>
 #include <sycl/sycl.hpp>
 

sycl/test/regression/copy-with-unnamed-lambda.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsycl -fsycl-unnamed-lambda %s -o %t.out
+// RUN: %clangxx -fsycl -fsycl-unnamed-lambda %s -fsyntax-only -o %t.out
 // The purpose of this test is to check that the following code can be
 // successfully compiled
 #include <sycl/sycl.hpp>

sycl/test/regression/unnamed-lambda.cpp

@@ -1,5 +1,5 @@
-// RUN: %clangxx -fsycl -c %s -o %t.temp
-// RUN: %clangxx -fsycl -sycl-std=1.2.1 -c %s -o %t.temp
+// RUN: %clangxx -fsycl -fsyntax-only %s -o %t.temp
+// RUN: %clangxx -fsycl -sycl-std=1.2.1 -fsyntax-only %s -o %t.temp
 
 #include "sycl.hpp"