[SYCL] Use sycl/detail/core.hpp in test-e2e/SubGroupMask/* (#13842)

Continuation of changes started in
#12890.

Author: aelovikov-intel

sycl/include/sycl/ext/oneapi/sub_group_mask.hpp

@@ -7,13 +7,14 @@
 //===----------------------------------------------------------------------===//
 #pragma once
 
-#include <sycl/detail/helpers.hpp>     // for Builder
-#include <sycl/detail/memcpy.hpp>      // detail::memcpy
-#include <sycl/exception.hpp>          // for errc, exception
-#include <sycl/feature_test.hpp>       // for SYCL_EXT_ONEAPI_SUB_GROUP_MASK
-#include <sycl/id.hpp>                 // for id
-#include <sycl/marray.hpp>             // for marray
-#include <sycl/types.hpp>              // for vec
+#include <sycl/builtins.hpp>       // for assert
+#include <sycl/detail/helpers.hpp> // for Builder
+#include <sycl/detail/memcpy.hpp>  // detail::memcpy
+#include <sycl/exception.hpp>      // for errc, exception
+#include <sycl/feature_test.hpp>   // for SYCL_EXT_ONEAPI_SUB_GROUP_MASK
+#include <sycl/id.hpp>             // for id
+#include <sycl/marray.hpp>         // for marray
+#include <sycl/types.hpp>          // for vec
 
 #include <assert.h>     // for assert
 #include <climits>      // for CHAR_BIT

sycl/test-e2e/SubGroupMask/Basic.cpp

@@ -16,8 +16,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/sub_group_mask.hpp>
+
 #include <iostream>
-#include <sycl/sycl.hpp>
 using namespace sycl;
 constexpr int global_size = 128;
 constexpr int local_size = 32;

sycl/test-e2e/SubGroupMask/GroupSize.cpp

@@ -15,8 +15,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+// TODO: switch to <sycl/detail/core.hpp> once we decide how feature macros
+// should work in that scenario.
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/sub_group_mask.hpp>
+
 #include <iostream>
-#include <sycl/sycl.hpp>
+
 using namespace sycl;
 #ifdef SYCL_EXT_ONEAPI_SUB_GROUP_MASK
 constexpr int global_size = 128;

sycl/test-e2e/SubGroupMask/sub_group_mask_ver2.cpp

@@ -2,7 +2,8 @@
 // RUN: %{run} %t.out
 
 #include <iostream>
-#include <sycl/sycl.hpp>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/sub_group_mask.hpp>
 
 #define TEST_ON_DEVICE(TEST_BODY)                                              \
   {                                                                            \

sycl/test/include_deps/sycl_detail_core.hpp.cpp

@@ -143,6 +143,19 @@
 // CHECK-NEXT: detail/spirv.hpp
 // CHECK-NEXT: ext/oneapi/experimental/non_uniform_groups.hpp
 // CHECK-NEXT: ext/oneapi/sub_group_mask.hpp
+// CHECK-NEXT: builtins.hpp
+// CHECK-NEXT: detail/builtins/builtins.hpp
+// CHECK-NEXT: builtins_utils_vec.hpp
+// CHECK-NEXT: builtins_utils_scalar.hpp
+// CHECK-NEXT: detail/boolean.hpp
+// CHECK-NEXT: detail/builtins/common_functions.inc
+// CHECK-NEXT: detail/builtins/helper_macros.hpp
+// CHECK-NEXT: detail/builtins/geometric_functions.inc
+// CHECK-NEXT: detail/builtins/half_precision_math_functions.inc
+// CHECK-NEXT: detail/builtins/integer_functions.inc
+// CHECK-NEXT: detail/builtins/math_functions.inc
+// CHECK-NEXT: detail/builtins/native_math_functions.inc
+// CHECK-NEXT: detail/builtins/relational_functions.inc
 // CHECK-NEXT: feature_test.hpp
 // CHECK-NEXT: functional.hpp
 // CHECK-NEXT: device.hpp