Skip to content

Commit f98a316

Browse files
committed
[SYCL] fix formatting in tests
[SYCL] fix formatting
1 parent 613aeac commit f98a316

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

sycl/test-e2e/Basic/launch_queries/max_work_group_size.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class TestKernel {
3131
private:
3232
sycl_global_accessor<value_type, 1> acc_;
3333
};
34-
} // namespace kernel
34+
} // namespace kernels
3535

3636
int main() {
3737
sycl::queue q{};

sycl/test-e2e/Basic/launch_queries/max_work_item_sizes.cpp

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
#include <sycl/detail/core.hpp>
55
#include <sycl/detail/info_desc_helpers.hpp>
6+
#include <sycl/kernel.hpp>
67
#include <sycl/kernel_bundle.hpp>
78
#include <sycl/sycl.hpp>
8-
#include <sycl/kernel.hpp>
99

1010
#include <cassert>
1111
#include <cstdint>
@@ -34,23 +34,24 @@ class TestKernel {
3434
private:
3535
sycl_global_accessor<value_type, 1> acc_;
3636
};
37-
}
37+
} // namespace kernels
3838

39-
template <int Dimensions>
40-
void check_max_work_item_sizes(const sycl::queue& Q)
41-
{
39+
template <int Dimensions> void check_max_work_item_sizes(const sycl::queue &Q) {
4240
const auto Dev = Q.get_device();
4341
const auto Ctx = Q.get_context();
44-
const auto Bundle = sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx);
42+
const auto Bundle =
43+
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx);
4544
const auto Kernel = Bundle.template get_kernel<kernels::TestKernel>();
4645
// get value to test
47-
const auto DevValues = Dev.get_info<sycl::info::device::max_work_item_sizes<Dimensions>>();
48-
const auto KernelValues = Kernel.ext_oneapi_get_info<syclex::info::kernel_queue_specific::max_work_item_sizes<Dimensions>>(Q);
49-
50-
static_assert(std::is_same_v<std::remove_cv_t<decltype(KernelValues)>, sycl::id<Dimensions>>,
51-
"max_work_item_sizes query must return sycl::id<Dimensions>, Dimensions in range[1,3]");
52-
for(int i = 0; i < Dimensions; i++)
53-
{
46+
const auto DevValues =
47+
Dev.get_info<sycl::info::device::max_work_item_sizes<Dimensions>>();
48+
const auto KernelValues = Kernel.ext_oneapi_get_info<
49+
syclex::info::kernel_queue_specific::max_work_item_sizes<Dimensions>>(Q);
50+
static_assert(std::is_same_v<std::remove_cv_t<decltype(KernelValues)>,
51+
sycl::id<Dimensions>>,
52+
"max_work_item_sizes query must return sycl::id<Dimensions>, "
53+
"Dimensions in range[1,3]");
54+
for (int i = 0; i < Dimensions; i++) {
5455
assert(KernelValues[i] == DevValues[i]);
5556
}
5657
}
@@ -64,15 +65,16 @@ int main() {
6465

6566
const auto Dev = Q.get_device();
6667
const auto Ctx = Q.get_context();
67-
const auto Bundle = sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx);
68+
const auto Bundle =
69+
sycl::get_kernel_bundle<sycl::bundle_state::executable>(Ctx);
6870
const auto Kernel = Bundle.template get_kernel<kernels::TestKernel>();
69-
const size_t MaxWorkGroupSizeActual =
70-
Kernel.template get_info<sycl::info::kernel_device_specific::work_group_size>(Dev);
71+
const size_t MaxWorkGroupSizeActual = Kernel.template get_info<
72+
sycl::info::kernel_device_specific::work_group_size>(Dev);
7173
sycl::buffer<value_type, 1> Buf{sycl::range<1>{MaxWorkGroupSizeActual}};
7274
auto LaunchRange = sycl::nd_range<1>{sycl::range<1>{MaxWorkGroupSizeActual},
73-
sycl::range<1>{MaxWorkGroupSizeActual}};
75+
sycl::range<1>{MaxWorkGroupSizeActual}};
7476
Q.submit([&](sycl::handler &cgh) {
75-
auto Acc = Buf.get_access<sycl::access::mode::read_write>(cgh);
76-
cgh.parallel_for(LaunchRange, kernels::TestKernel{Acc});
77+
auto Acc = Buf.get_access<sycl::access::mode::read_write>(cgh);
78+
cgh.parallel_for(LaunchRange, kernels::TestKernel{Acc});
7779
}).wait();
7880
}

sycl/unittests/Extensions/LaunchQueries.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const auto getQueue() {
5959
return Queue;
6060
}
6161

62-
const auto getKernel(const sycl::queue& Q) {
62+
const auto getKernel(const sycl::queue &Q) {
6363
auto KernelBundle = sycl::get_kernel_bundle<sycl::bundle_state::executable>(
6464
Q.get_context(), std::vector<sycl::kernel_id>{KernelID});
6565
return KernelBundle.get_kernel(KernelID);
@@ -340,8 +340,8 @@ TEST(LaunchQueries, GetNumSubGroupsUnsupported) {
340340
}
341341
{
342342
const auto NumSubGroups = Kernel.template ext_oneapi_get_info<
343-
syclex::info::kernel_queue_specific::num_sub_groups>(
344-
Queue, sycl::range<1>{1});
343+
syclex::info::kernel_queue_specific::num_sub_groups>(Queue,
344+
sycl::range<1>{1});
345345
ASSERT_EQ(NumSubGroups, 0);
346346
}
347347
}

0 commit comments

Comments
 (0)