Skip to content

[NFC][SYCL] Add pragma unroll in accessor.hpp #4347

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
bader merged 11 commits into from
Aug 24, 2021
Merged

[NFC][SYCL] Add pragma unroll in accessor.hpp #4347

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d560cf7
[NFC][SYCL] Add pragma unroll in accessor.hpp
Aug 16, 2021
3cdd2a4
unroll multiverse
Aug 18, 2021
309995e
Clang-format + grammar
Aug 18, 2021
9074026
Add GCC version check
Aug 19, 2021
418dbe8
Move to defines_elementary.hpp
Aug 19, 2021
699c560
Fix clang-format
Aug 19, 2021
04aabf7
This should work (or at least it worked on compiler explorer)
Aug 19, 2021
63623fe
Move STRINGIFY
Aug 19, 2021
8419b48
Apply suggestions
Aug 19, 2021
e9d4e64
__STRINGIFY -> __SYCL_STRINGIFY and propagate it
Aug 24, 2021
2d80f2d
clang-format
Aug 24, 2021
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
2 changes: 2 additions & 0 deletions sycl/include/CL/sycl/accessor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,8 @@ class accessor :
#endif // __SYCL_DEVICE_ONLY__

size_t Result = 0;
// Unroll the following loop for both host and device code
__SYCL_UNROLL(3)
for (int I = 0; I < Dims; ++I)
Result = Result * getMemoryRange()[I] + getOffset()[I] + Id[I];
return Result;
Expand Down
23 changes: 21 additions & 2 deletions sycl/include/CL/sycl/detail/defines_elementary.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,13 @@
#endif
#endif // __SYCL_FALLTHROUGH

// Stringify an argument to pass it in _Pragma directive below.
#ifndef __STRINGIFY
#define __STRINGIFY(x) #x

Comment thread
MrSidims marked this conversation as resolved.
// define __SYCL_WARNING convenience macro to report compiler warnings
#if defined(__GNUC__)
#define __SYCL_GCC_PRAGMA(x) _Pragma(#x)
#define __SYCL_WARNING(msg) __SYCL_GCC_PRAGMA(GCC warning msg)
#define __SYCL_WARNING(msg) _Pragma(__STRINGIFY(GCC warning msg))
#elif defined(_MSC_VER) && !defined(__clang__)
#define __SYCL_QUOTE1(x) #x
#define __SYCL_QUOTE(x) __SYCL_QUOTE1(x)
Expand All @@ -100,3 +103,19 @@
// clang emits "warning:" in the message pragma output
#define __SYCL_WARNING(msg) __pragma(message(msg))
#endif // __GNUC__

// Define __SYCL_UNROLL to add pragma/attribute unroll to a loop.
#ifndef __SYCL_UNROLL
#if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
#define __SYCL_UNROLL(x) _Pragma(__STRINGIFY(unroll x))
#elif defined(__clang__)
#define __SYCL_UNROLL(x) _Pragma(__STRINGIFY(unroll x))
#elif (defined(__GNUC__) && __GNUC__ >= 8) || \
(defined(__GNUG__) && __GNUG__ >= 8)
#define __SYCL_UNROLL(x) _Pragma(__STRINGIFY(GCC unroll x))
#else
#define __SYCL_UNROLL(x)
#endif // compiler switch
#endif // __SYCL_UNROLL

@keryell keryell Sep 9, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While looking at this I wonder why just using a metaprogrammed loop instead is not better than this pragmatic spaghetti plate.

@aelovikov-intel aelovikov-intel Aug 16, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It also works with one-iteration loops, unlike this pragma-based solution: #6560


#endif // __STRINGIFY