Skip to content

Commit

Permalink
Fix superpmi collect failure for crossgen2 on linux x64 and windows x…
Browse files Browse the repository at this point in the history
…86 (#104181)

* Fix superpmi collect failure for crossgen2 on linux x64.

* Remove .NET SDK and keep Dotnet.Helix SDK only.

* Ignore ilc.exe in partition 0 for a quick fix to libraries crossgen2 windows x86 failure becasue ilc.exe in partition 0 does not have any managed assemblies in it.

* Address feedback to insert ilc.exe in the ignore list in a sorted order.
  • Loading branch information
JulieLeeMSFT authored Jul 17, 2024
1 parent 6c32206 commit efe4f6a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ jobs:
ProjectFile: 'superpmi-collect.proj'
BuildConfig: ${{ parameters.buildConfig }}
osGroup: ${{ parameters.osGroup }}
archType: ${{ parameters.archType }}
InputArtifacts: '$(InputArtifacts)'
CollectionType: '$(CollectionType)'
CollectionName: '$(CollectionName)'
Expand Down
6 changes: 5 additions & 1 deletion eng/pipelines/coreclr/templates/superpmi-send-to-helix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ parameters:
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
BuildConfig: 'checked' # optional -- Mostly, superpmi will be run on checked builds
osGroup: '' # required -- the OS group to run the tests on; defaults to the OS group of the build
archType: '' # required -- the architecture to run the tests on; defaults to the architecture of the build
InputArtifacts: ''
CollectionType: ''
CollectionName: ''
Expand All @@ -33,6 +35,8 @@ steps:
condition: ${{ parameters.condition }}
shouldContinueOnError: ${{ parameters.continueOnError }}
environment:
TargetOS: ${{ parameters.osGroup }}
TargetArchitecture: ${{ parameters.archType }}
MchFileTag: $(MchFileTag)
BuildConfig: ${{ parameters.BuildConfig }}
InputArtifacts: ${{ parameters.InputArtifacts }}
Expand All @@ -53,4 +57,4 @@ steps:
EnableXUnitReporter: ${{ parameters.EnableXUnitReporter }}
WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }}
Creator: ${{ parameters.Creator }}
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
14 changes: 14 additions & 0 deletions src/coreclr/scripts/superpmi-collect.proj
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,20 @@
</ItemGroup>
-->

<PropertyGroup Condition=" '$(CollectionType)' == 'crossgen2' ">
<TargetOSSpec>$(TargetOS)$(TargetOSSubgroup)</TargetOSSpec>
<HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'windows'">win-$(TargetArchitecture)</HelixRuntimeRid>
<HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'osx'">osx-$(TargetArchitecture)</HelixRuntimeRid>
<HelixRuntimeRid Condition="'$(TargetOSSpec)' == 'linux'">linux-$(TargetArchitecture)</HelixRuntimeRid>
</PropertyGroup>

<PropertyGroup Condition=" '$(CollectionType)' == 'crossgen2' ">
<IncludeDotNetCli>true</IncludeDotNetCli>
<DotNetCliPackageType>runtime</DotNetCliPackageType>
<DotNetCliVersion>$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
<DotNetCliRuntime>$(HelixRuntimeRid)</DotNetCliRuntime>
</PropertyGroup>

<PropertyGroup>
<HelixPreCommands>@(HelixPreCommand)</HelixPreCommands>
<HelixPostCommands>@(HelixPostCommand)</HelixPostCommands>
Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/scripts/superpmi_collect_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
"e_sqlite3.dll",
"FileCheck.exe",
"ilasm.exe",
"ilc.exe",
"ildasm.exe",
"jitinterface_arm.dll",
"jitinterface_arm64.dll",
Expand Down Expand Up @@ -453,7 +454,7 @@ def main(main_args):
ci = True

# Determine the Helix queue name to use when running jobs.
# Note that we run in the 'internal', not 'public', instance, so we must use 'internal' queues.
# Note that we run in the 'internal', not 'public', instance, so we must use 'internal' queues defined in helix-queues-setup.yml.
if platform_name == "windows":
helix_queue = "Windows.11.Arm64" if arch == "arm64" else "Windows.10.Amd64.X86.Rt"
elif platform_name == "linux":
Expand Down

0 comments on commit efe4f6a

Please sign in to comment.