Skip to content

Commit 3fbc2d2

Browse files
dm-vodopyanovdm-vodopyanov
committed
Fix pre-commit checks
1 parent 2fb6362 commit 3fbc2d2

File tree

15 files changed

+99
-33
lines changed

15 files changed

+99
-33
lines changed

‎sycl/include/CL/sycl/access/access.hpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,12 @@ enum class address_space : int {
4848
local_space = 3,
4949
ext_intel_global_device_space = 4,
5050
ext_intel_host_device_space = 5,
51-
global_device_space __SYCL2020_DEPRECATED("use ext_intel_global_device_space instead") = ext_intel_global_device_space,
52-
global_host_space __SYCL2020_DEPRECATED("use ext_intel_host_device_space instead") = ext_intel_host_device_space,
51+
global_device_space __SYCL2020_DEPRECATED(
52+
"use 'ext_intel_global_device_space' instead") =
53+
ext_intel_global_device_space,
54+
global_host_space __SYCL2020_DEPRECATED(
55+
"use 'ext_intel_host_device_space' instead") =
56+
ext_intel_host_device_space,
5357
};
5458

5559
} // namespace access

‎sycl/include/CL/sycl/backend_types.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ enum class backend : char {
2222
host = 0,
2323
opencl = 1,
2424
ext_oneapi_level_zero = 2,
25-
level_zero __SYCL2020_DEPRECATED("use ext_oneapi_level_zero instead") = ext_oneapi_level_zero,
25+
level_zero __SYCL2020_DEPRECATED("use 'ext_oneapi_level_zero' instead") =
26+
ext_oneapi_level_zero,
2627
cuda = 3,
2728
all = 4,
2829
esimd_cpu = 5,

‎sycl/include/CL/sycl/bit_cast.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,11 @@ constexpr
5353

5454
namespace detail {
5555
template <typename To, typename From>
56-
__SYCL2020_DEPRECATED("use sycl::bit_cast instead")
56+
__SYCL2020_DEPRECATED("use 'sycl::bit_cast' instead")
5757
#if __cpp_lib_bit_cast || __has_builtin(__builtin_bit_cast)
5858
constexpr
5959
#endif
60-
To
61-
bit_cast(const From &from) noexcept {
60+
To bit_cast(const From &from) noexcept {
6261
return sycl::bit_cast<To>(from);
6362
}
6463
} // namespace detail

‎sycl/include/CL/sycl/feature_test.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,5 @@ namespace sycl {
2929
#define SYCL_EXT_INTEL_USM_ADDRESS_SPACES 1
3030
#define SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO 1
3131

32-
3332
} // namespace sycl
3433
} // __SYCL_INLINE_NAMESPACE(cl)

‎sycl/include/CL/sycl/handler.hpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2289,10 +2289,8 @@ class __SYCL_EXPORT handler {
22892289
/// Prevents any commands submitted afterward to this queue from executing
22902290
/// until all commands previously submitted to this queue have entered the
22912291
/// complete state.
2292-
__SYCL2020_DEPRECATED("use ext_intel_barrier instead")
2293-
void barrier() {
2294-
ext_intel_barrier();
2295-
}
2292+
__SYCL2020_DEPRECATED("use 'ext_intel_barrier' instead")
2293+
void barrier() { ext_intel_barrier(); }
22962294

22972295
/// Prevents any commands submitted afterward to this queue from executing
22982296
/// until all events in WaitList have entered the complete state. If WaitList
@@ -2308,7 +2306,7 @@ class __SYCL_EXPORT handler {
23082306
///
23092307
/// \param WaitList is a vector of valid SYCL events that need to complete
23102308
/// before barrier command can be executed.
2311-
__SYCL2020_DEPRECATED("use ext_intel_barrier instead")
2309+
__SYCL2020_DEPRECATED("use 'ext_intel_barrier' instead")
23122310
void barrier(const std::vector<event> &WaitList);
23132311

23142312
/// Copies data from one memory region to another, both pointed by

‎sycl/include/CL/sycl/properties/buffer_properties.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class context_bound
4141
};
4242

4343
class ext_intel_mem_channel : public detail::PropertyWithData<
44-
detail::PropWithDataKind::BufferMemChannel> {
44+
detail::PropWithDataKind::BufferMemChannel> {
4545
public:
4646
ext_intel_mem_channel(uint32_t Channel) : MChannel(Channel) {}
4747
uint32_t get_channel() const { return MChannel; }
@@ -50,7 +50,7 @@ class ext_intel_mem_channel : public detail::PropertyWithData<
5050
uint32_t MChannel;
5151
};
5252

53-
class __SYCL2020_DEPRECATED("use ext_intel_mem_channel instead") mem_channel
53+
class __SYCL2020_DEPRECATED("use 'ext_intel_mem_channel' instead") mem_channel
5454
: public ext_intel_mem_channel {
5555
public:
5656
mem_channel(uint32_t Channel) : ext_intel_mem_channel(Channel) {}

‎sycl/include/CL/sycl/queue.hpp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,8 @@ class __SYCL_EXPORT queue {
252252
/// \return a SYCL event object, which corresponds to the queue the command
253253
/// group is being enqueued on.
254254
event ext_intel_submit_barrier(_CODELOCONLYPARAM(&CodeLoc)) {
255-
return submit([=](handler &CGH) { CGH.ext_intel_barrier(); } _CODELOCFW(CodeLoc));
255+
return submit(
256+
[=](handler &CGH) { CGH.ext_intel_barrier(); } _CODELOCFW(CodeLoc));
256257
}
257258

258259
/// Prevents any commands submitted afterward to this queue from executing
@@ -262,9 +263,10 @@ class __SYCL_EXPORT queue {
262263
/// \param CodeLoc is the code location of the submit call (default argument)
263264
/// \return a SYCL event object, which corresponds to the queue the command
264265
/// group is being enqueued on.
265-
__SYCL2020_DEPRECATED("use ext_intel_submit_barrier() instead")
266-
event submit_barrier() {
267-
return ext_intel_submit_barrier();
266+
__SYCL2020_DEPRECATED("use 'ext_intel_submit_barrier' instead")
267+
event submit_barrier(_CODELOCONLYPARAM(&CodeLoc)) {
268+
_CODELOCARG(&CodeLoc);
269+
return ext_intel_submit_barrier(CodeLoc);
268270
}
269271

270272
/// Prevents any commands submitted afterward to this queue from executing
@@ -278,8 +280,9 @@ class __SYCL_EXPORT queue {
278280
/// group is being enqueued on.
279281
event ext_intel_submit_barrier(
280282
const std::vector<event> &WaitList _CODELOCPARAM(&CodeLoc)) {
281-
return submit(
282-
[=](handler &CGH) { CGH.ext_intel_barrier(WaitList); } _CODELOCFW(CodeLoc));
283+
return submit([=](handler &CGH) {
284+
CGH.ext_intel_barrier(WaitList);
285+
} _CODELOCFW(CodeLoc));
283286
}
284287

285288
/// Prevents any commands submitted afterward to this queue from executing
@@ -291,10 +294,11 @@ class __SYCL_EXPORT queue {
291294
/// \param CodeLoc is the code location of the submit call (default argument)
292295
/// \return a SYCL event object, which corresponds to the queue the command
293296
/// group is being enqueued on.
294-
__SYCL2020_DEPRECATED("use ext_intel_submit_barrier() instead")
297+
__SYCL2020_DEPRECATED("use 'ext_intel_submit_barrier' instead")
295298
event
296-
submit_barrier(const std::vector<event> &WaitList) {
297-
return ext_intel_submit_barrier(WaitList);
299+
submit_barrier(const std::vector<event> &WaitList _CODELOCPARAM(&CodeLoc)) {
300+
_CODELOCARG(&CodeLoc);
301+
return ext_intel_submit_barrier(WaitList, CodeLoc);
298302
}
299303

300304
/// Performs a blocking wait for the completion of all enqueued tasks in the

‎sycl/include/sycl/ext/intel/experimental/online_compiler.hpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,12 +221,14 @@ online_compiler<source_language::cm>::compile(const std::string &src) {
221221
} // namespace ext
222222

223223
namespace ext {
224-
namespace __SYCL2020_DEPRECATED("use 'ext::intel::experimental' instead") intel {
224+
namespace __SYCL2020_DEPRECATED(
225+
"use 'ext::intel::experimental' instead") intel {
225226
using namespace ext::intel::experimental;
226227
} // namespace intel
227228
} // namespace ext
228229

229-
namespace __SYCL2020_DEPRECATED("use 'ext::intel::experimental' instead") INTEL {
230+
namespace __SYCL2020_DEPRECATED(
231+
"use 'ext::intel::experimental' instead") INTEL {
230232
using namespace ext::intel::experimental;
231233
} // namespace INTEL
232234
} // namespace sycl

‎sycl/include/sycl/ext/intel/online_compiler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ __SYCL_WARNING(
1414
"sycl/ext/intel/online_compiler.hpp usage is deprecated, include "
1515
"sycl/ext/intel/experimental/online_compiler.hpp instead")
1616

17-
#include <sycl/ext/intel/experimental/online_compiler.hpp>
17+
#include <sycl/ext/intel/experimental/online_compiler.hpp>

‎sycl/include/sycl/ext/oneapi/backend/level_zero.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,9 @@ T make(const context &Context,
169169
} // namespace oneapi
170170
} // namespace ext
171171

172-
namespace __SYCL2020_DEPRECATED("use 'ext::oneapi::level_zero' instead") level_zero {
173-
using ext::oneapi::level_zero;
172+
namespace __SYCL2020_DEPRECATED("use 'ext::oneapi::level_zero' instead")
173+
level_zero {
174+
using namespace ext::oneapi::level_zero;
174175
}
175176
} // namespace sycl
176177
} // __SYCL_INLINE_NAMESPACE(cl)

0 commit comments

Comments
 (0)