Skip to content

Use latest ILC to AOT-compile ILC#89655

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

Merged
sbomer merged 6 commits into from
Aug 1, 2023
Merged

Use latest ILC to AOT-compile ILC #89655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec797e5
Use latest ILC to AOT-compile ILC
sbomer Jul 28, 2023
7ecb367
Try to fix cross-builds
sbomer Jul 29, 2023
a35b3b8
Update eng/Version.Details.xml
sbomer Jul 29, 2023
3f6c140
Merge remote-tracking branch 'origin/main' into overrideILC
sbomer Jul 31, 2023
5cfb2f7
Switch to macOS 12 pool
sbomer Jul 31, 2023
ee8c5e3
Update helix queues for osx-arm64 run
sbomer Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,10 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
Expand Down
2 changes: 2 additions & 0 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,6 +212,8 @@
<MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
<!-- Mono Cecil -->
<MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
<!-- ILCompiler -->
<MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
Expand Down
7 changes: 2 additions & 5 deletions eng/pipelines/common/xplat-setup.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -147,11 +147,8 @@ jobs:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

# OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
vmImage: 'macos-11'

${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
# OSX Build Pool (we don't have on-prem OSX BuildPool).
${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
vmImage: 'macos-12'

# Official Build Windows Pool
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- OSX.1200.Amd64.Iphone.Open
- OSX.13.Amd64.Iphone.Open

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ jobs:

# iOS devices
- ${{ if in(parameters.platform, 'ios_arm64') }}:
- OSX.1200.Amd64.Iphone.Open
- OSX.13.Amd64.Iphone.Open

# tvOS devices
- ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down
10 changes: 10 additions & 0 deletions src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,18 @@
<PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
<PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
<PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
<!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
<_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
<_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
<_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
<_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
</PropertyGroup>

<ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
<PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
</ItemGroup>

<!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
<Target Name="_FixIlcTargetTriple"
Expand Down
, '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" + '
Use latest ILC to AOT-compile ILC by sbomer · Pull Request #89655 · dotnet/runtime · GitHub
Skip to content
Use latest ILC to AOT-compile ILC#89655

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

 Merged

sbomer
merged 6 commits into

from

Aug 1, 2023
 Merged


Use latest ILC to AOT-compile ILC
#89655
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ec797e5

Use latest ILC to AOT-compile ILC


sbomer Jul 28, 2023
7ecb367

Try to fix cross-builds


sbomer Jul 29, 2023
a35b3b8

Update eng/Version.Details.xml


sbomer Jul 29, 2023
3f6c140

Merge remote-tracking branch 'origin/main' into overrideILC


sbomer Jul 31, 2023
5cfb2f7

Switch to macOS 12 pool


sbomer Jul 31, 2023
ee8c5e3

Update helix queues for osx-arm64 run


sbomer Aug 1, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,10 @@
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
Expand Down

2 changes: 2 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,6 +212,8 @@
 <MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
 <!-- Mono Cecil -->
 <MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
 <!-- ILCompiler -->
 <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
 <!-- ICU -->
 <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
 <!-- MsQuic -->
Expand Down

7 changes: 2 additions & 5 deletions
eng/pipelines/common/xplat-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,11 +147,8 @@ jobs:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
 vmImage: 'macos-11'

 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
 # OSX Build Pool (we don't have on-prem OSX BuildPool).
 ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 vmImage: 'macos-12'

 # Official Build Windows Pool
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

10 changes: 10 additions & 0 deletions
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,18 @@
 <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
 <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
 <PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
 <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
 <!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
 <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
 <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
 <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
 <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
 </PropertyGroup>

 <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
 <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
 <PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
 </ItemGroup>

 <!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
 <Target Name="_FixIlcTargetTriple"
Expand Down

, '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('^' + ".*" + '
Use latest ILC to AOT-compile ILC by sbomer · Pull Request #89655 · dotnet/runtime · GitHub
Skip to content
Use latest ILC to AOT-compile ILC#89655

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

 Merged

sbomer
merged 6 commits into

from

Aug 1, 2023
 Merged


Use latest ILC to AOT-compile ILC
#89655
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ec797e5

Use latest ILC to AOT-compile ILC


sbomer Jul 28, 2023
7ecb367

Try to fix cross-builds


sbomer Jul 29, 2023
a35b3b8

Update eng/Version.Details.xml


sbomer Jul 29, 2023
3f6c140

Merge remote-tracking branch 'origin/main' into overrideILC


sbomer Jul 31, 2023
5cfb2f7

Switch to macOS 12 pool


sbomer Jul 31, 2023
ee8c5e3

Update helix queues for osx-arm64 run


sbomer Aug 1, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,10 @@
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
Expand Down

2 changes: 2 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,6 +212,8 @@
 <MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
 <!-- Mono Cecil -->
 <MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
 <!-- ILCompiler -->
 <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
 <!-- ICU -->
 <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
 <!-- MsQuic -->
Expand Down

7 changes: 2 additions & 5 deletions
eng/pipelines/common/xplat-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,11 +147,8 @@ jobs:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
 vmImage: 'macos-11'

 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
 # OSX Build Pool (we don't have on-prem OSX BuildPool).
 ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 vmImage: 'macos-12'

 # Official Build Windows Pool
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

10 changes: 10 additions & 0 deletions
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,18 @@
 <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
 <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
 <PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
 <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
 <!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
 <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
 <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
 <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
 <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
 </PropertyGroup>

 <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
 <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
 <PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
 </ItemGroup>

 <!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
 <Target Name="_FixIlcTargetTriple"
Expand Down

, '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('^' + ".*" + '
Use latest ILC to AOT-compile ILC by sbomer · Pull Request #89655 · dotnet/runtime · GitHub
Skip to content
Use latest ILC to AOT-compile ILC#89655

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

 Merged

sbomer
merged 6 commits into

from

Aug 1, 2023
 Merged


Use latest ILC to AOT-compile ILC
#89655
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ec797e5

Use latest ILC to AOT-compile ILC


sbomer Jul 28, 2023
7ecb367

Try to fix cross-builds


sbomer Jul 29, 2023
a35b3b8

Update eng/Version.Details.xml


sbomer Jul 29, 2023
3f6c140

Merge remote-tracking branch 'origin/main' into overrideILC


sbomer Jul 31, 2023
5cfb2f7

Switch to macOS 12 pool


sbomer Jul 31, 2023
ee8c5e3

Update helix queues for osx-arm64 run


sbomer Aug 1, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,10 @@
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
Expand Down

2 changes: 2 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,6 +212,8 @@
 <MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
 <!-- Mono Cecil -->
 <MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
 <!-- ILCompiler -->
 <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
 <!-- ICU -->
 <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
 <!-- MsQuic -->
Expand Down

7 changes: 2 additions & 5 deletions
eng/pipelines/common/xplat-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,11 +147,8 @@ jobs:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
 vmImage: 'macos-11'

 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
 # OSX Build Pool (we don't have on-prem OSX BuildPool).
 ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 vmImage: 'macos-12'

 # Official Build Windows Pool
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

10 changes: 10 additions & 0 deletions
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,18 @@
 <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
 <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
 <PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
 <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
 <!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
 <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
 <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
 <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
 <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
 </PropertyGroup>

 <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
 <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
 <PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
 </ItemGroup>

 <!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
 <Target Name="_FixIlcTargetTriple"
Expand Down

, '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" + '
Use latest ILC to AOT-compile ILC by sbomer · Pull Request #89655 · dotnet/runtime · GitHub
Skip to content
Use latest ILC to AOT-compile ILC#89655

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

 Merged

sbomer
merged 6 commits into

from

Aug 1, 2023
 Merged


Use latest ILC to AOT-compile ILC
#89655
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ec797e5

Use latest ILC to AOT-compile ILC


sbomer Jul 28, 2023
7ecb367

Try to fix cross-builds


sbomer Jul 29, 2023
a35b3b8

Update eng/Version.Details.xml


sbomer Jul 29, 2023
3f6c140

Merge remote-tracking branch 'origin/main' into overrideILC


sbomer Jul 31, 2023
5cfb2f7

Switch to macOS 12 pool


sbomer Jul 31, 2023
ee8c5e3

Update helix queues for osx-arm64 run


sbomer Aug 1, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,10 @@
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
Expand Down

2 changes: 2 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,6 +212,8 @@
 <MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
 <!-- Mono Cecil -->
 <MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
 <!-- ILCompiler -->
 <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
 <!-- ICU -->
 <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
 <!-- MsQuic -->
Expand Down

7 changes: 2 additions & 5 deletions
eng/pipelines/common/xplat-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,11 +147,8 @@ jobs:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
 vmImage: 'macos-11'

 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
 # OSX Build Pool (we don't have on-prem OSX BuildPool).
 ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 vmImage: 'macos-12'

 # Official Build Windows Pool
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

10 changes: 10 additions & 0 deletions
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,18 @@
 <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
 <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
 <PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
 <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
 <!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
 <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
 <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
 <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
 <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
 </PropertyGroup>

 <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
 <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
 <PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
 </ItemGroup>

 <!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
 <Target Name="_FixIlcTargetTriple"
Expand Down

, '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('^' + ".*" + '
Use latest ILC to AOT-compile ILC by sbomer · Pull Request #89655 · dotnet/runtime · GitHub
Skip to content
Use latest ILC to AOT-compile ILC#89655

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

 Merged

sbomer
merged 6 commits into

from

Aug 1, 2023
 Merged


Use latest ILC to AOT-compile ILC
#89655
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ec797e5

Use latest ILC to AOT-compile ILC


sbomer Jul 28, 2023
7ecb367

Try to fix cross-builds


sbomer Jul 29, 2023
a35b3b8

Update eng/Version.Details.xml


sbomer Jul 29, 2023
3f6c140

Merge remote-tracking branch 'origin/main' into overrideILC


sbomer Jul 31, 2023
5cfb2f7

Switch to macOS 12 pool


sbomer Jul 31, 2023
ee8c5e3

Update helix queues for osx-arm64 run


sbomer Aug 1, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,10 @@
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
Expand Down

2 changes: 2 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,6 +212,8 @@
 <MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
 <!-- Mono Cecil -->
 <MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
 <!-- ILCompiler -->
 <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
 <!-- ICU -->
 <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
 <!-- MsQuic -->
Expand Down

7 changes: 2 additions & 5 deletions
eng/pipelines/common/xplat-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,11 +147,8 @@ jobs:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
 vmImage: 'macos-11'

 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
 # OSX Build Pool (we don't have on-prem OSX BuildPool).
 ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 vmImage: 'macos-12'

 # Official Build Windows Pool
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

10 changes: 10 additions & 0 deletions
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,18 @@
 <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
 <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
 <PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
 <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
 <!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
 <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
 <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
 <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
 <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
 </PropertyGroup>

 <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
 <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
 <PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
 </ItemGroup>

 <!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
 <Target Name="_FixIlcTargetTriple"
Expand Down

, '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('^' + ".*" + '
Use latest ILC to AOT-compile ILC by sbomer · Pull Request #89655 · dotnet/runtime · GitHub
Skip to content
Use latest ILC to AOT-compile ILC#89655

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

 Merged

sbomer
merged 6 commits into

from

Aug 1, 2023
 Merged


Use latest ILC to AOT-compile ILC
#89655
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ec797e5

Use latest ILC to AOT-compile ILC


sbomer Jul 28, 2023
7ecb367

Try to fix cross-builds


sbomer Jul 29, 2023
a35b3b8

Update eng/Version.Details.xml


sbomer Jul 29, 2023
3f6c140

Merge remote-tracking branch 'origin/main' into overrideILC


sbomer Jul 31, 2023
5cfb2f7

Switch to macOS 12 pool


sbomer Jul 31, 2023
ee8c5e3

Update helix queues for osx-arm64 run


sbomer Aug 1, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,10 @@
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
Expand Down

2 changes: 2 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,6 +212,8 @@
 <MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
 <!-- Mono Cecil -->
 <MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
 <!-- ILCompiler -->
 <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
 <!-- ICU -->
 <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
 <!-- MsQuic -->
Expand Down

7 changes: 2 additions & 5 deletions
eng/pipelines/common/xplat-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,11 +147,8 @@ jobs:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
 vmImage: 'macos-11'

 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
 # OSX Build Pool (we don't have on-prem OSX BuildPool).
 ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 vmImage: 'macos-12'

 # Official Build Windows Pool
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

10 changes: 10 additions & 0 deletions
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,18 @@
 <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
 <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
 <PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
 <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
 <!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
 <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
 <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
 <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
 <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
 </PropertyGroup>

 <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
 <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
 <PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
 </ItemGroup>

 <!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
 <Target Name="_FixIlcTargetTriple"
Expand Down

, '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); }
})();
})();
Use latest ILC to AOT-compile ILC by sbomer · Pull Request #89655 · dotnet/runtime · GitHub
Skip to content
Use latest ILC to AOT-compile ILC#89655

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

 Merged

sbomer
merged 6 commits into

from

Aug 1, 2023
 Merged


Use latest ILC to AOT-compile ILC
#89655
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ec797e5

Use latest ILC to AOT-compile ILC


sbomer Jul 28, 2023
7ecb367

Try to fix cross-builds


sbomer Jul 29, 2023
a35b3b8

Update eng/Version.Details.xml


sbomer Jul 29, 2023
3f6c140

Merge remote-tracking branch 'origin/main' into overrideILC


sbomer Jul 31, 2023
5cfb2f7

Switch to macOS 12 pool


sbomer Jul 31, 2023
ee8c5e3

Update helix queues for osx-arm64 run


sbomer Aug 1, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 4 additions & 0 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,10 @@
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>8470b87bcb366cc06486c6f7aa23ae6de3259eba</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.1.23374.1">
 <Uri>https://github.com/dotnet/runtime</Uri>
 <Sha>5b4bbda1c1c8a5cc4ced9facdacb4e531dfc8b3c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23377.1">
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>437aa378e900dbfd179b5552e71b81bc99e1e746</Sha>
Expand Down

2 changes: 2 additions & 0 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -212,6 +212,8 @@
 <MicrosoftNETILLinkTasksVersion>8.0.0-rc.1.23381.1</MicrosoftNETILLinkTasksVersion>
 <!-- Mono Cecil -->
 <MicrosoftDotNetCecilVersion>0.11.4-alpha.23374.2</MicrosoftDotNetCecilVersion>
 <!-- ILCompiler -->
 <MicrosoftDotNetILCompilerVersion>8.0.0-rc.1.23374.1</MicrosoftDotNetILCompilerVersion>
 <!-- ICU -->
 <MicrosoftNETCoreRuntimeICUTransportVersion>8.0.0-rc.1.23377.1</MicrosoftNETCoreRuntimeICUTransportVersion>
 <!-- MsQuic -->
Expand Down

7 changes: 2 additions & 5 deletions
eng/pipelines/common/xplat-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -147,11 +147,8 @@ jobs:
 name: $(DncEngInternalBuildPool)
 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

 # OSX Build Pool (we don't have on-prem OSX BuildPool). Use 11 on public, 12 on internal.
 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}:
 vmImage: 'macos-11'

 ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}:
 # OSX Build Pool (we don't have on-prem OSX BuildPool).
 ${{ if in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator') }}:
 vmImage: 'macos-12'

 # Official Build Windows Pool
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,7 +56,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/libraries/helix-queues-setup.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -113,7 +113,7 @@ jobs:

 # iOS devices
 - ${{ if in(parameters.platform, 'ios_arm64') }}:
 - OSX.1200.Amd64.Iphone.Open
 - OSX.13.Amd64.Iphone.Open

 # tvOS devices
 - ${{ if in(parameters.platform, 'tvos_arm64') }}:
Expand Down

10 changes: 10 additions & 0 deletions
src/coreclr/tools/aot/ILCompiler/ILCompiler.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,8 +19,18 @@
 <PublishReadyToRun Condition="'$(NativeAotSupported)' != 'true'">true</PublishReadyToRun>
 <PublishSingleFile Condition="'$(NativeAotSupported)' != 'true'">true</PublishSingleFile>
 <PublishTrimmed Condition="'$(NativeAotSupported)' != 'true'">true</PublishTrimmed>
 <SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
 <!-- Compute host package name (taken from Microsoft.DotNet.ILCompiler.SingleEntry.targets) -->
 <_hostOS>$(NETCoreSdkPortableRuntimeIdentifier.SubString(0, $(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-'))))</_hostOS>
 <_hostArchitecture Condition="'$(OS)' != 'Windows_NT'">$(NETCoreSdkPortableRuntimeIdentifier.SubString($([MSBuild]::Add($(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')), 1))))</_hostArchitecture>
 <_hostArchitecture Condition="'$(OS)' == 'Windows_NT'">$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</_hostArchitecture>
 <_hostPackageName>runtime.$(_hostOS)-$(_hostArchitecture).Microsoft.DotNet.ILCompiler</_hostPackageName>
 </PropertyGroup>

 <ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
 <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="$(MicrosoftDotNetILCompilerVersion)" />
 <PackageReference Include="$(_hostPackageName)" Version="$(MicrosoftDotNetILCompilerVersion)" />
 </ItemGroup>

 <!-- Needed for the amd64 -> amd64 musl cross-build to pass the target flag. -->
 <Target Name="_FixIlcTargetTriple"
Expand Down