Skip to content

Commit ceed6af

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][E2E] Switch most of USM/* tests to use <sycl/detail/core.hpp> (#13124)
1 parent 6baf39e commit ceed6af

Some content is hidden

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

55 files changed

+135
-57
lines changed

‎sycl/test-e2e/USM/P2P/p2p_access.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// RUN: %if cuda %{ %{run} %t.out %}
44

55
#include <cassert>
6-
#include <sycl/sycl.hpp>
6+
#include <sycl/detail/core.hpp>
7+
#include <sycl/usm.hpp>
78

89
using namespace sycl;
910

‎sycl/test-e2e/USM/P2P/p2p_atomics.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44

55
#include <cassert>
66
#include <numeric>
7-
#include <sycl/sycl.hpp>
87
#include <vector>
98

9+
#include <sycl/detail/core.hpp>
10+
11+
#include <sycl/atomic_ref.hpp>
12+
#include <sycl/usm.hpp>
13+
1014
using namespace sycl;
1115

1216
// number of atomic operations

‎sycl/test-e2e/USM/P2P/p2p_copy.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
#include <cassert>
66
#include <numeric>
7-
#include <sycl/sycl.hpp>
7+
#include <sycl/detail/core.hpp>
8+
#include <sycl/usm.hpp>
89
#include <vector>
910

1011
using namespace sycl;

‎sycl/test-e2e/USM/align.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
// so when run on gpu. This maybe because the gpu runtime has different
1111
// behavior. Therefore, GPU is unsupported until issue #12638 gets resolved.
1212

13-
#include <sycl/sycl.hpp>
13+
#include <sycl/detail/core.hpp>
14+
#include <sycl/usm.hpp>
1415

1516
#include <complex>
1617
#include <numeric>

‎sycl/test-e2e/USM/alloc_functions.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
#include <iostream>
1516
#include <tuple>

‎sycl/test-e2e/USM/allocator_container.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
14+
#include <sycl/usm/usm_allocator.hpp>
1315

1416
#include <cassert>
1517

‎sycl/test-e2e/USM/allocator_equal.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
14+
#include <sycl/usm/usm_allocator.hpp>
1315

1416
#include <cassert>
1517

‎sycl/test-e2e/USM/allocator_rebind.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
14+
#include <sycl/usm/usm_allocator.hpp>
1315

1416
#include <iostream>
1517

‎sycl/test-e2e/USM/allocator_shared.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
14+
#include <sycl/usm/usm_allocator.hpp>
1315

1416
#include <cassert>
1517
#include <memory>

‎sycl/test-e2e/USM/allocator_vector.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
14+
#include <sycl/usm/usm_allocator.hpp>
1315

1416
#include <vector>
1517

‎sycl/test-e2e/USM/badmalloc.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
// This test verifies that things fail in the proper way when they should.
1616

1717
#include <iostream>
18-
#include <sycl/sycl.hpp>
18+
#include <sycl/detail/core.hpp>
19+
#include <sycl/usm.hpp>
1920

2021
using namespace sycl;
2122

‎sycl/test-e2e/USM/buffer_location.cpp

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

1313
#include <iostream>
1414
#include <memory>
15-
#include <sycl/sycl.hpp>
15+
16+
#include <sycl/detail/core.hpp>
17+
18+
#include <sycl/ext/intel/experimental/usm_properties.hpp>
19+
#include <sycl/usm.hpp>
1620

1721
using namespace sycl;
1822

‎sycl/test-e2e/USM/copy.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t1.out
1010
// RUN: %{run} %t1.out
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516
using namespace sycl::usm;

‎sycl/test-e2e/USM/dep_events.cpp

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

1212
#include <iostream>
13-
#include <sycl/sycl.hpp>
13+
#include <sycl/detail/core.hpp>
14+
#include <sycl/usm.hpp>
1415

1516
using namespace sycl;
1617

‎sycl/test-e2e/USM/depends_on.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/dmem_varied.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
//
1414
//===----------------------------------------------------------------------===//
1515

16-
#include <sycl/sycl.hpp>
16+
#include <sycl/detail/core.hpp>
17+
#include <sycl/usm.hpp>
1718

1819
#include <vector>
1920

‎sycl/test-e2e/USM/dmemll.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/dmemllaligned.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/fill.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t1.out
1010
// RUN: %{run} %t1.out
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/free_during_kernel_execution.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
// Windows doesn't yet have full shutdown().
1313
// UNSUPPORTED: ze_debug && windows
1414

15-
#include <sycl/sycl.hpp>
15+
#include <sycl/detail/core.hpp>
16+
#include <sycl/usm.hpp>
1617

1718
class KernelA;
1819

‎sycl/test-e2e/USM/hmemll.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/hmemllaligned.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/math.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
55
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
66

7-
#include <sycl/sycl.hpp>
7+
#include <sycl/detail/core.hpp>
8+
#include <sycl/usm.hpp>
89

910
#include <array>
1011
#include <cassert>

‎sycl/test-e2e/USM/memadvise.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/memadvise_flags.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include <iostream>
14-
#include <sycl/sycl.hpp>
14+
#include <sycl/detail/core.hpp>
15+
#include <sycl/usm.hpp>
1516
#include <vector>
1617

1718
using namespace sycl;

‎sycl/test-e2e/USM/memcpy.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// RUN: %{build} -o %t1.out
1010
// RUN: %{run} %t1.out
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/memops2d/copy2d_common.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

3-
#include <sycl/sycl.hpp>
3+
#include <sycl/detail/core.hpp>
4+
#include <sycl/usm.hpp>
45

56
#include "memops2d_utils.hpp"
67

‎sycl/test-e2e/USM/memops2d/fill2d.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// RUN: %{build} -o %t.out
1010
// RUN: %{run} %t.out
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
#include "memops2d_utils.hpp"
1516

‎sycl/test-e2e/USM/memops2d/memcpy2d_common.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

3-
#include <sycl/sycl.hpp>
3+
#include <sycl/detail/core.hpp>
4+
#include <sycl/usm.hpp>
45

56
#include "memops2d_utils.hpp"
67

‎sycl/test-e2e/USM/memops2d/memops2d_utils.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
#pragma once
1010

11-
#include <sycl/sycl.hpp>
11+
#include <sycl/detail/core.hpp>
12+
#include <sycl/usm.hpp>
1213

1314
using namespace sycl;
1415

‎sycl/test-e2e/USM/memops2d/memset2d.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
// RUN: %{build} -o %t.out
1010
// RUN: %{run} %t.out
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
#include "memops2d_utils.hpp"
1516

‎sycl/test-e2e/USM/memory_coherency_hip.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
//
1212
//===----------------------------------------------------------------------===//
1313

14-
#include <sycl/sycl.hpp>
14+
#include <sycl/detail/core.hpp>
15+
16+
#include <sycl/atomic_ref.hpp>
17+
#include <sycl/usm.hpp>
1518

1619
#include <chrono>
1720
#include <iostream>

‎sycl/test-e2e/USM/memset.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
99
//
1010
//===----------------------------------------------------------------------===//
11-
#include <sycl/sycl.hpp>
11+
#include <sycl/detail/core.hpp>
12+
#include <sycl/usm.hpp>
1213

1314
using namespace sycl;
1415

‎sycl/test-e2e/USM/mixed.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/mixed2.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/mixed2template.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/mixed_queue.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
//
1010
//===----------------------------------------------------------------------===//
1111

12-
#include <sycl/sycl.hpp>
12+
#include <sycl/detail/core.hpp>
13+
#include <sycl/usm.hpp>
1314

1415
using namespace sycl;
1516

‎sycl/test-e2e/USM/multictxt.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
//
1212
//===----------------------------------------------------------------------===//
1313

14-
#include <sycl/sycl.hpp>
14+
#include <sycl/detail/core.hpp>
15+
#include <sycl/usm.hpp>
1516

1617
using namespace sycl;
1718

0 commit comments

Comments
 (0)