[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring - #89638

Merged
MichalStrehovsky merged 3 commits into
dotnet:mainfrom
ivanpovazan:fix-refactor-linq-expr-switches
Jul 31, 2023
Merged

[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring #89638
MichalStrehovsky merged 3 commits into
dotnet:mainfrom
ivanpovazan:fix-refactor-linq-expr-switches

Conversation

@ivanpovazan

@ivanpovazanivanpovazan commented Jul 28, 2023•
edited
Loading

Copy link
Copy Markdown
Member

#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.

This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.

Additionally, I cleaned up a few places that had left overs of the removed private feature switches.

Verified that the regression has been fixed by adding a reference to System.Linq.Expressions in the HelloiOS sample and AOTing with and without changes in the PR:

HelloiOS samplemainthis PR
Size on disk (Mb)53,312,14

Thanks @vitek-karas for figuring out the right approach.

@dotnet/ilc-contrib

Fixes#89527

@ghost

ghost commented Jul 28, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas
See info in area-owners.md if you want to be subscribed.

Issue Details

#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.

This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.

Additionally, I cleaned up a few places that had left overs of the removed private feature switches.

Thanks @vitek-karas for figuring out the right approach.

@dotnet/ilc-contrib

Fixes #89527

Author:ivanpovazan
Assignees:ivanpovazan
Labels:

area-NativeAOT-coreclr

Milestone:-

@jkotas
jkotas requested a review from vitek-karasJuly 28, 2023 15:24
@build-analysisbuild-analysisBot mentioned this pull request Jul 28, 2023
Closed
@ivanpovazan

ivanpovazan commented Jul 29, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-extra-platforms

@azure-pipelines

azure-pipelinesBot commented Jul 29, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@ivanpovazan

ivanpovazan commented Jul 29, 2023

Copy link
Copy Markdown
MemberAuthor

@eerhardt I have measured the impact of this change with https://github.com/aspnet/Benchmarks/tree/main/src/BenchmarksApps/TodosApi on osx-arm64 comparing the main branch and this PR, with dotnet sdk version: 8.0.100-preview.7.23364.32 and locally built framework and ILCompiler packages referenced from the project file via:

 <ItemGroup>
<FrameworkReferenceUpdate="Microsoft.NETCore.App"RuntimeFrameworkVersion="8.0.0-dev" />
<PackageReferenceInclude="Microsoft.DotNet.ILCompiler"Version="8.0.0-dev" />
</ItemGroup>

The measurements show the following results:

TodosApimainthis PR
Size on disk (Mb)49,9936,25

These numbers do not match what you posted in: #89527 (comment) but I only have a MacBookPro M1 at hand, so am not able to verify the impact of this change on win-x64. Nevertheless, presented measurements show the expected reduction in size.

I also double-checked the mstat files. confirming the fix:

main branch:
main-branch

this PR:
this-PR

This was referenced Jul 29, 2023
Closed
Open
Closed
Closed
Closed
Closed
Closed
MichalStrehovsky
MichalStrehovsky approved these changes Jul 31, 2023
View reviewed changes

@MichalStrehovskyMichalStrehovsky left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Neat!

@MichalStrehovsky
MichalStrehovsky merged commit 8c96dd2 into dotnet:mainJul 31, 2023
@ivanpovazan
ivanpovazan deleted the fix-refactor-linq-expr-switches branch July 31, 2023 07:37
@ghostghost locked as resolved and limited conversation to collaborators Aug 30, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@ivanpovazanivanpovazan

Labels

area-NativeAOT-coreclr

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[NativeAOT] System.Linq.Expressions size regression

3 participants

@ivanpovazan@MichalStrehovsky@SamMonoRT
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring  - #89638
Merged
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Jul 31, 2023
Merged
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring #89638
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Conversation
@ivanpovazan
@ivanpovazanivanpovazan
commented
Jul 28, 2023•

edited

Loading

Copy link


Copy Markdown

Member
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Verified that the regression has been fixed by adding a reference to System.Linq.Expressions in the HelloiOS sample and AOTing with and without changes in the PR:
HelloiOS samplemainthis PR
Size on disk (Mb)53,312,14
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes#89527
@ghost
ghost
commented
Jul 28, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas

See info in area-owners.md if you want to be subscribed.
Issue Details
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes #89527
Author:ivanpovazan
Assignees:ivanpovazan
Labels:
area-NativeAOT-coreclr
Milestone:-
@jkotas
jkotas
requested a review
from vitek-karasJuly 28, 2023 15:24
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 28, 2023

Closed

@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Jul 29, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
@eerhardt I have measured the impact of this change with https://github.com/aspnet/Benchmarks/tree/main/src/BenchmarksApps/TodosApi on osx-arm64 comparing the main branch and this PR, with dotnet sdk version: 8.0.100-preview.7.23364.32 and locally built framework and ILCompiler packages referenced from the project file via:
 <ItemGroup>
<FrameworkReferenceUpdate="Microsoft.NETCore.App"RuntimeFrameworkVersion="8.0.0-dev" />
<PackageReferenceInclude="Microsoft.DotNet.ILCompiler"Version="8.0.0-dev" />
</ItemGroup>
The measurements show the following results:
TodosApimainthis PR
Size on disk (Mb)49,9936,25
These numbers do not match what you posted in: #89527 (comment) but I only have a MacBookPro M1 at hand, so am not able to verify the impact of this change on win-x64. Nevertheless, presented measurements show the expected reduction in size.
I also double-checked the mstat files. confirming the fix:
main branch:
main-branch
this PR:
this-PR

This was referenced Jul 29, 2023

Closed


Open


Closed


Closed


Closed


Closed


Closed

MichalStrehovsky
MichalStrehovsky
approved these changes
Jul 31, 2023
View reviewed changes
@MichalStrehovskyMichalStrehovsky
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Neat!
@MichalStrehovsky
MichalStrehovsky
merged commit 8c96dd2
into
dotnet:mainJul 31, 2023
@ivanpovazan
ivanpovazan
deleted the

fix-refactor-linq-expr-switches

branch
July 31, 2023 07:37
@ghostghost
locked as resolved and limited conversation to collaborators
Aug 30, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@ivanpovazanivanpovazan

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[NativeAOT] System.Linq.Expressions size regression


3 participants

@ivanpovazan@MichalStrehovsky@SamMonoRT

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring  - #89638
Merged
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Jul 31, 2023
Merged
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring #89638
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Conversation
@ivanpovazan
@ivanpovazanivanpovazan
commented
Jul 28, 2023•

edited

Loading

Copy link


Copy Markdown

Member
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Verified that the regression has been fixed by adding a reference to System.Linq.Expressions in the HelloiOS sample and AOTing with and without changes in the PR:
HelloiOS samplemainthis PR
Size on disk (Mb)53,312,14
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes#89527
@ghost
ghost
commented
Jul 28, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas

See info in area-owners.md if you want to be subscribed.
Issue Details
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes #89527
Author:ivanpovazan
Assignees:ivanpovazan
Labels:
area-NativeAOT-coreclr
Milestone:-
@jkotas
jkotas
requested a review
from vitek-karasJuly 28, 2023 15:24
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 28, 2023

Closed

@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Jul 29, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
@eerhardt I have measured the impact of this change with https://github.com/aspnet/Benchmarks/tree/main/src/BenchmarksApps/TodosApi on osx-arm64 comparing the main branch and this PR, with dotnet sdk version: 8.0.100-preview.7.23364.32 and locally built framework and ILCompiler packages referenced from the project file via:
 <ItemGroup>
<FrameworkReferenceUpdate="Microsoft.NETCore.App"RuntimeFrameworkVersion="8.0.0-dev" />
<PackageReferenceInclude="Microsoft.DotNet.ILCompiler"Version="8.0.0-dev" />
</ItemGroup>
The measurements show the following results:
TodosApimainthis PR
Size on disk (Mb)49,9936,25
These numbers do not match what you posted in: #89527 (comment) but I only have a MacBookPro M1 at hand, so am not able to verify the impact of this change on win-x64. Nevertheless, presented measurements show the expected reduction in size.
I also double-checked the mstat files. confirming the fix:
main branch:
main-branch
this PR:
this-PR

This was referenced Jul 29, 2023

Closed


Open


Closed


Closed


Closed


Closed


Closed

MichalStrehovsky
MichalStrehovsky
approved these changes
Jul 31, 2023
View reviewed changes
@MichalStrehovskyMichalStrehovsky
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Neat!
@MichalStrehovsky
MichalStrehovsky
merged commit 8c96dd2
into
dotnet:mainJul 31, 2023
@ivanpovazan
ivanpovazan
deleted the

fix-refactor-linq-expr-switches

branch
July 31, 2023 07:37
@ghostghost
locked as resolved and limited conversation to collaborators
Aug 30, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@ivanpovazanivanpovazan

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[NativeAOT] System.Linq.Expressions size regression


3 participants

@ivanpovazan@MichalStrehovsky@SamMonoRT

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring  - #89638
Merged
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Jul 31, 2023
Merged
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring #89638
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Conversation
@ivanpovazan
@ivanpovazanivanpovazan
commented
Jul 28, 2023•

edited

Loading

Copy link


Copy Markdown

Member
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Verified that the regression has been fixed by adding a reference to System.Linq.Expressions in the HelloiOS sample and AOTing with and without changes in the PR:
HelloiOS samplemainthis PR
Size on disk (Mb)53,312,14
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes#89527
@ghost
ghost
commented
Jul 28, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas

See info in area-owners.md if you want to be subscribed.
Issue Details
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes #89527
Author:ivanpovazan
Assignees:ivanpovazan
Labels:
area-NativeAOT-coreclr
Milestone:-
@jkotas
jkotas
requested a review
from vitek-karasJuly 28, 2023 15:24
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 28, 2023

Closed

@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Jul 29, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
@eerhardt I have measured the impact of this change with https://github.com/aspnet/Benchmarks/tree/main/src/BenchmarksApps/TodosApi on osx-arm64 comparing the main branch and this PR, with dotnet sdk version: 8.0.100-preview.7.23364.32 and locally built framework and ILCompiler packages referenced from the project file via:
 <ItemGroup>
<FrameworkReferenceUpdate="Microsoft.NETCore.App"RuntimeFrameworkVersion="8.0.0-dev" />
<PackageReferenceInclude="Microsoft.DotNet.ILCompiler"Version="8.0.0-dev" />
</ItemGroup>
The measurements show the following results:
TodosApimainthis PR
Size on disk (Mb)49,9936,25
These numbers do not match what you posted in: #89527 (comment) but I only have a MacBookPro M1 at hand, so am not able to verify the impact of this change on win-x64. Nevertheless, presented measurements show the expected reduction in size.
I also double-checked the mstat files. confirming the fix:
main branch:
main-branch
this PR:
this-PR

This was referenced Jul 29, 2023

Closed


Open


Closed


Closed


Closed


Closed


Closed

MichalStrehovsky
MichalStrehovsky
approved these changes
Jul 31, 2023
View reviewed changes
@MichalStrehovskyMichalStrehovsky
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Neat!
@MichalStrehovsky
MichalStrehovsky
merged commit 8c96dd2
into
dotnet:mainJul 31, 2023
@ivanpovazan
ivanpovazan
deleted the

fix-refactor-linq-expr-switches

branch
July 31, 2023 07:37
@ghostghost
locked as resolved and limited conversation to collaborators
Aug 30, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@ivanpovazanivanpovazan

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[NativeAOT] System.Linq.Expressions size regression


3 participants

@ivanpovazan@MichalStrehovsky@SamMonoRT

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring  - #89638
Merged
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Jul 31, 2023
Merged
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring #89638
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Conversation
@ivanpovazan
@ivanpovazanivanpovazan
commented
Jul 28, 2023•

edited

Loading

Copy link


Copy Markdown

Member
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Verified that the regression has been fixed by adding a reference to System.Linq.Expressions in the HelloiOS sample and AOTing with and without changes in the PR:
HelloiOS samplemainthis PR
Size on disk (Mb)53,312,14
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes#89527
@ghost
ghost
commented
Jul 28, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas

See info in area-owners.md if you want to be subscribed.
Issue Details
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes #89527
Author:ivanpovazan
Assignees:ivanpovazan
Labels:
area-NativeAOT-coreclr
Milestone:-
@jkotas
jkotas
requested a review
from vitek-karasJuly 28, 2023 15:24
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 28, 2023

Closed

@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Jul 29, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
@eerhardt I have measured the impact of this change with https://github.com/aspnet/Benchmarks/tree/main/src/BenchmarksApps/TodosApi on osx-arm64 comparing the main branch and this PR, with dotnet sdk version: 8.0.100-preview.7.23364.32 and locally built framework and ILCompiler packages referenced from the project file via:
 <ItemGroup>
<FrameworkReferenceUpdate="Microsoft.NETCore.App"RuntimeFrameworkVersion="8.0.0-dev" />
<PackageReferenceInclude="Microsoft.DotNet.ILCompiler"Version="8.0.0-dev" />
</ItemGroup>
The measurements show the following results:
TodosApimainthis PR
Size on disk (Mb)49,9936,25
These numbers do not match what you posted in: #89527 (comment) but I only have a MacBookPro M1 at hand, so am not able to verify the impact of this change on win-x64. Nevertheless, presented measurements show the expected reduction in size.
I also double-checked the mstat files. confirming the fix:
main branch:
main-branch
this PR:
this-PR

This was referenced Jul 29, 2023

Closed


Open


Closed


Closed


Closed


Closed


Closed

MichalStrehovsky
MichalStrehovsky
approved these changes
Jul 31, 2023
View reviewed changes
@MichalStrehovskyMichalStrehovsky
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Neat!
@MichalStrehovsky
MichalStrehovsky
merged commit 8c96dd2
into
dotnet:mainJul 31, 2023
@ivanpovazan
ivanpovazan
deleted the

fix-refactor-linq-expr-switches

branch
July 31, 2023 07:37
@ghostghost
locked as resolved and limited conversation to collaborators
Aug 30, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@ivanpovazanivanpovazan

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[NativeAOT] System.Linq.Expressions size regression


3 participants

@ivanpovazan@MichalStrehovsky@SamMonoRT

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring  - #89638
Merged
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Jul 31, 2023
Merged
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring #89638
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Conversation
@ivanpovazan
@ivanpovazanivanpovazan
commented
Jul 28, 2023•

edited

Loading

Copy link


Copy Markdown

Member
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Verified that the regression has been fixed by adding a reference to System.Linq.Expressions in the HelloiOS sample and AOTing with and without changes in the PR:
HelloiOS samplemainthis PR
Size on disk (Mb)53,312,14
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes#89527
@ghost
ghost
commented
Jul 28, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas

See info in area-owners.md if you want to be subscribed.
Issue Details
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes #89527
Author:ivanpovazan
Assignees:ivanpovazan
Labels:
area-NativeAOT-coreclr
Milestone:-
@jkotas
jkotas
requested a review
from vitek-karasJuly 28, 2023 15:24
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 28, 2023

Closed

@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Jul 29, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
@eerhardt I have measured the impact of this change with https://github.com/aspnet/Benchmarks/tree/main/src/BenchmarksApps/TodosApi on osx-arm64 comparing the main branch and this PR, with dotnet sdk version: 8.0.100-preview.7.23364.32 and locally built framework and ILCompiler packages referenced from the project file via:
 <ItemGroup>
<FrameworkReferenceUpdate="Microsoft.NETCore.App"RuntimeFrameworkVersion="8.0.0-dev" />
<PackageReferenceInclude="Microsoft.DotNet.ILCompiler"Version="8.0.0-dev" />
</ItemGroup>
The measurements show the following results:
TodosApimainthis PR
Size on disk (Mb)49,9936,25
These numbers do not match what you posted in: #89527 (comment) but I only have a MacBookPro M1 at hand, so am not able to verify the impact of this change on win-x64. Nevertheless, presented measurements show the expected reduction in size.
I also double-checked the mstat files. confirming the fix:
main branch:
main-branch
this PR:
this-PR

This was referenced Jul 29, 2023

Closed


Open


Closed


Closed


Closed


Closed


Closed

MichalStrehovsky
MichalStrehovsky
approved these changes
Jul 31, 2023
View reviewed changes
@MichalStrehovskyMichalStrehovsky
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Neat!
@MichalStrehovsky
MichalStrehovsky
merged commit 8c96dd2
into
dotnet:mainJul 31, 2023
@ivanpovazan
ivanpovazan
deleted the

fix-refactor-linq-expr-switches

branch
July 31, 2023 07:37
@ghostghost
locked as resolved and limited conversation to collaborators
Aug 30, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@ivanpovazanivanpovazan

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[NativeAOT] System.Linq.Expressions size regression


3 participants

@ivanpovazan@MichalStrehovsky@SamMonoRT

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring  - #89638
Merged
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Jul 31, 2023
Merged
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring #89638
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Conversation
@ivanpovazan
@ivanpovazanivanpovazan
commented
Jul 28, 2023•

edited

Loading

Copy link


Copy Markdown

Member
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Verified that the regression has been fixed by adding a reference to System.Linq.Expressions in the HelloiOS sample and AOTing with and without changes in the PR:
HelloiOS samplemainthis PR
Size on disk (Mb)53,312,14
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes#89527
@ghost
ghost
commented
Jul 28, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas

See info in area-owners.md if you want to be subscribed.
Issue Details
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes #89527
Author:ivanpovazan
Assignees:ivanpovazan
Labels:
area-NativeAOT-coreclr
Milestone:-
@jkotas
jkotas
requested a review
from vitek-karasJuly 28, 2023 15:24
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 28, 2023

Closed

@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Jul 29, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
@eerhardt I have measured the impact of this change with https://github.com/aspnet/Benchmarks/tree/main/src/BenchmarksApps/TodosApi on osx-arm64 comparing the main branch and this PR, with dotnet sdk version: 8.0.100-preview.7.23364.32 and locally built framework and ILCompiler packages referenced from the project file via:
 <ItemGroup>
<FrameworkReferenceUpdate="Microsoft.NETCore.App"RuntimeFrameworkVersion="8.0.0-dev" />
<PackageReferenceInclude="Microsoft.DotNet.ILCompiler"Version="8.0.0-dev" />
</ItemGroup>
The measurements show the following results:
TodosApimainthis PR
Size on disk (Mb)49,9936,25
These numbers do not match what you posted in: #89527 (comment) but I only have a MacBookPro M1 at hand, so am not able to verify the impact of this change on win-x64. Nevertheless, presented measurements show the expected reduction in size.
I also double-checked the mstat files. confirming the fix:
main branch:
main-branch
this PR:
this-PR

This was referenced Jul 29, 2023

Closed


Open


Closed


Closed


Closed


Closed


Closed

MichalStrehovsky
MichalStrehovsky
approved these changes
Jul 31, 2023
View reviewed changes
@MichalStrehovskyMichalStrehovsky
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Neat!
@MichalStrehovsky
MichalStrehovsky
merged commit 8c96dd2
into
dotnet:mainJul 31, 2023
@ivanpovazan
ivanpovazan
deleted the

fix-refactor-linq-expr-switches

branch
July 31, 2023 07:37
@ghostghost
locked as resolved and limited conversation to collaborators
Aug 30, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@ivanpovazanivanpovazan

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[NativeAOT] System.Linq.Expressions size regression


3 participants

@ivanpovazan@MichalStrehovsky@SamMonoRT

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring  - #89638
Merged
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Jul 31, 2023
Merged
[NativeAOT] Properly implement System.Linq.Expressions substitutions according to the recent refactoring #89638
MichalStrehovsky merged 3 commits into
dotnet:mainfrom 
ivanpovazan:fix-refactor-linq-expr-switches
Conversation
@ivanpovazan
@ivanpovazanivanpovazan
commented
Jul 28, 2023•

edited

Loading

Copy link


Copy Markdown

Member
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Verified that the regression has been fixed by adding a reference to System.Linq.Expressions in the HelloiOS sample and AOTing with and without changes in the PR:
HelloiOS samplemainthis PR
Size on disk (Mb)53,312,14
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes#89527
@ghost
ghost
commented
Jul 28, 2023

Copy link


Copy Markdown

Tagging subscribers to this area: @agocke, @MichalStrehovsky, @jkotas

See info in area-owners.md if you want to be subscribed.
Issue Details
#89308 introduced a regression for NativeAOT because the changes assumed that ILC trimming can propagate constants over methods. As this is not true, the Ref.Emit backend is not trimmed away by ILC anymore increasing the app size.
This PR fixes this regression, by adjusting the System.Linq.Expressions substitutions to wire DynamicCodeSupported feature switch value to get_CanCompileToIL and get_CanCreateArbitraryDelegates and substitute them with false - avoiding the constant propagation over methods limitation.
Additionally, I cleaned up a few places that had left overs of the removed private feature switches.
Thanks @vitek-karas for figuring out the right approach.
@dotnet/ilc-contrib
Fixes #89527
Author:ivanpovazan
Assignees:ivanpovazan
Labels:
area-NativeAOT-coreclr
Milestone:-
@jkotas
jkotas
requested a review
from vitek-karasJuly 28, 2023 15:24
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 28, 2023

Closed

@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-extra-platforms
@azure-pipelines
azure-pipelinesBot
commented
Jul 29, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ivanpovazan
ivanpovazan
commented
Jul 29, 2023

Copy link


Copy Markdown

MemberAuthor
@eerhardt I have measured the impact of this change with https://github.com/aspnet/Benchmarks/tree/main/src/BenchmarksApps/TodosApi on osx-arm64 comparing the main branch and this PR, with dotnet sdk version: 8.0.100-preview.7.23364.32 and locally built framework and ILCompiler packages referenced from the project file via:
 <ItemGroup>
<FrameworkReferenceUpdate="Microsoft.NETCore.App"RuntimeFrameworkVersion="8.0.0-dev" />
<PackageReferenceInclude="Microsoft.DotNet.ILCompiler"Version="8.0.0-dev" />
</ItemGroup>
The measurements show the following results:
TodosApimainthis PR
Size on disk (Mb)49,9936,25
These numbers do not match what you posted in: #89527 (comment) but I only have a MacBookPro M1 at hand, so am not able to verify the impact of this change on win-x64. Nevertheless, presented measurements show the expected reduction in size.
I also double-checked the mstat files. confirming the fix:
main branch:
main-branch
this PR:
this-PR

This was referenced Jul 29, 2023

Closed


Open


Closed


Closed


Closed


Closed


Closed

MichalStrehovsky
MichalStrehovsky
approved these changes
Jul 31, 2023
View reviewed changes
@MichalStrehovskyMichalStrehovsky
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Neat!
@MichalStrehovsky
MichalStrehovsky
merged commit 8c96dd2
into
dotnet:mainJul 31, 2023
@ivanpovazan
ivanpovazan
deleted the

fix-refactor-linq-expr-switches

branch
July 31, 2023 07:37
@ghostghost
locked as resolved and limited conversation to collaborators
Aug 30, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@MichalStrehovskyMichalStrehovskyMichalStrehovsky approved these changes
@SamMonoRTSamMonoRTSamMonoRT approved these changes
@vitek-karasvitek-karasAwaiting requested review from vitek-karas
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@ivanpovazanivanpovazan

Labels

area-NativeAOT-coreclr

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

[NativeAOT] System.Linq.Expressions size regression


3 participants

@ivanpovazan@MichalStrehovsky@SamMonoRT