Skip to content

Commit 7ea346d

Browse files
github-actions[bot]DrewScoggins
github-actions[bot]
and
DrewScoggins
authored
[release/7.0-rc1] Add Arm64 PGO/IBC to Windows and Linux builds (#74098)
* Add Arm64 PGO/IBC to Windows and Linux builds * WIP * Update opt data package version Co-authored-by: Drew Scoggins <anscoggi@microsoft.com>
1 parent a969995 commit 7ea346d

File tree

4 files changed

+33
-15
lines changed

4 files changed

+33
-15
lines changed

‎eng/Version.Details.xml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -254,21 +254,21 @@
254254
<Uri>https://github.com/dotnet/arcade</Uri>
255255
<Sha>afc901d73d7d3bd363547ddf8769efe14052bfa7</Sha>
256256
</Dependency>
257-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22375.7">
257+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
258258
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
259-
<Sha>e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056</Sha>
259+
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
260260
</Dependency>
261-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.22375.7">
261+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
262262
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
263-
<Sha>e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056</Sha>
263+
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
264264
</Dependency>
265-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.22375.7">
265+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
266266
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
267-
<Sha>e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056</Sha>
267+
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
268268
</Dependency>
269-
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.22375.7">
269+
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.22415.6">
270270
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
271-
<Sha>e01e5b0aed54a5a8d9df74e717d1b13f0fb0e056</Sha>
271+
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
272272
</Dependency>
273273
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.1.0-alpha.0.22408.2">
274274
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
@@ -286,5 +286,13 @@
286286
<Uri>https://github.com/dotnet/sdk</Uri>
287287
<Sha>3f2524bd65a6ab77b9160bcc23824dbc03990f3d</Sha>
288288
</Dependency>
289+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
290+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
291+
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
292+
</Dependency>
293+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
294+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
295+
<Sha>5e0b0da43f660de5798186f4fd3bc900fc90576c</Sha>
296+
</Dependency>
289297
</ToolsetDependencies>
290298
</Dependencies>

‎eng/Versions.props

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,12 @@
133133
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22409.1</SystemWindowsExtensionsTestDataVersion>
134134
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22409.1</MicrosoftDotNetCilStripSourcesVersion>
135135
<!-- dotnet-optimization dependencies -->
136-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22375.7</optimizationwindows_ntx64MIBCRuntimeVersion>
137-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22375.7</optimizationwindows_ntx86MIBCRuntimeVersion>
138-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.22375.7</optimizationlinuxx64MIBCRuntimeVersion>
139-
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.22375.7</optimizationPGOCoreCLRVersion>
136+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx64MIBCRuntimeVersion>
137+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntx86MIBCRuntimeVersion>
138+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationwindows_ntarm64MIBCRuntimeVersion>
139+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationlinuxx64MIBCRuntimeVersion>
140+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.22415.6</optimizationlinuxarm64MIBCRuntimeVersion>
141+
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.22415.6</optimizationPGOCoreCLRVersion>
140142
<!-- Not auto-updated. -->
141143
<MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
142144
<SystemCommandLineVersion>2.0.0-beta4.22355.1</SystemCommandLineVersion>

‎eng/nativepgo.targets

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'windows' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'x86')">true</NativeOptimizationDataSupported>
4-
<NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'Linux' And '$(TargetArchitecture)' == 'x64'">true</NativeOptimizationDataSupported>
3+
<NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'windows' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'x86' Or '$(TargetArchitecture)' == 'arm64')">true</NativeOptimizationDataSupported>
4+
<NativeOptimizationDataSupported Condition="'$(TargetOS)' == 'Linux' And ('$(TargetArchitecture)' == 'x64' Or '$(TargetArchitecture)' == 'arm64')">true</NativeOptimizationDataSupported>
55
<NativeOptimizationDataSupported Condition="'$(NoPgoOptimize)' == 'true'">false</NativeOptimizationDataSupported>
66
<NativeOptimizationDataSupported Condition="'$(Configuration)' != 'Release'">false</NativeOptimizationDataSupported>
77

@@ -16,14 +16,20 @@
1616
<PackageReference Include="optimization.windows_nt-x86.PGO.CoreCLR"
1717
Version="$(optimizationPGOCoreCLRVersion)"
1818
GeneratePathProperty="true" />
19+
<PackageReference Include="optimization.windows_nt-arm64.PGO.CoreCLR"
20+
Version="$(optimizationPGOCoreCLRVersion)"
21+
GeneratePathProperty="true" />
1922
<PackageReference Include="optimization.linux-x64.PGO.CoreCLR"
2023
Version="$(optimizationPGOCoreCLRVersion)"
2124
GeneratePathProperty="true" />
25+
<PackageReference Include="optimization.linux-arm64.PGO.CoreCLR"
26+
Version="$(optimizationPGOCoreCLRVersion)"
27+
GeneratePathProperty="true" />
2228
</ItemGroup>
2329

2430

2531
<!-- -->
26-
<!-- Task: GetPgoDataPackagePath -->
32+
<!-- Task: GetPgoDataPackagePath -->
2733
<!-- -->
2834
<!-- Notes: -->
2935
<!-- -->

‎eng/restore/optimizationData.targets

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
<!-- Mibc data to use when exact architecture match is available -->
44
<MIBCPackageDef Include="optimization.windows_nt-x86.mibc.runtime" Version="$(optimizationwindows_ntx86MIBCRuntimeVersion)" MibcArchitecture="Windows/x86"/>
55
<MIBCPackageDef Include="optimization.windows_nt-x64.mibc.runtime" Version="$(optimizationwindows_ntx64MIBCRuntimeVersion)" MibcArchitecture="Windows/x64"/>
6+
<MIBCPackageDef Include="optimization.windows_nt-arm64.mibc.runtime" Version="$(optimizationwindows_ntarm64MIBCRuntimeVersion)" MibcArchitecture="Windows/arm64"/>
67
<MIBCPackageDef Include="optimization.linux-x64.mibc.runtime" Version="$(optimizationlinuxx64MIBCRuntimeVersion)" MibcArchitecture="Linux/x64"/>
8+
<MIBCPackageDef Include="optimization.linux-arm64.mibc.runtime" Version="$(optimizationlinuxarm64MIBCRuntimeVersion)" MibcArchitecture="Linux/arm64"/>
79

810
<!-- Mibc data to use when exact architecture match not available -->
911
<MIBCPackageDef Include="optimization.windows_nt-x64.mibc.runtime" Version="$(optimizationwindows_ntx64MIBCRuntimeVersion)" MibcArchitecture="Windows"/>

0 commit comments

Comments
 (0)