Skip to content

Commit 9b187c5

Browse files
slawekptakslawekptak
committed
Fix formatting
1 parent 2a22bcb commit 9b187c5

File tree

3 files changed

+46
-37
lines changed

3 files changed

+46
-37
lines changed

‎sycl/include/sycl/ext/oneapi/experimental/work_group_memory.hpp‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ class NDRDescT;
3232
class ArgDesc;
3333
class dynamic_parameter_impl;
3434

35-
void processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
36-
const int Size, const size_t Index, size_t &IndexShift,
37-
bool IsKernelCreatedFromSource, bool IsESIMD,
38-
detail::NDRDescT NDRDesc, std::vector<std::pair<
39-
ext::oneapi::experimental::detail::dynamic_parameter_impl *, int>>
40-
DynamicParameters, std::vector<ArgDesc> &Args);
35+
void processArg(
36+
void *Ptr, const detail::kernel_param_kind_t &Kind, const int Size,
37+
const size_t Index, size_t &IndexShift, bool IsKernelCreatedFromSource,
38+
bool IsESIMD, detail::NDRDescT NDRDesc,
39+
std::vector<std::pair<
40+
ext::oneapi::experimental::detail::dynamic_parameter_impl *, int>>
41+
DynamicParameters,
42+
std::vector<ArgDesc> &Args);
4143

4244
class work_group_memory_impl {
4345
public:
@@ -50,12 +52,14 @@ class work_group_memory_impl {
5052
private:
5153
size_t buffer_size;
5254
friend class sycl::handler;
53-
friend void detail::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
54-
const int Size, const size_t Index, size_t &IndexShift,
55-
bool IsKernelCreatedFromSource, bool IsESIMD,
56-
detail::NDRDescT NDRDesc, std::vector<std::pair<
57-
ext::oneapi::experimental::detail::dynamic_parameter_impl *, int>>
58-
DynamicParameters, std::vector<ArgDesc> &Args);
55+
friend void detail::processArg(
56+
void *Ptr, const detail::kernel_param_kind_t &Kind, const int Size,
57+
const size_t Index, size_t &IndexShift, bool IsKernelCreatedFromSource,
58+
bool IsESIMD, detail::NDRDescT NDRDesc,
59+
std::vector<std::pair<
60+
ext::oneapi::experimental::detail::dynamic_parameter_impl *, int>>
61+
DynamicParameters,
62+
std::vector<ArgDesc> &Args);
5963
};
6064

6165
} // namespace detail

‎sycl/include/sycl/stream.hpp‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ inline namespace _V1 {
4141

4242
namespace detail {
4343

44-
void processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
45-
const int Size, const size_t Index, size_t &IndexShift,
46-
bool IsKernelCreatedFromSource, bool IsESIMD,
47-
detail::NDRDescT NDRDesc, std::vector<std::pair<
48-
ext::oneapi::experimental::detail::dynamic_parameter_impl *, int>>
49-
DynamicParameters, std::vector<ArgDesc> &Args);
44+
void processArg(
45+
void *Ptr, const detail::kernel_param_kind_t &Kind, const int Size,
46+
const size_t Index, size_t &IndexShift, bool IsKernelCreatedFromSource,
47+
bool IsESIMD, detail::NDRDescT NDRDesc,
48+
std::vector<std::pair<
49+
ext::oneapi::experimental::detail::dynamic_parameter_impl *, int>>
50+
DynamicParameters,
51+
std::vector<ArgDesc> &Args);
5052

5153
class stream_impl;
5254

@@ -1049,12 +1051,14 @@ class __SYCL_EXPORT __SYCL_SPECIAL_CLASS __SYCL_TYPE(stream) stream
10491051
#endif
10501052

10511053
friend class handler;
1052-
friend void detail::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
1053-
const int Size, const size_t Index, size_t &IndexShift,
1054-
bool IsKernelCreatedFromSource, bool IsESIMD,
1055-
detail::NDRDescT NDRDesc, std::vector<std::pair<
1056-
ext::oneapi::experimental::detail::dynamic_parameter_impl *, int>>
1057-
DynamicParameters, std::vector<ArgDesc> &Args);
1054+
friend void detail::processArg(
1055+
void *Ptr, const detail::kernel_param_kind_t &Kind, const int Size,
1056+
const size_t Index, size_t &IndexShift, bool IsKernelCreatedFromSource,
1057+
bool IsESIMD, detail::NDRDescT NDRDesc,
1058+
std::vector<std::pair<
1059+
ext::oneapi::experimental::detail::dynamic_parameter_impl *, int>>
1060+
DynamicParameters,
1061+
std::vector<ArgDesc> &Args);
10581062

10591063
template <typename SYCLObjT> friend class ext::oneapi::weak_object;
10601064

‎sycl/source/handler.cpp‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "ur_api.h"
1111
#include <algorithm>
1212

13+
#include <detail/arg_extraction.hpp>
1314
#include <detail/config.hpp>
1415
#include <detail/global_handler.hpp>
1516
#include <detail/graph/dynamic_impl.hpp>
@@ -34,7 +35,6 @@
3435
#include <sycl/handler.hpp>
3536
#include <sycl/info/info_desc.hpp>
3637
#include <sycl/stream.hpp>
37-
#include <detail/arg_extraction.hpp>
3838

3939
#include <sycl/ext/oneapi/bindless_images_memory.hpp>
4040
#include <sycl/ext/oneapi/experimental/graph.hpp>
@@ -1063,15 +1063,15 @@ void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
10631063
static_cast<detail::AccessorBaseHost *>(&S->GlobalBuf);
10641064
detail::Requirement *GBufReq = &*detail::getSyclObjImpl(*GBufBase);
10651065
detail::addArgsForGlobalAccessor(GBufReq, Index, IndexShift, Size,
1066-
IsKernelCreatedFromSource, GlobalSize, impl->MArgs,
1067-
IsESIMD);
1066+
IsKernelCreatedFromSource, GlobalSize,
1067+
impl->MArgs, IsESIMD);
10681068
++IndexShift;
10691069
detail::AccessorBaseHost *GOffsetBase =
10701070
static_cast<detail::AccessorBaseHost *>(&S->GlobalOffset);
10711071
detail::Requirement *GOffsetReq = &*detail::getSyclObjImpl(*GOffsetBase);
10721072
detail::addArgsForGlobalAccessor(GOffsetReq, Index, IndexShift, Size,
1073-
IsKernelCreatedFromSource, GlobalSize, impl->MArgs,
1074-
IsESIMD);
1073+
IsKernelCreatedFromSource, GlobalSize,
1074+
impl->MArgs, IsESIMD);
10751075
++IndexShift;
10761076
detail::AccessorBaseHost *GFlushBase =
10771077
static_cast<detail::AccessorBaseHost *>(&S->GlobalFlushBuf);
@@ -1089,8 +1089,8 @@ void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
10891089
}
10901090
}
10911091
detail::addArgsForGlobalAccessor(GFlushReq, Index, IndexShift, Size,
1092-
IsKernelCreatedFromSource, GlobalSize, impl->MArgs,
1093-
IsESIMD);
1092+
IsKernelCreatedFromSource, GlobalSize,
1093+
impl->MArgs, IsESIMD);
10941094
++IndexShift;
10951095
addArg(kernel_param_kind_t::kind_std_layout, &S->FlushBufferSize,
10961096
sizeof(S->FlushBufferSize), Index + IndexShift);
@@ -1107,16 +1107,17 @@ void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
11071107
case access::target::constant_buffer: {
11081108
detail::Requirement *AccImpl = static_cast<detail::Requirement *>(Ptr);
11091109
detail::addArgsForGlobalAccessor(AccImpl, Index, IndexShift, Size,
1110-
IsKernelCreatedFromSource, GlobalSize,
1111-
impl->MArgs, IsESIMD);
1110+
IsKernelCreatedFromSource, GlobalSize,
1111+
impl->MArgs, IsESIMD);
11121112
break;
11131113
}
11141114
case access::target::local: {
11151115
detail::LocalAccessorImplHost *LAccImpl =
11161116
static_cast<detail::LocalAccessorImplHost *>(Ptr);
11171117

11181118
detail::addArgsForLocalAccessor(LAccImpl, Index, IndexShift,
1119-
IsKernelCreatedFromSource, impl->MArgs, IsESIMD);
1119+
IsKernelCreatedFromSource, impl->MArgs,
1120+
IsESIMD);
11201121
break;
11211122
}
11221123
case access::target::image:
@@ -1157,9 +1158,9 @@ void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
11571158
ext::oneapi::experimental::detail::dynamic_local_accessor_impl *>(
11581159
DynParamImpl);
11591160

1160-
detail::addArgsForLocalAccessor(&DynLocalAccessorImpl->LAccImplHost, Index,
1161-
IndexShift, IsKernelCreatedFromSource,
1162-
impl->MArgs, IsESIMD);
1161+
detail::addArgsForLocalAccessor(
1162+
&DynLocalAccessorImpl->LAccImplHost, Index, IndexShift,
1163+
IsKernelCreatedFromSource, impl->MArgs, IsESIMD);
11631164
break;
11641165
}
11651166
default: {

0 commit comments

Comments
 (0)