Skip to content

Commit a392f07

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][E2E] Use fine-grained includes in ESIMD/* tests (#13870)
1 parent 5b5b222 commit a392f07

File tree

192 files changed

+121
-673
lines changed

Some content is hidden

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

192 files changed

+121
-673
lines changed

‎sycl/include/sycl/usm/usm_allocator.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
// ===--------------------------------------------------------------------=== //
88
#pragma once
99

10-
#include <sycl/builtins.hpp> // for max
11-
#include <sycl/context.hpp> // for context
12-
#include <sycl/detail/common.hpp> // for code_location
13-
#include <sycl/device.hpp> // for device
14-
#include <sycl/exception.hpp> // for memory_allocation_error
15-
#include <sycl/property_list.hpp> // for property_list
16-
#include <sycl/queue.hpp> // for queue
17-
#include <sycl/usm/usm_enums.hpp> // for alloc
10+
#include <sycl/builtins.hpp>
11+
#include <sycl/context.hpp>
12+
#include <sycl/detail/common.hpp>
13+
#include <sycl/device.hpp>
14+
#include <sycl/exception.hpp>
15+
#include <sycl/property_list.hpp>
16+
#include <sycl/queue.hpp>
17+
#include <sycl/usm.hpp>
1818

1919
#include <cstdlib> // for size_t, aligned_alloc, free
2020
#include <type_traits> // for true_type

‎sycl/test-e2e/ESIMD/BitonicSortK.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88

99
#include "esimd_test_utils.hpp"
1010

11-
#include <algorithm>
12-
#include <iostream>
13-
#include <sycl/ext/intel/esimd.hpp>
14-
#include <sycl/sycl.hpp>
15-
1611
#define ESIMD_UNROLL _Pragma("unroll")
1712

1813
using namespace sycl;

‎sycl/test-e2e/ESIMD/BitonicSortKv2.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
//==--------------------------------------------------------------------==//
88
#include "esimd_test_utils.hpp"
99

10-
#include <algorithm>
11-
#include <iostream>
12-
#include <sycl/ext/intel/esimd.hpp>
13-
#include <sycl/sycl.hpp>
14-
1510
using namespace sycl;
1611
using namespace sycl::ext::intel;
1712
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/InlineAsm/asm_glb.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
#include "../esimd_test_utils.hpp"
1212

13-
#include <iostream>
14-
#include <sycl/ext/intel/esimd.hpp>
15-
#include <sycl/sycl.hpp>
16-
1713
using namespace sycl;
1814
using namespace sycl::ext::intel::esimd;
1915

‎sycl/test-e2e/ESIMD/InlineAsm/asm_simd_mask.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
#include "../esimd_test_utils.hpp"
1313

14-
#include <iostream>
15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
1814
using namespace sycl;
1915

2016
int main(void) {

‎sycl/test-e2e/ESIMD/InlineAsm/asm_simd_view.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
#include "../esimd_test_utils.hpp"
1313

14-
#include <iostream>
15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
1814
using namespace sycl;
1915

2016
int main(void) {

‎sycl/test-e2e/ESIMD/InlineAsm/asm_vadd.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
#include "../esimd_test_utils.hpp"
1313

14-
#include <iostream>
15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
1814
using namespace sycl;
1915

2016
int main(void) {

‎sycl/test-e2e/ESIMD/PrefixSum.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
#include "esimd_test_utils.hpp"
1212

13-
#include <iostream>
14-
#include <sycl/ext/intel/esimd.hpp>
15-
#include <sycl/sycl.hpp>
16-
1713
#define MAX_TS_WIDTH 1024
1814
// kernel can handle TUPLE_SZ 1, 2, or 4
1915
#define TUPLE_SZ 1

‎sycl/test-e2e/ESIMD/Prefix_Local_sum1.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
#include "esimd_test_utils.hpp"
1212

13-
#include <iostream>
14-
#include <sycl/ext/intel/esimd.hpp>
15-
#include <sycl/sycl.hpp>
16-
1713
#define MAX_TS_WIDTH 1024
1814
// kernel can handle TUPLE_SZ 1, 2, or 4
1915
#define TUPLE_SZ 1

‎sycl/test-e2e/ESIMD/Prefix_Local_sum2.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
#include "esimd_test_utils.hpp"
1212

13-
#include <iostream>
14-
#include <sycl/ext/intel/esimd.hpp>
15-
#include <sycl/sycl.hpp>
16-
1713
#define MAX_TS_WIDTH 1024
1814
// kernel can handle TUPLE_SZ 1, 2, or 4
1915
#define TUPLE_SZ 4

‎sycl/test-e2e/ESIMD/Prefix_Local_sum3.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
#include "esimd_test_utils.hpp"
1212

13-
#include <iostream>
14-
#include <sycl/ext/intel/esimd.hpp>
15-
#include <sycl/sycl.hpp>
16-
1713
#define MAX_TS_WIDTH 1024
1814
// kernel can handle TUPLE_SZ 1, 2, or 4
1915
#define TUPLE_SZ 2

‎sycl/test-e2e/ESIMD/Stencil.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010

1111
#include "esimd_test_utils.hpp"
1212

13-
#include <iostream>
14-
#include <sycl/ext/intel/esimd.hpp>
15-
#include <sycl/sycl.hpp>
16-
1713
#define WIDTH 16
1814
#define HEIGHT 16
1915

‎sycl/test-e2e/ESIMD/acc_gather_scatter_rgba.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
#include "esimd_test_utils.hpp"
1313

14-
#include <iostream>
15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
1814
using namespace sycl;
1915

2016
template <typename T>

‎sycl/test-e2e/ESIMD/acc_gather_scatter_rgba_stateless_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
// offsets.
1616

1717
#include <iostream>
18+
#include <sycl/detail/core.hpp>
1819
#include <sycl/ext/intel/esimd.hpp>
19-
#include <sycl/sycl.hpp>
2020

2121
using namespace sycl;
2222
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/accessor.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010

1111
#include "esimd_test_utils.hpp"
1212

13-
#include <sycl/ext/intel/esimd.hpp>
14-
#include <sycl/sycl.hpp>
15-
16-
#include <iostream>
17-
1813
using namespace sycl;
1914

2015
constexpr unsigned int VL = 1024 * 128;

‎sycl/test-e2e/ESIMD/accessor_gather_scatter.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
#include "esimd_test_utils.hpp"
1313

14-
#include <iostream>
15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
1814
using namespace sycl;
1915

2016
template <typename T>

‎sycl/test-e2e/ESIMD/accessor_gather_scatter_stateless_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// RUN: %{run} %t.out
1111

1212
#include <iostream>
13+
#include <sycl/detail/core.hpp>
1314
#include <sycl/ext/intel/esimd.hpp>
14-
#include <sycl/sycl.hpp>
1515

1616
using namespace sycl;
1717
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/accessor_global.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
#include "esimd_test_utils.hpp"
88

9-
#include <sycl/ext/intel/esimd.hpp>
10-
#include <sycl/sycl.hpp>
11-
12-
#include <iostream>
13-
149
using namespace sycl;
1510
using namespace sycl::ext::intel::esimd;
1611

‎sycl/test-e2e/ESIMD/accessor_load_store.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111

1212
#include "esimd_test_utils.hpp"
1313

14-
#include <iostream>
15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
1814
using namespace sycl;
1915

2016
template <typename T>

‎sycl/test-e2e/ESIMD/accessor_load_store_stateless_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// RUN: %{run} %t.out
1111

1212
#include <iostream>
13+
#include <sycl/detail/core.hpp>
1314
#include <sycl/ext/intel/esimd.hpp>
14-
#include <sycl/sycl.hpp>
1515

1616
using namespace sycl;
1717
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/accessor_local.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@
66

77
#include "esimd_test_utils.hpp"
88

9-
#include <sycl/ext/intel/esimd.hpp>
10-
#include <sycl/sycl.hpp>
11-
12-
#include <iostream>
13-
149
using namespace sycl;
1510
using namespace sycl::ext::intel::esimd;
1611

‎sycl/test-e2e/ESIMD/accessor_stateless_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// RUN: %{run} %t.out
1111

1212
#include <iostream>
13+
#include <sycl/detail/core.hpp>
1314
#include <sycl/ext/intel/esimd.hpp>
14-
#include <sycl/sycl.hpp>
1515

1616
using namespace sycl;
1717
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/accessor_stateless_ctor_64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// RUN: %{run} %t.out
1111

1212
#include <iostream>
13+
#include <sycl/detail/core.hpp>
1314
#include <sycl/ext/intel/esimd.hpp>
14-
#include <sycl/sycl.hpp>
1515

1616
using namespace sycl;
1717
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/addc.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414

1515
#include "esimd_test_utils.hpp"
1616

17-
#include <iostream>
18-
#include <sycl/ext/intel/esimd.hpp>
19-
#include <sycl/sycl.hpp>
20-
2117
using namespace sycl;
2218
using namespace sycl::ext::intel::esimd;
2319

‎sycl/test-e2e/ESIMD/aot_mixed.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919

2020
#include "esimd_test_utils.hpp"
2121

22-
#include <iostream>
23-
#include <sycl/ext/intel/esimd.hpp>
24-
#include <sycl/sycl.hpp>
25-
2622
using namespace sycl;
2723

2824
#ifndef ENABLE_SIMD

‎sycl/test-e2e/ESIMD/api/ballot.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,9 @@
1212

1313
#include "../esimd_test_utils.hpp"
1414

15-
#include <algorithm>
1615
#include <array>
17-
#include <iostream>
1816
#include <random>
1917
#include <sycl/builtins_esimd.hpp>
20-
#include <sycl/sycl.hpp>
21-
22-
#include <sycl/ext/intel/esimd.hpp>
2318

2419
using namespace sycl;
2520
using namespace sycl::ext::intel;

‎sycl/test-e2e/ESIMD/api/bin_and_cmp_ops_heavy.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323

2424
#include "../esimd_test_utils.hpp"
2525

26-
#include <iostream>
27-
#include <sycl/ext/intel/esimd.hpp>
28-
#include <sycl/sycl.hpp>
29-
3026
using namespace sycl;
3127
using namespace sycl::ext::intel::esimd;
3228
using bfloat16 = sycl::ext::oneapi::bfloat16;

‎sycl/test-e2e/ESIMD/api/esimd_bit_ops.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212

1313
#include "../esimd_test_utils.hpp"
1414

15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
18-
#include <iostream>
19-
2015
using namespace sycl;
2116
using namespace sycl::ext::intel;
2217
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/api/esimd_merge.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@
1313

1414
#include "../esimd_test_utils.hpp"
1515

16-
#include <iostream>
17-
#include <sycl/ext/intel/esimd.hpp>
18-
#include <sycl/sycl.hpp>
19-
2016
using namespace sycl::ext::intel::esimd;
2117
using namespace sycl::ext::intel;
2218
using namespace sycl;

‎sycl/test-e2e/ESIMD/api/esimd_pack_unpack_mask.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212

1313
#include "../esimd_test_utils.hpp"
1414

15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
18-
#include <iostream>
19-
2015
using namespace sycl;
2116
using namespace sycl::ext::intel;
2217
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/api/esimd_rgba_smoke.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212

1313
#include "../esimd_test_utils.hpp"
1414

15-
#include <sycl/ext/intel/esimd.hpp>
16-
#include <sycl/sycl.hpp>
17-
18-
#include <iostream>
19-
2015
#ifdef USE_64_BIT_OFFSET
2116
typedef uint64_t Toffset;
2217
#else

‎sycl/test-e2e/ESIMD/api/functional/common.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414

1515
#pragma once
1616

17-
#include <sycl/ext/intel/esimd.hpp>
18-
#include <sycl/sycl.hpp>
19-
2017
#include "../../esimd_test_utils.hpp"
2118
#include "logger.hpp"
2219
#include "type_coverage.hpp"

‎sycl/test-e2e/ESIMD/api/functional/mutator.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "type_traits.hpp"
1818
#include "value.hpp"
19-
#include <sycl/sycl.hpp>
19+
#include <sycl/detail/core.hpp>
2020

2121
// for std::for_each
2222
#include <algorithm>

‎sycl/test-e2e/ESIMD/api/functional/operators/operator_assignment_glb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// RUN: %{run} %t.out
1010
#include "common.hpp"
1111
#include <iostream>
12+
#include <sycl/detail/core.hpp>
1213
#include <sycl/ext/intel/esimd.hpp>
13-
#include <sycl/sycl.hpp>
1414

1515
using namespace sycl;
1616
using namespace sycl::ext::intel::esimd;

‎sycl/test-e2e/ESIMD/api/functional/operators/operator_assignment_glb_mask.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// RUN: %{run} %t.out
1010
#include "common.hpp"
1111
#include <iostream>
12+
#include <sycl/detail/core.hpp>
1213
#include <sycl/ext/intel/esimd.hpp>
13-
#include <sycl/sycl.hpp>
1414

1515
using namespace sycl;
1616
using namespace sycl::ext::intel::esimd;

0 commit comments

Comments
 (0)