Avoid combining conditional select for reduction instrinsics#107207
Merged
amanasifkhalid merged 4 commits intodotnet:mainfrom Sep 3, 2024
Merged
Avoid combining conditional select for reduction instrinsics#107207amanasifkhalid merged 4 commits intodotnet:mainfrom
amanasifkhalid merged 4 commits intodotnet:mainfrom
Conversation
Contributor
Author
|
Added a few conditional select tests for reduction intrinsics. Passes all stress tests. |
src/tests/JIT/Regression/JitBlue/Runtime_106868/Runtime_106868.cs
Outdated
Show resolved
Hide resolved
3 tasks
a74nh
reviewed
Sep 2, 2024
src/tests/JIT/Regression/JitBlue/Runtime_106868/Runtime_106868.cs
Outdated
Show resolved
Hide resolved
a74nh
approved these changes
Sep 2, 2024
Contributor
a74nh
left a comment
There was a problem hiding this comment.
LGTM. Happy we've got the extra template testing added too.
amanasifkhalid
approved these changes
Sep 3, 2024
Contributor
amanasifkhalid
left a comment
There was a problem hiding this comment.
LGTM too. Thanks!
| // when the nestedOp is a reduce operation. | ||
|
|
||
| if (nestedOp1->IsMaskAllBitsSet() && | ||
| if (nestedOp1->IsMaskAllBitsSet() && !HWIntrinsicInfo::IsReduceOperation(nestedOp2Id) && |
Member
There was a problem hiding this comment.
The reduction operations are notably a case where the pattern we want is somewhat inversed.
Rather than CndSel(mask, Op(value), merge) we want to instead want to check for Op(CndSel(mask, value, zero)) or similar.
We should have a tracking issue to ensure that happens for .NET 10
Contributor
|
@amanasifkhalid - any reason why this was not backported to release/9.0? |
Contributor
|
@kunalspathak sorry I missed this one -- I'll kick off the backport now |
Contributor
|
/backport to release/9.0 |
Contributor
|
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/10820916154 |
Contributor
|
@amanasifkhalid backporting to release/9.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Avoid combining conditional select for reduction instrinsics
Using index info to reconstruct a base tree...
M src/coreclr/jit/hwintrinsic.h
M src/coreclr/jit/hwintrinsiclistarm64sve.h
M src/coreclr/jit/lowerarmarch.cpp
M src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
Falling back to patching base and 3-way merge...
Auto-merging src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
Auto-merging src/coreclr/jit/lowerarmarch.cpp
CONFLICT (content): Merge conflict in src/coreclr/jit/lowerarmarch.cpp
Auto-merging src/coreclr/jit/hwintrinsiclistarm64sve.h
Auto-merging src/coreclr/jit/hwintrinsic.h
CONFLICT (content): Merge conflict in src/coreclr/jit/hwintrinsic.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Avoid combining conditional select for reduction instrinsics
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@amanasifkhalid an error occurred while backporting to release/9.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
amanasifkhalid
pushed a commit
to amanasifkhalid/runtime
that referenced
this pull request
Sep 11, 2024
amanasifkhalid
pushed a commit
to amanasifkhalid/runtime
that referenced
this pull request
Sep 11, 2024
amanasifkhalid
pushed a commit
to amanasifkhalid/runtime
that referenced
this pull request
Sep 11, 2024
jeffschwMSFT
added a commit
that referenced
this pull request
Sep 12, 2024
jtschuster
pushed a commit
to jtschuster/runtime
that referenced
this pull request
Sep 17, 2024
sirntar
pushed a commit
to sirntar/runtime
that referenced
this pull request
Sep 30, 2024
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
Fixes #106868
Fixes #106871
Fixes #106872
@a74nh @kunalspathak @dotnet/arm64-contrib @arch-arm64-sve @TIHan @amanasifkhalid