Fix SVE ExtendWidening ConditionalSelect tests #107601
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
dotnet-policy-service
bot
added
the
community-contribution
|
Ran all the stress tests matching 'Sve_' pattern to ensure no other failures are missed. The tests are passing |
src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
Show resolved
Hide resolved
3 tasks
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/10820582151 |
|
@kunalspathak 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: Fix SVE ExtendWidening ConditionalSelect tests
Using index info to reconstruct a base tree...
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
CONFLICT (content): Merge conflict in src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
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 Fix SVE ExtendWidening ConditionalSelect tests
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@kunalspathak 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 - Once we are done backporting #107207, can you backport this PR too? |
|
@kunalspathak sure thing; should be easy to check in, since it's just a test change. |
yes, when I was trying to backport this one, I got merge conflicts as seen above and that's when I realized that we forgot to backport #107207. |
amanasifkhalid
pushed a commit
to amanasifkhalid/runtime
that referenced
this pull request
Sep 11, 2024
carlossanlop
pushed 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
* Fix SVE ExtendWidening ConditionalSelect tests Fixes: dotnet#107537 * Incorporate review comments
sirntar
pushed a commit
to sirntar/runtime
that referenced
this pull request
Sep 30, 2024
* Fix SVE ExtendWidening ConditionalSelect tests Fixes: dotnet#107537 * Incorporate review comments
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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: #107537
@a74nh @kunalspathak @dotnet/arm64-contrib @arch-arm64-sve