[SYCL] Make swizzle mutating operators const friends #13012
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In intel#12682 the mutating operators for swizzles (+=, -=, ..., ++, --) were reverted to be members rather than friends. Since swizzles mutate the underlying vec rather than themselves these operators should take and return constant references instead, which this commit implements. Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
steffenlarsen
added a commit
to steffenlarsen/llvm
that referenced
this pull request
Mar 14, 2024
Swizzles should not expose mutating functions when the underlying vector is const. This commit SFINAEs these out. This is built on top of intel#13012. Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
| *(ResultIt++) = (VecVal.swizzle<1>() OP## = 2)[0] == ExpectedRes && \ | ||
| VecVal[1] == ExpectedRes; \ | ||
| } | ||
| TestCase(+); |
There was a problem hiding this comment.
I wonder if we can do TestCase([](auto x, auto y) { return x + y; }) to avoid the macro.
There was a problem hiding this comment.
I'm not sure that would help here. Note that in this case the line will resolve to:
{
sycl::vec<int, 4> VecVal{1, 2, 3, 4};
int ExpectedRes = VecVal[1] + 2;
ResultsAcc[I++] = (VecVal.swizzle<1>() += 2)[0] == ExpectedRes &&
VecVal[1] == ExpectedRes;
}The important check here is really the += as it is the mutating function, but I can see if the TestCase macro is a little hard to read, due to the space the formatter adds in OP##=.
I could change it to be TestCase(+, +=) instead, but I'm not sure if there's a way to make it take a lambda function without it being way more verbose.
Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
steffenlarsen
had a problem deploying
to
WindowsCILock
GitHub Actions
Error
Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
steffenlarsen
temporarily deployed
to
WindowsCILock
GitHub Actions
Inactive
|
KhronosGroup/SYCL-Docs#514 has been merged. This is ready for review! |
|
Sorry, grabbed the wrong tag. @intel/llvm-reviewers-runtime - Friendly ping. |
aelovikov-intel
approved these changes
Jul 16, 2024
|
I believe the change is rather isolated and can be merged without re-test. |
smanna12
pushed a commit
to smanna12/llvm
that referenced
this pull request
Jul 16, 2024
In intel#12682 the mutating operators for swizzles (+=, -=, ..., ++, --) were reverted to be members rather than friends. Since swizzles mutate the underlying vec rather than themselves these operators should take and return constant references instead, which this commit implements. --------- Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In #12682 the mutating operators for swizzles (+=, -=, ..., ++, --) were reverted to be members rather than friends. Since swizzles mutate the underlying vec rather than themselves these operators should take and return constant references instead, which this commit implements.