-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Ppc64le bug fixes #74746
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.
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
Ppc64le bug fixes #74746
Conversation
…/runtime into ppc64le_bug_fixes
|
@vargaz @akoeplinger |
|
/azp run runtime-community |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@alhad-deshpande as far as I know it's too late for RC1 but I can backport it to RC2 (@vargaz is on vacation). |
|
@akoeplinger |
|
@alhad-deshpande there are some test failures for PPC64 in https://dev.azure.com/dnceng/public/_build/results?buildId=1973269&view=logs&j=13a47023-c67b-5350-920c-f75d7d69650d&t=54de2c5f-c9e1-522b-3533-a199af7b864d, could you please take a look and check they're not related? |
|
@akoeplinger |
|
@Sapana-Khemkar yeah I retried the job and now it just fails in System.Runtime.Serialization.Formatters.Tests which I assume is a different issue. Are you planning on looking at that soon too, i.e. should we wait with the backport until that one is fixed too? |
|
@akoeplinger The timeout seen in System.Runtime.Serialization.Formatters.Tests is different and we don't see it on our machines. So not sure if that is a resource issue on the machines you'll have. Nutshell -- please merge these changes as it fixes the main issues we were working on |
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/2950215241 |
|
@akoeplinger backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Avoid transformation from multiplication to left shift in case of 64 bit value
Using index info to reconstruct a base tree...
M src/coreclr/pal/src/misc/perfjitdump.cpp
M src/mono/mono/mini/local-propagation.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/local-propagation.c
No changes -- Patch already applied.
Applying: Fixed System.Collections.Concurrent.Tests timeout issue
Using index info to reconstruct a base tree...
M src/mono/mono/mini/cpu-ppc.mdesc
M src/mono/mono/mini/cpu-ppc64.mdesc
M src/mono/mono/mini/mini-ppc.c
Falling back to patching base and 3-way merge...
Auto-merging src/mono/mono/mini/mini-ppc.c
CONFLICT (content): Merge conflict in src/mono/mono/mini/mini-ppc.c
Auto-merging src/mono/mono/mini/cpu-ppc64.mdesc
CONFLICT (content): Merge conflict in src/mono/mono/mini/cpu-ppc64.mdesc
Auto-merging src/mono/mono/mini/cpu-ppc.mdesc
CONFLICT (content): Merge conflict in src/mono/mono/mini/cpu-ppc.mdesc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Fixed System.Collections.Concurrent.Tests timeout issue
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
Ok , will port it manually |
This PR fixes below 2 github issues:
Fixes #74069
Fixes #74057