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 static-lib AOT Mono builds #103988

Merged
merged 2 commits into from
Jul 1, 2024
Merged

Fix static-lib AOT Mono builds #103988

merged 2 commits into from
Jul 1, 2024

Conversation

jkoritzinsky
Copy link
Member

Fixes #103982

@jkoritzinsky
Copy link
Member Author

@kotlarmilos what pipeline should I run to ensure I'm getting good coverage here?

@kotlarmilos
Copy link
Member

/azp run runtime-ioslike

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@kotlarmilos
Copy link
Member

@kotlarmilos what pipeline should I run to ensure I'm getting good coverage here?

*_RuntimeTests should provide good coverage for this fix. Please ignore the library tests on Apple mobile as this is an ongoing issue.

@jkoritzinsky
Copy link
Member Author

Looks like it's working. I'll mark this ready for review.

@jkoritzinsky jkoritzinsky marked this pull request as ready for review June 26, 2024 02:05
This was referenced Jun 26, 2024
Open
Open
Open
@kotlarmilos
Copy link
Member

/azp run runtime-ioslikesimulator

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@kotlarmilos
Copy link
Member

@jkoritzinsky Please take a look at simulator failures as they seem related: https://dev.azure.com/dnceng-public/public/_build/results?buildId=721222&view=logs&j=07effcfd-c63d-5008-e811-03b29530f5cb&t=1b65cd35-7643-520a-edf8-09ec895c1ca1

@kotlarmilos kotlarmilos mentioned this pull request Jun 26, 2024
Open
@kotlarmilos kotlarmilos requested a review from steveisok June 26, 2024 15:38
steveisok
steveisok reviewed Jun 26, 2024
View reviewed changes
src/mono/mono/component/CMakeLists.txt
@@ -231,7 +231,9 @@ if (ENABLE_PERFTRACING AND "${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}" IN_LIST
list(APPEND mono-components-objects $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
endif()
if (TARGET mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-static)
target_sources(mono-component-${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-static PRIVATE $<TARGET_OBJECTS:eventpipe-mono-objects> $<TARGET_OBJECTS:dn-containers>)
# We don't add dn-containers here as any scenario that uses this target will also use the monosgen-static target,
Copy link
Member

Choose a reason for hiding this comment

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

@akoeplinger do you recall if that's true even for simulator?

Copy link
Member

Choose a reason for hiding this comment

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

I think so, yes

@kotlarmilos
Copy link
Member

This fix resolves the device failure caused by symbol duplication. However, simulators are still encountering a different issue. Looking at logs between device and simulator, I noticed the following difference:

runtime/src/mono/mono.proj

Lines 72 to 75 in 9906682

<MonoComponentsStatic Condition="'$(TargetsiOS)' == 'true' and '$(TargetsiOSSimulator)' != 'true' and '$(MonoComponentsStatic)' == ''">true</MonoComponentsStatic>
<MonoComponentsStatic Condition="'$(TargetstvOS)' == 'true' and '$(TargetstvOSSimulator)' != 'true' and '$(MonoComponentsStatic)' == ''">true</MonoComponentsStatic>
<MonoComponentsStatic Condition="'$(TargetsiOS)' == 'true' and '$(TargetsiOSSimulator)' == 'true' and '$(MonoComponentsStatic)' == ''">false</MonoComponentsStatic>
<MonoComponentsStatic Condition="'$(TargetstvOS)' == 'true' and '$(TargetstvOSSimulator)' == 'true' and '$(MonoComponentsStatic)' == ''">false</MonoComponentsStatic>

runtime/src/mono/mono.proj

Line 682 in 9906682

<_MonoCMakeArgs Include="-DDISABLE_LINK_STATIC_COMPONENTS=1" Condition="!('$(TargetsiOSSimulator)' == 'true' or '$(TargetstvOSSimulator)' == 'true')"/>

@akoeplinger Could we align these params for the device and simulator?

@jkoritzinsky
Copy link
Member Author

The simulator failures are only when building the Mono.debug.framework and Mono.release.framework frameworks.

I'm doing my best to investigate, but I don't have a Mac available today.

@jkoritzinsky
Copy link
Member Author

/azp run runtime-ioslike, runtime-ioslikesimulator

@azure-pipelines Azure Pipelines
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

This was referenced Jul 1, 2024
Open
Open
@jkoritzinsky
Copy link
Member Author

/ba-g Failure is an AzDO infra issue

@jkoritzinsky jkoritzinsky merged commit f4b981c into dotnet:main Jul 1, 2024
85 of 95 checks passed
@jkoritzinsky jkoritzinsky deleted the static-components-aot branch July 1, 2024 21:56
@matouskozak matouskozak mentioned this pull request Jul 4, 2024
Closed
@github-actions github-actions bot locked and limited conversation to collaborators Aug 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@akoeplinger akoeplinger akoeplinger left review comments

@steveisok steveisok steveisok left review comments

@kotlarmilos kotlarmilos kotlarmilos approved these changes

@marek-safar marek-safar Awaiting requested review from marek-safar

@lambdageek lambdageek Awaiting requested review from lambdageek

Assignees

@jkoritzinsky jkoritzinsky

Labels
area-Build-mono
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Runtime tests fail to AOT compile on Apple mobile platforms
4 participants
@jkoritzinsky @kotlarmilos @steveisok @akoeplinger