Skip to content

[SYCL][E2E] Switch most of USM/* tests to use <sycl/detail/core.hpp> #13124

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

Merged
merged 4 commits into from
Mar 23, 2024
Merged

[SYCL][E2E] Switch most of USM/* tests to use <sycl/detail/core.hpp> #13124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d6c93af
[SYCL][E2E] Switch USM/* tests to use <sycl/detail/core.hpp>
aelovikov-intel Mar 21, 2024
f9c0a73
Address CI failures
aelovikov-intel Mar 22, 2024
3be087c
clang-format
aelovikov-intel Mar 22, 2024
f65156e
Fix p2p_atomics.cpp
aelovikov-intel Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/P2P/p2p_access.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
// RUN: %if cuda %{ %{run} %t.out %}

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

using namespace sycl;

Expand Down
6 changes: 5 additions & 1 deletion sycl/test-e2e/USM/P2P/p2p_atomics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@

#include <cassert>
#include <numeric>
#include <sycl/sycl.hpp>
#include <vector>

#include <sycl/detail/core.hpp>

#include <sycl/atomic_ref.hpp>
#include <sycl/usm.hpp>

using namespace sycl;

// number of atomic operations
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/P2P/p2p_copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

#include <cassert>
#include <numeric>
#include <sycl/sycl.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/usm.hpp>
#include <vector>

using namespace sycl;
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/align.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
// so when run on gpu. This maybe because the gpu runtime has different
// behavior. Therefore, GPU is unsupported until issue #12638 gets resolved.

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

#include <complex>
#include <numeric>
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/alloc_functions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

#include <iostream>
#include <tuple>
Expand Down
4 changes: 3 additions & 1 deletion sycl/test-e2e/USM/allocator_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
//
//===----------------------------------------------------------------------===//

#include <sycl/sycl.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/usm.hpp>
#include <sycl/usm/usm_allocator.hpp>

#include <cassert>

Expand Down
4 changes: 3 additions & 1 deletion sycl/test-e2e/USM/allocator_equal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
//
//===----------------------------------------------------------------------===//

#include <sycl/sycl.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/usm.hpp>
#include <sycl/usm/usm_allocator.hpp>

#include <cassert>

Expand Down
4 changes: 3 additions & 1 deletion sycl/test-e2e/USM/allocator_rebind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
//
//===----------------------------------------------------------------------===//

#include <sycl/sycl.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/usm.hpp>
#include <sycl/usm/usm_allocator.hpp>

#include <iostream>

Expand Down
4 changes: 3 additions & 1 deletion sycl/test-e2e/USM/allocator_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
//
//===----------------------------------------------------------------------===//

#include <sycl/sycl.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/usm.hpp>
#include <sycl/usm/usm_allocator.hpp>

#include <cassert>
#include <memory>
Expand Down
4 changes: 3 additions & 1 deletion sycl/test-e2e/USM/allocator_vector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
//
//===----------------------------------------------------------------------===//

#include <sycl/sycl.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/usm.hpp>
#include <sycl/usm/usm_allocator.hpp>

#include <vector>

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/badmalloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
// This test verifies that things fail in the proper way when they should.

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

using namespace sycl;

Expand Down
6 changes: 5 additions & 1 deletion sycl/test-e2e/USM/buffer_location.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@

#include <iostream>
#include <memory>
#include <sycl/sycl.hpp>

#include <sycl/detail/core.hpp>

#include <sycl/ext/intel/experimental/usm_properties.hpp>
#include <sycl/usm.hpp>

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/copy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t1.out
// RUN: %{run} %t1.out

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

using namespace sycl;
using namespace sycl::usm;
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/dep_events.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
// RUN: %{run} %t1.out

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/depends_on.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/dmem_varied.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
//
//===----------------------------------------------------------------------===//

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

#include <vector>

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/dmemll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/dmemllaligned.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/fill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t1.out
// RUN: %{run} %t1.out

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/free_during_kernel_execution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
// Windows doesn't yet have full shutdown().
// UNSUPPORTED: ze_debug && windows

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

class KernelA;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/hmemll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/hmemllaligned.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/math.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}

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

#include <array>
#include <cassert>
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memadvise.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memadvise_flags.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
//===----------------------------------------------------------------------===//

#include <iostream>
#include <sycl/sycl.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/usm.hpp>
#include <vector>

using namespace sycl;
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memcpy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
// RUN: %{build} -o %t1.out
// RUN: %{run} %t1.out

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memops2d/copy2d_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

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

#include "memops2d_utils.hpp"

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memops2d/fill2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

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

#include "memops2d_utils.hpp"

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memops2d/memcpy2d_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

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

#include "memops2d_utils.hpp"

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memops2d/memops2d_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

#pragma once

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memops2d/memset2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

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

#include "memops2d_utils.hpp"

Expand Down
5 changes: 4 additions & 1 deletion sycl/test-e2e/USM/memory_coherency_hip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
//
//===----------------------------------------------------------------------===//

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

#include <sycl/atomic_ref.hpp>
#include <sycl/usm.hpp>

#include <chrono>
#include <iostream>
Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/memset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
#include <sycl/sycl.hpp>
#include <sycl/detail/core.hpp>
#include <sycl/usm.hpp>

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/mixed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/mixed2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/mixed2template.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/mixed_queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
3 changes: 2 additions & 1 deletion sycl/test-e2e/USM/multictxt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
//
//===----------------------------------------------------------------------===//

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

using namespace sycl;

Expand Down
Loading