Skip to content

Move MonoClass:inlinearray_value out of MonoClass - #109363

Merged
kg merged 11 commits into
dotnet:mainfrom
syfFerdinand:fix/move-inlinearray-value
Nov 25, 2024
Merged

Move MonoClass:inlinearray_value out of MonoClass#109363
kg merged 11 commits into
dotnet:mainfrom
syfFerdinand:fix/move-inlinearray-value

Conversation

@syfFerdinand

@syfFerdinandsyfFerdinand commented Oct 29, 2024•
edited
Loading

Copy link
Copy Markdown
Contributor

Summary

This PR addresses issue #103913 by moving the inlinearray_value property from MonoClass to the infrequent_data structure. This change aims to optimize memory usage by storing rarely used properties in a less frequently accessed structure.

Details

  • Moved inlinearray_value from MonoClass to MonoPropertyBag within the infrequent_data structure.
  • Set explicit value for PROP_INLINEARRAY_VALUE in InfrequentDataKind enum, as per review comments.
  • Updated relevant getters and setters to reflect the new structure.
  • Marked mono_class_get_inlinearray_value with MONO_COMPONENT_API as per review suggestion to ensure proper export when compiled as shared libraries.
  • Modified all occurrences of inlinearray_value access to use the new structure.
  • Performed testing to ensure no functionality is broken due to this change.

Related Issue

Fixes#103913

@ghostghost added the area-VM-meta-mono label Oct 29, 2024
@dotnet-policy-servicedotnet-policy-serviceBot added the community-contribution Indicates that the PR has been added by a community member label Oct 29, 2024
This was referenced Oct 30, 2024
Open
Open
Closed
Open
@syfFerdinand

syfFerdinand commented Oct 30, 2024

Copy link
Copy Markdown
ContributorAuthor

@dotnet-policy-service agree

@lambdageek

lambdageek commented Oct 31, 2024

Copy link
Copy Markdown
Member

Thanks for the contribution @syfFerdinand !

@lambdageek

lambdageek commented Oct 31, 2024

Copy link
Copy Markdown
Member

/cc @steveisok

lambdageek
lambdageek requested changes Oct 31, 2024
View reviewed changes
Comment threadsrc/mono/mono/metadata/property-bag.h Outdated
This was referenced Nov 2, 2024
Open
Closed
Open
@syfFerdinandsyfFerdinand changed the title Moved inlinearray_value to infrequent_data structure in MonoClass Move MonoClass:inlinearray_value out of MonoClassNov 8, 2024
@build-analysisbuild-analysisBot mentioned this pull request Nov 8, 2024
Closed
3 tasks
@steveisok

steveisok commented Nov 8, 2024

Copy link
Copy Markdown
Member

@kg can you please give this a review?

lambdageek
lambdageek reviewed Nov 8, 2024
View reviewed changes
Comment threadsrc/mono/mono/metadata/class-internals.h Outdated
This was referenced Nov 13, 2024
Closed
Closed
@syfFerdinand

syfFerdinand commented Nov 13, 2024

Copy link
Copy Markdown
ContributorAuthor

Hi @kg and @steveisok,
Just to confirm, my current code in the src/mono/mono/offsets directory should be updated to match the downloaded offset files, right?

@kg

kg commented Nov 13, 2024

Copy link
Copy Markdown
Contributor

I've never dealt with this problem before, but it appears that if you download each of the offsets artifacts I linked to, it will be a ZIP file with updated versions of the .h files in it. You would then check in these new .h files to update the offsets. I don't think you want to manually edit the offsets.

@steveisok

steveisok commented Nov 13, 2024

Copy link
Copy Markdown
Member

I've never dealt with this problem before, but it appears that if you download each of the offsets artifacts I linked to, it will be a ZIP file with updated versions of the .h files in it. You would then check in these new .h files to update the offsets. I don't think you want to manually edit the offsets.

Unless I'm completely mistaken, we don't auto-generate the offsets any longer and they need to be updated in tree.

@akoeplinger is that correct?

@akoeplinger

akoeplinger commented Nov 13, 2024•
edited
Loading

Copy link
Copy Markdown
Member

We generate them in PR builds so you can just download and check in the updated offsets, like @kg mentioned.

This is the message on the build, let me know if I can make it clearer:

Detected changes in Mono offsets files. When running in a PR build you can download the MonoAOTOffsets artifacts and update the files in the src/mono/mono/offsets folder.

edit I just noticed that the name of the artifacts in the message is not right, it's Mono_Offsets_<platform> right now

akoeplinger added a commit that referenced this pull request Nov 13, 2024
@akoeplinger
Fix name of MonoAOTOffsets artifact in runtime.yml
d9d1e8d
To match the message in the build log, see #109363 (comment)
@akoeplingerakoeplinger mentioned this pull request Nov 13, 2024
Merged
@syfFerdinand

syfFerdinand commented Nov 13, 2024

Copy link
Copy Markdown
ContributorAuthor

Thank you all for your assistance and guidance throughout this process. I have updated the offset files with the latest versions from the build artifacts and committed the changes.

Is there anything else that needs to be corrected or adjusted?

@kg

kg commented Nov 13, 2024

Copy link
Copy Markdown
Contributor

Once the necessary tests pass I think we should be good. I'll keep an eye on it.

akoeplinger added a commit that referenced this pull request Nov 13, 2024
@akoeplinger
Fix name of MonoAOTOffsets artifact in runtime.yml (#109797)
8d21e13
To match the message in the build log, see #109363 (comment)
This was referenced Nov 13, 2024
Open
Open
This was referenced Nov 22, 2024
Closed
Open
kg
kg approved these changes Nov 24, 2024
View reviewed changes
This was referenced Nov 24, 2024
Open
Closed
@syfFerdinand

syfFerdinand commented Nov 25, 2024

Copy link
Copy Markdown
ContributorAuthor

hi @kg,
I think the tests that are currently failing had been deactivated in this merge... #108178 so I don't understand why there's still this build error...

@kg

kg commented Nov 25, 2024

Copy link
Copy Markdown
Contributor

Out of memory issues on the wasm lanes are common, so I don't think the librarytests lane failure indicates a bug you created.

@kg
kg merged commit 834de07 into dotnet:mainNov 25, 2024
@kg

kg commented Nov 25, 2024

Copy link
Copy Markdown
Contributor

Thank you for your contribution!

mikelle-rogers pushed a commit to mikelle-rogers/runtime that referenced this pull request Dec 10, 2024
@akoeplinger@mikelle-rogers
Fix name of MonoAOTOffsets artifact in runtime.yml (dotnet#109797)
794a53a
To match the message in the build log, see dotnet#109363 (comment)
mikelle-rogers pushed a commit to mikelle-rogers/runtime that referenced this pull request Dec 10, 2024
@syfFerdinand@mikelle-rogers
Move MonoClass:inlinearray_value out of MonoClass (dotnet#109363)
91f2f65
* Moved inlinearray_value to infrequent_data structure in MonoClass
* Move MonoClass:inlinearray_value out of MonoClass, setting explicit value for PROP_INLINEARRAY_VALUE
* Mark mono_class_get_inlinearray_value with MONO_COMPONENT_API for proper export
* Remove obsolete offset for inlinearray_value in MonoClass
* Update Mono offset files with latest versions from build artifacts
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Dec 26, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@steveisoksteveisoksteveisok approved these changes
@lambdageeklambdageeklambdageek approved these changes
@thaystgthaystgAwaiting requested review from thaystgthaystg is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar
@ivanpovazanivanpovazanAwaiting requested review from ivanpovazan
@vitek-karasvitek-karasAwaiting requested review from vitek-karasvitek-karas is a code owner
+1 more reviewer
@kgkgkg approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

area-VM-meta-monocommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[metadata] Move MonoClass:inlinearray_value out of MonoClass

5 participants

@syfFerdinand@lambdageek@steveisok@kg@akoeplinger