Skip to content
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

Jump to bottom

Fix Apple Silicon shuffle thunks #53250

Merged
merged 8 commits into from
Jun 8, 2021
Merged

Fix Apple Silicon shuffle thunks #53250

merged 8 commits into from
Jun 8, 2021

Conversation

sdmaclea
Copy link
Contributor

Fixes #47294

@sdmaclea sdmaclea added this to the 6.0.0 milestone May 25, 2021
@sdmaclea sdmaclea self-assigned this May 25, 2021
@sdmaclea sdmaclea added this to In progress in Enable .NET Core on Apple Silicon via automation May 25, 2021
@sdmaclea sdmaclea marked this pull request as draft May 25, 2021 20:21
@sdmaclea sdmaclea requested a review from janvorli May 25, 2021 20:21
@sdmaclea sdmaclea force-pushed the fix47294 branch 3 times, most recently from 9262672 to aaf8e47 Compare May 25, 2021 20:30
@sdmaclea sdmaclea requested a review from sandreenko May 25, 2021 20:35
@sdmaclea sdmaclea force-pushed the fix47294 branch 2 times, most recently from a6cfc92 to 8bd7fa0 Compare May 25, 2021 21:40
@sdmaclea sdmaclea marked this pull request as ready for review May 25, 2021 22:49
@sdmaclea
Copy link
Contributor Author

I ran the three failing tests locally and they all passed.

@AaronRobinsonMSFT
Copy link
Member

/cc @jkoritzinsky @elinor-fung

This was referenced May 27, 2021
Open
Closed
Closed
Closed
@sdmaclea
Fix Apple Silicon shuffle thunks
e745a95 
Fixes 47294
@sdmaclea
Feedback
84a5f56
@sdmaclea
Fix case
393ad98
@sdmaclea
Fix comparison warning
42ce788
@sdmaclea
Fix Vector3Interop test
4b96ae1 
Vector3 is a 12 byte structure with 4 byte alignment. We cannot assume the structure is 8 byte aligned on the stack so
we must move in 4 byte pieces.

Generalize this assumption.
@sdmaclea
Set and use m_hfaFieldSize for stack arguments
96d2fd9 
m_hfaFieldSize is needed to calculate correct shuffle size.
@sdmaclea
Fix typo
33d965a
@sdmaclea
Copy link
Contributor Author

sdmaclea commented Jun 8, 2021

PTAL.

janvorli
janvorli approved these changes Jun 8, 2021
View reviewed changes
Copy link
Member

@janvorli janvorli left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

sandreenko
sandreenko approved these changes Jun 8, 2021
View reviewed changes
Copy link
Contributor

@sandreenko sandreenko left a comment

Choose a reason for hiding this comment

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

LGTM

src/coreclr/vm/comdelegate.cpp Outdated Show resolved Hide resolved
@sdmaclea sdmaclea merged commit d737521 into dotnet:main Jun 8, 2021
Enable .NET Core on Apple Silicon automation moved this from In progress to Done Jun 8, 2021
@sdmaclea sdmaclea deleted the fix47294 branch June 8, 2021 18:49
@sdmaclea sdmaclea mentioned this pull request Jun 8, 2021
Merged
@ghost ghost locked as resolved and limited conversation to collaborators Jul 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@AaronRobinsonMSFT AaronRobinsonMSFT AaronRobinsonMSFT left review comments

@janvorli janvorli janvorli approved these changes

@sandreenko sandreenko sandreenko approved these changes

Assignees

@sdmaclea sdmaclea

Labels
arch-arm64 area-VM-coreclr os-macos-bigsur (macOS11)
Projects
Enable .NET Core on Apple Silicon
  
Done
Milestone
6.0.0
Development

Successfully merging this pull request may close these issues.

Failure in Regressions/coreclr/GitHub_35000/test35000/test35000.sh
4 participants
@sdmaclea @AaronRobinsonMSFT @janvorli @sandreenko