Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SYCL] Delay inclusion of sycl/types.hpp in core.hpp #13902

Merged
merged 2 commits into from
May 27, 2024
Merged

[SYCL] Delay inclusion of sycl/types.hpp in core.hpp #13902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e396bd
[SYCL] Delay inclusion of `sycl/types.hpp` in `core.hpp`
aelovikov-intel May 23, 2024
e3dc049
Fix failing tests
aelovikov-intel May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions sycl/include/sycl/ext/intel/experimental/task_sequence.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <CL/__spirv/spirv_ops.hpp>
#include <CL/__spirv/spirv_types.hpp>
#include <sycl/aspects.hpp>
#include <sycl/exception.hpp>
#include <sycl/ext/intel/experimental/fpga_kernel_properties.hpp>
#include <sycl/ext/intel/experimental/task_sequence_properties.hpp>
Expand Down
1 change: 1 addition & 0 deletions sycl/include/sycl/ext/oneapi/experimental/prefetch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include <CL/__spirv/spirv_ops.hpp>
#include <sycl/ext/oneapi/properties/properties.hpp>
#include <sycl/types.hpp>

namespace sycl {
inline namespace _V1 {
Expand Down
2 changes: 1 addition & 1 deletion sycl/include/sycl/ext/oneapi/properties/properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

#pragma once

#include <sycl/detail/is_device_copyable.hpp>
#include <sycl/ext/oneapi/properties/property.hpp> // for IsRuntimePr...
#include <sycl/ext/oneapi/properties/property_utils.hpp> // for Sorted, Mer...
#include <sycl/ext/oneapi/properties/property_value.hpp> // for property_value
#include <sycl/types.hpp> // for is_device_c...

#include <tuple> // for tuple, tupl...
#include <type_traits> // for enable_if_t
Expand Down
3 changes: 1 addition & 2 deletions sycl/include/sycl/sub_group.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <sycl/memory_enums.hpp> // for memory_scope
#include <sycl/multi_ptr.hpp> // for multi_ptr
#include <sycl/range.hpp> // for range
#include <sycl/types.hpp> // for vec

#ifdef __SYCL_DEVICE_ONLY__
#include <sycl/ext/oneapi/functional.hpp>
Expand All @@ -33,7 +32,7 @@ inline namespace _V1 {
template <typename T, access::address_space Space,
access::decorated DecorateAddress>
class multi_ptr;

template <typename Type, int NumElements> class vec;
namespace detail {

namespace sub_group {
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Basic/boolean.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#include <cassert>
#include <iostream>

#include <sycl/detail/core.hpp>

#include <sycl/detail/boolean.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

using namespace sycl;
namespace s = sycl;
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/buffer/buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <iostream>
#include <memory>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

using namespace sycl;

Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/group_async_copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <iostream>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>
#include <typeinfo>

using namespace sycl;
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/group_async_copy_legacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <iostream>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>
#include <typeinfo>

using namespace sycl;
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/half_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <cmath>
#include <iostream>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>
#include <unordered_set>

using namespace sycl;
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/parallel_for_indexers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// RUN: %{run} %t2.out

#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

#include <cassert>
#include <memory>
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/parallel_for_range_roundup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
//
#include <iostream>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

using namespace sycl;

Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/swizzle_op.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <cassert>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

using namespace sycl;

Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/vector/bool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//

#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

constexpr int size = 2;

Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/vector/byte.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
//===----------------------------------------------------------------------===//

#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

#include <cstddef> // std::byte
#include <tuple> // std::ignore
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/vector/int-convert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}

#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

#include <cstdint>
#include <iostream>
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/vector/operators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#define SYCL_SIMPLE_SWIZZLES
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>
namespace s = sycl;

template <typename ResultVecT>
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Basic/vector/vec_binary_scalar_order.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#pragma once

#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

template <typename T>
using rel_t = std::conditional_t<
Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/KernelFusion/internalize_non_unit_localsize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <sycl/detail/core.hpp>
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
#include <sycl/properties/all_properties.hpp>
#include <sycl/types.hpp>

using namespace sycl;

Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/KernelFusion/internalize_vfunc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <sycl/detail/core.hpp>
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
#include <sycl/properties/all_properties.hpp>
#include <sycl/types.hpp>

using namespace sycl;

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Regression/get_spec_const_vec16.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
// of sycl::vec<char, 16> type is correct.

#include <sycl/detail/core.hpp>

#include <sycl/specialization_id.hpp>
#include <sycl/types.hpp>

#include <algorithm>

Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Regression/group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

#include <iostream>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

using namespace sycl;

Expand Down
1 change: 1 addition & 0 deletions sycl/test-e2e/Regression/vec_rel_swizzle_ops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include <cstdlib>
#include <sycl/detail/core.hpp>
#include <sycl/types.hpp>

template <typename T, typename ResultT>
bool testAndOperator(const std::string &typeName) {
Expand Down
12 changes: 6 additions & 6 deletions sycl/test/include_deps/sycl_detail_core.hpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,6 @@
// CHECK-NEXT: nd_item.hpp
// CHECK-NEXT: nd_range.hpp
// CHECK-NEXT: sub_group.hpp
// CHECK-NEXT: types.hpp
// CHECK-NEXT: marray.hpp
// CHECK-NEXT: vector.hpp
// CHECK-NEXT: detail/memcpy.hpp
// CHECK-NEXT: detail/vector_convert.hpp
// CHECK-NEXT: swizzles.def
// CHECK-NEXT: ext/oneapi/functional.hpp
// CHECK-NEXT: detail/spirv.hpp
// CHECK-NEXT: ext/oneapi/experimental/non_uniform_groups.hpp
Expand All @@ -148,6 +142,12 @@
// CHECK-NEXT: builtins_utils_vec.hpp
// CHECK-NEXT: builtins_utils_scalar.hpp
// CHECK-NEXT: detail/boolean.hpp
// CHECK-NEXT: marray.hpp
// CHECK-NEXT: types.hpp
// CHECK-NEXT: vector.hpp
// CHECK-NEXT: detail/memcpy.hpp
// CHECK-NEXT: detail/vector_convert.hpp
// CHECK-NEXT: swizzles.def
// CHECK-NEXT: detail/builtins/common_functions.inc
// CHECK-NEXT: detail/builtins/helper_macros.hpp
// CHECK-NEXT: detail/builtins/geometric_functions.inc
Expand Down