Skip to content

Commit 4074cc2

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][E2E] Switch KernelFusion/* tests to use <sycl/detail/core.hpp> (#13129)
Use `core.hpp` instead of `sycl.hpp` to improve CI compile times, as described here: https://github.com/intel/llvm/tree/sycl/sycl/test-e2e#sycldetailcorehpp
1 parent 6a5846a commit 4074cc2

File tree

61 files changed

+210
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+210
-62
lines changed

‎sycl/test-e2e/KernelFusion/GroupAlgorithm/all_of.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
#include <cassert>
88
#include <iostream>
99
#include <numeric>
10-
#include <sycl/sycl.hpp>
10+
#include <sycl/detail/core.hpp>
11+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
12+
#include <sycl/group_algorithm.hpp>
13+
#include <sycl/properties/all_properties.hpp>
1114

1215
// COM: Check all_of works with kernel fusion.
1316

‎sycl/test-e2e/KernelFusion/GroupAlgorithm/exclusive_scan.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
#include <iostream>
1010
#include <limits>
1111
#include <numeric>
12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
14+
#include <sycl/properties/all_properties.hpp>
1315
#include <vector>
1416
using namespace sycl;
1517

‎sycl/test-e2e/KernelFusion/GroupAlgorithm/permute.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
// Test fusion works with permute and remapping.
55

6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
8+
#include <sycl/properties/all_properties.hpp>
79

810
#include "../helpers.hpp"
911
#include "sycl/group_algorithm.hpp"

‎sycl/test-e2e/KernelFusion/GroupAlgorithm/support.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include <iostream>
2-
#include <sycl/sycl.hpp>
2+
#include <sycl/detail/core.hpp>
3+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
4+
#include <sycl/properties/all_properties.hpp>
35

46
using namespace sycl;
57
using namespace sycl::ext::oneapi;

‎sycl/test-e2e/KernelFusion/GroupFunctions/group_barrier.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
// Test complete_fusion preserves barriers by launching a kernel that requires a
55
// barrier for correctness.
66

7-
#include <sycl/sycl.hpp>
7+
#include <sycl/detail/core.hpp>
8+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
9+
#include <sycl/group_barrier.hpp>
10+
#include <sycl/properties/all_properties.hpp>
811

912
#include "../helpers.hpp"
1013

‎sycl/test-e2e/KernelFusion/GroupFunctions/group_broadcast.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
// Test fusion works with group_broadcast.
55

6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
8+
#include <sycl/group_algorithm.hpp>
9+
#include <sycl/properties/all_properties.hpp>
710

811
#include "../helpers.hpp"
912

‎sycl/test-e2e/KernelFusion/GroupFunctions/group_broadcast_remapping.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
// Test fusion works with group_broadcast and remapping.
55

6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
8+
#include <sycl/group_algorithm.hpp>
9+
#include <sycl/properties/all_properties.hpp>
710

811
#include "../helpers.hpp"
912

‎sycl/test-e2e/KernelFusion/Reduction/reduction.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
// Test fusion works with reductions. Only algorithms automatically selected by
22
// `sycl::reduction` are supported.
33

4-
#include <sycl/sycl.hpp>
4+
#include <sycl/detail/core.hpp>
5+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
6+
#include <sycl/properties/all_properties.hpp>
57

68
#include "../helpers.hpp"
7-
#include "sycl/detail/reduction_forward.hpp"
9+
#include "sycl/reduction.hpp"
810

911
using namespace sycl;
1012

‎sycl/test-e2e/KernelFusion/abort_fusion.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
// to abort fusion due to constraint violations for fusion. Also check that
66
// warnings are printed when SYCL_RT_WARNING_LEVEL=1.
77

8-
#include <sycl/sycl.hpp>
8+
#include <sycl/detail/core.hpp>
9+
10+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
11+
#include <sycl/properties/all_properties.hpp>
912

1013
using namespace sycl;
1114

‎sycl/test-e2e/KernelFusion/abort_internalization.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
// to abort internalization due to target or parameter mismatch. Also check that
66
// warnings are printed when SYCL_RT_WARNING_LEVEL=1.
77

8-
#include <sycl/sycl.hpp>
8+
#include <sycl/detail/core.hpp>
9+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
10+
#include <sycl/properties/all_properties.hpp>
911

1012
using namespace sycl;
1113

‎sycl/test-e2e/KernelFusion/abort_internalization_stored_ptr.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
// it just fails for a slightly different reason.
1111
// CHECK-HIP-NEXT: Failed to promote argument 0 of function {{.*}}: Do not know how to handle value to promote
1212

13-
#include <sycl/sycl.hpp>
13+
#include <sycl/detail/core.hpp>
14+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
15+
#include <sycl/properties/all_properties.hpp>
1416

1517
#include <array>
1618

‎sycl/test-e2e/KernelFusion/barrier_local_internalization.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
// Test complete fusion with local internalization and a combination of kernels
55
// that require a work-group barrier to be inserted by fusion.
66

7-
#include <sycl/sycl.hpp>
7+
#include <sycl/detail/core.hpp>
8+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
9+
#include <sycl/properties/all_properties.hpp>
810

911
using namespace sycl;
1012

‎sycl/test-e2e/KernelFusion/buffer_internalization.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
// Test complete fusion with private internalization specified on the
55
// buffer.
66

7-
#include <sycl/sycl.hpp>
7+
#include <sycl/detail/core.hpp>
8+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
9+
#include <sycl/properties/all_properties.hpp>
810

911
using namespace sycl;
1012

‎sycl/test-e2e/KernelFusion/cached_ndrange.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
// printed when SYCL_RT_WARNING_LEVEL=1.
77

88
#include <iostream>
9-
#include <sycl/sycl.hpp>
9+
#include <sycl/detail/core.hpp>
10+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
11+
#include <sycl/properties/all_properties.hpp>
1012

1113
using namespace sycl;
1214

‎sycl/test-e2e/KernelFusion/cancel_fusion.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
// Test cancel fusion
55

6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
8+
#include <sycl/properties/all_properties.hpp>
79

810
using namespace sycl;
911

‎sycl/test-e2e/KernelFusion/complete_fusion.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
// Test complete fusion without any internalization
55

6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
8+
#include <sycl/properties/all_properties.hpp>
79

810
using namespace sycl;
911

‎sycl/test-e2e/KernelFusion/cooperative_kernel.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
// fusion enabled.
99
// XFAIL: hip_amd
1010

11-
#include <sycl/sycl.hpp>
11+
#include <sycl/detail/core.hpp>
12+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
13+
#include <sycl/properties/all_properties.hpp>
1214

1315
using namespace sycl;
1416

‎sycl/test-e2e/KernelFusion/device_info_descriptor.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
// Test correct return from device information descriptor.
55

6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
8+
#include <sycl/properties/all_properties.hpp>
79

810
using namespace sycl;
911

‎sycl/test-e2e/KernelFusion/diamond_shape.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
// accessors for a combination of four kernels, forming a diamond-like shape and
66
// repeating one of the kernels.
77

8-
#include <sycl/sycl.hpp>
8+
#include <sycl/detail/core.hpp>
9+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
10+
#include <sycl/properties/all_properties.hpp>
911

1012
using namespace sycl;
1113

‎sycl/test-e2e/KernelFusion/diamond_shape_local.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
// accessors for a combination of four kernels, forming a diamond-like shape and
66
// repeating one of the kernels.
77

8-
#include <sycl/sycl.hpp>
8+
#include <sycl/detail/core.hpp>
9+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
10+
#include <sycl/properties/all_properties.hpp>
911

1012
using namespace sycl;
1113

‎sycl/test-e2e/KernelFusion/different_nd_ranges.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
// Kernels with different ND-ranges should be fused.
88
// CHECK-NOT: Cannot fuse kernels with different offsets or local sizes
99

10-
#include <sycl/sycl.hpp>
10+
#include <sycl/detail/core.hpp>
11+
12+
#include <sycl/builtins.hpp>
13+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
14+
#include <sycl/properties/all_properties.hpp>
1115

1216
#include <algorithm>
1317

‎sycl/test-e2e/KernelFusion/event_wait_cancel.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
#include "fusion_event_test_common.h"
88

9-
#include <sycl/sycl.hpp>
9+
#include <sycl/detail/core.hpp>
10+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
11+
#include <sycl/properties/all_properties.hpp>
12+
#include <sycl/usm.hpp>
1013

1114
using namespace sycl;
1215

‎sycl/test-e2e/KernelFusion/event_wait_complete.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
#include "fusion_event_test_common.h"
88

9-
#include <sycl/sycl.hpp>
9+
#include <sycl/detail/core.hpp>
10+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
11+
#include <sycl/properties/all_properties.hpp>
12+
#include <sycl/usm.hpp>
1013

1114
using namespace sycl;
1215

‎sycl/test-e2e/KernelFusion/existing_local_accessor.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
// Test complete fusion with local internalization and an local accessor that
55
// already exists in one of the input kernels.
66

7-
#include <sycl/sycl.hpp>
7+
#include <sycl/detail/core.hpp>
8+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
9+
#include <sycl/properties/all_properties.hpp>
810

911
using namespace sycl;
1012

‎sycl/test-e2e/KernelFusion/fusion_event_test_common.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#include <sycl/sycl.hpp>
1+
#include <sycl/detail/core.hpp>
2+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
3+
#include <sycl/properties/all_properties.hpp>
24

35
using namespace sycl;
46

‎sycl/test-e2e/KernelFusion/helpers.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#include <sycl/sycl.hpp>
1+
#include <sycl/detail/core.hpp>
2+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
3+
#include <sycl/properties/all_properties.hpp>
24

35
using namespace sycl;
46
using namespace sycl::ext::codeplay;

‎sycl/test-e2e/KernelFusion/internal_explicit_dependency.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
#include "fusion_event_test_common.h"
99

10-
#include <sycl/sycl.hpp>
10+
#include <sycl/detail/core.hpp>
11+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
12+
#include <sycl/properties/all_properties.hpp>
13+
#include <sycl/usm.hpp>
1114

1215
using namespace sycl;
1316

‎sycl/test-e2e/KernelFusion/internalize_array_wrapper.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55

66
#include <array>
77

8-
#include <sycl/sycl.hpp>
8+
#include <sycl/detail/core.hpp>
9+
10+
#include <sycl/builtins.hpp>
11+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
12+
#include <sycl/properties/all_properties.hpp>
913

1014
using namespace sycl;
1115

‎sycl/test-e2e/KernelFusion/internalize_array_wrapper_local.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55

66
#include <array>
77

8-
#include <sycl/sycl.hpp>
8+
#include <sycl/detail/core.hpp>
9+
10+
#include <sycl/builtins.hpp>
11+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
12+
#include <sycl/properties/all_properties.hpp>
913

1014
using namespace sycl;
1115

‎sycl/test-e2e/KernelFusion/internalize_deep.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55

66
#include <type_traits>
77

8-
#include <sycl/sycl.hpp>
8+
#include <sycl/detail/core.hpp>
9+
10+
#include <sycl/builtins.hpp>
11+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
12+
#include <sycl/properties/all_properties.hpp>
913

1014
using namespace sycl;
1115

‎sycl/test-e2e/KernelFusion/internalize_multi_ptr.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
// Test complete fusion with private internalization specified on the
55
// accessors for a device kernel using multi_ptr to global address space.
66

7-
#include <sycl/sycl.hpp>
7+
#include <sycl/detail/core.hpp>
8+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
9+
#include <sycl/properties/all_properties.hpp>
810

911
using namespace sycl;
1012

‎sycl/test-e2e/KernelFusion/internalize_non_unit_localsize.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
// - `tmp2` is an `i8` buffer. The corresponding `i8`-typed GEPs must be
1313
// remapped during internalization.
1414

15-
#include <sycl/sycl.hpp>
15+
#include <sycl/detail/core.hpp>
16+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
17+
#include <sycl/properties/all_properties.hpp>
1618

1719
using namespace sycl;
1820

‎sycl/test-e2e/KernelFusion/internalize_vec.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
// Test complete fusion with internalization of a struct type.
55

6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
8+
#include <sycl/builtins.hpp>
9+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
10+
#include <sycl/properties/all_properties.hpp>
711

812
using namespace sycl;
913

‎sycl/test-e2e/KernelFusion/internalize_vfunc.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
#define VEC 4
88

9-
#include <sycl/sycl.hpp>
9+
#include <sycl/detail/core.hpp>
10+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
11+
#include <sycl/properties/all_properties.hpp>
1012

1113
using namespace sycl;
1214

‎sycl/test-e2e/KernelFusion/jit_caching.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
// printed when SYCL_RT_WARNING_LEVEL=1.
66

77
#include <iostream>
8-
#include <sycl/sycl.hpp>
8+
#include <sycl/detail/core.hpp>
9+
#include <sycl/ext/codeplay/experimental/fusion_wrapper.hpp>
10+
#include <sycl/properties/all_properties.hpp>
911

1012
using namespace sycl;
1113

0 commit comments

Comments
 (0)