Skip to content

Commit eaa99ae

Browse files
BruceForstallBruceForstall
committed
Fix SuperPMI collections
1. Remove FSharp benchmark dll from realworld collection, since it no longer has any benchmarks. 2. Properly pass `-cross` switch when building CORE_ROOT. Propagate `crossBuild` more widely through the scripts.
1 parent 2ed43b6 commit eaa99ae

File tree

9 files changed

+36
-14
lines changed

9 files changed

+36
-14
lines changed

‎eng/pipelines/common/global-build-job.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ parameters:
3535
preBuildSteps: []
3636
templatePath: 'templates'
3737
templateContext: ''
38+
disableComponentGovernance: ''
3839

3940
jobs:
4041
- template: /eng/common/${{ parameters.templatePath }}/job/job.yml

‎eng/pipelines/coreclr/superpmi-collect-test.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ extends:
6565
parameters:
6666
buildArgs: -s clr.spmi -c $(_BuildConfig)
6767
archParameter: -arch x64
68+
displayName: Build SuperPMI
6869
- template: /eng/pipelines/coreclr/templates/build-native-test-assets-step.yml
6970
- template: /eng/pipelines/common/upload-artifact-step.yml
7071
parameters:
@@ -106,6 +107,7 @@ extends:
106107
buildArgs: -s clr.spmi -c $(_BuildConfig)
107108
archParameter: -arch x64
108109
container: linux_x64
110+
displayName: Build SuperPMI
109111
- template: /eng/pipelines/coreclr/templates/build-native-test-assets-step.yml
110112
- template: /eng/pipelines/common/upload-artifact-step.yml
111113
parameters:

‎eng/pipelines/coreclr/superpmi-collect.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ extends:
8686
parameters:
8787
buildArgs: -s clr.spmi -c $(_BuildConfig)
8888
archParameter: -arch x64
89+
displayName: Build SuperPMI
8990
- template: /eng/pipelines/coreclr/templates/build-native-test-assets-step.yml
9091
- template: /eng/pipelines/common/upload-artifact-step.yml
9192
parameters:
@@ -127,6 +128,7 @@ extends:
127128
buildArgs: -s clr.spmi -c $(_BuildConfig)
128129
archParameter: -arch x64
129130
container: linux_x64
131+
displayName: Build SuperPMI
130132
- template: /eng/pipelines/coreclr/templates/build-native-test-assets-step.yml
131133
- template: /eng/pipelines/common/upload-artifact-step.yml
132134
parameters:

‎eng/pipelines/coreclr/templates/run-superpmi-asmdiffs-checked-release-job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ parameters:
99
archType: '' # required -- targeting CPU architecture
1010
osGroup: '' # required -- operating system for the job
1111
osSubgroup: '' # optional -- operating system subgroup
12+
crossBuild: '' # optional -- 'true' if this is a cross-build
1213
continueOnError: 'false' # optional -- determines whether to continue the build if the step errors
1314
dependsOn: '' # optional -- dependencies of the job
1415
timeoutInMinutes: 320 # optional -- timeout for the job
@@ -24,6 +25,7 @@ jobs:
2425
archType: ${{ parameters.archType }}
2526
osGroup: ${{ parameters.osGroup }}
2627
osSubgroup: ${{ parameters.osSubgroup }}
28+
crossBuild: ${{ parameters.crossBuild }}
2729
liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
2830
enableTelemetry: ${{ parameters.enableTelemetry }}
2931
enablePublishBuildArtifacts: true

‎eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ parameters:
99
archType: '' # required -- targeting CPU architecture
1010
osGroup: '' # required -- operating system for the job
1111
osSubgroup: '' # optional -- operating system subgroup
12+
crossBuild: '' # optional -- 'true' if this is a cross-build
1213
continueOnError: 'false' # optional -- determines whether to continue the build if the step errors
1314
dependsOn: '' # optional -- dependencies of the job
1415
timeoutInMinutes: 320 # optional -- timeout for the job
@@ -25,6 +26,7 @@ jobs:
2526
archType: ${{ parameters.archType }}
2627
osGroup: ${{ parameters.osGroup }}
2728
osSubgroup: ${{ parameters.osSubgroup }}
29+
crossBuild: ${{ parameters.crossBuild }}
2830
liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
2931
enableTelemetry: ${{ parameters.enableTelemetry }}
3032
enablePublishBuildArtifacts: true

‎eng/pipelines/coreclr/templates/run-superpmi-diffs-job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ parameters:
99
archType: '' # required -- targeting CPU architecture
1010
osGroup: '' # required -- operating system for the job
1111
osSubgroup: '' # optional -- operating system subgroup
12+
crossBuild: '' # optional -- 'true' if this is a cross-build
1213
continueOnError: 'false' # optional -- determines whether to continue the build if the step errors
1314
dependsOn: '' # optional -- dependencies of the job
1415
timeoutInMinutes: 180 # optional -- timeout for the job
@@ -27,6 +28,7 @@ jobs:
2728
archType: ${{ parameters.archType }}
2829
osGroup: ${{ parameters.osGroup }}
2930
osSubgroup: ${{ parameters.osSubgroup }}
31+
crossBuild: ${{ parameters.crossBuild }}
3032
liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
3133
enableTelemetry: ${{ parameters.enableTelemetry }}
3234
enablePublishBuildArtifacts: true

‎eng/pipelines/coreclr/templates/run-superpmi-replay-job.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ parameters:
99
archType: '' # required -- targeting CPU architecture
1010
osGroup: '' # required -- operating system for the job
1111
osSubgroup: '' # optional -- operating system subgroup
12+
crossBuild: '' # optional -- 'true' if this is a cross-build
1213
continueOnError: 'false' # optional -- determines whether to continue the build if the step errors
1314
dependsOn: '' # optional -- dependencies of the job
1415
timeoutInMinutes: 320 # optional -- timeout for the job
@@ -24,6 +25,7 @@ jobs:
2425
archType: ${{ parameters.archType }}
2526
osGroup: ${{ parameters.osGroup }}
2627
osSubgroup: ${{ parameters.osSubgroup }}
28+
crossBuild: ${{ parameters.crossBuild }}
2729
liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
2830
enableTelemetry: ${{ parameters.enableTelemetry }}
2931
enablePublishBuildArtifacts: true

‎eng/pipelines/coreclr/templates/superpmi-collect-job.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ parameters:
44
osGroup: ''
55
osSubgroup: ''
66
liveLibrariesBuildConfig: ''
7+
crossBuild: ''
78
variables: {}
89
pool: ''
910
runJobTemplate: '/eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml'
@@ -24,6 +25,7 @@ jobs:
2425
archType: ${{ parameters.archType }}
2526
osGroup: ${{ parameters.osGroup }}
2627
osSubgroup: ${{ parameters.osSubgroup }}
28+
crossBuild: ${{ parameters.crossBuild }}
2729
liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
2830
collectionType: ${{ parameters.collectionType }}
2931
collectionName: ${{ parameters.collectionName }}
@@ -33,7 +35,16 @@ jobs:
3335
- ${{ if eq(parameters.collectionName, 'coreclr_tests') }}:
3436
- 'coreclr_common_test_build_p1_AnyOS_AnyCPU_${{parameters.buildConfig }}'
3537

36-
variables: ${{ parameters.variables }}
38+
variables:
39+
40+
- name: crossArg
41+
value: ''
42+
- ${{ if eq(parameters.crossBuild, true) }}:
43+
- name: crossArg
44+
value: '-cross'
45+
46+
- ${{ each variable in parameters.variables }}:
47+
- ${{insert}}: ${{ variable }}
3748

3849
steps:
3950
# Extra steps that will be passed to the superpmi template and run before sending the job to helix (all of which is done in the template)
@@ -72,6 +83,6 @@ jobs:
7283
displayName: 'generic managed test artifacts'
7384

7485
# Create Core_Root
75-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) generatelayoutonly $(librariesOverrideArg) /p:UsePublishedCrossgen2=false
86+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly $(librariesOverrideArg) /p:UsePublishedCrossgen2=false
7687
displayName: Create Core_Root
7788
condition: succeeded()

‎src/coreclr/scripts/superpmi-collect.proj‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -246,21 +246,19 @@
246246
</ItemGroup>
247247
<ItemGroup Condition="'$(CollectionName)' == 'realworld' and '$(AGENT_OS)' == 'Windows_NT'">
248248
<BDN_Partition Include="Partition0" BenchmarkPath="src\benchmarks\real-world\bepuphysics2\DemoBenchmarks.csproj" BenchmarkBinary="DemoBenchmarks.dll" />
249-
<BDN_Partition Include="Partition1" BenchmarkPath="src\benchmarks\real-world\FSharp\FSharp.fsproj" BenchmarkBinary="FSharp.dll" />
250-
<BDN_Partition Include="Partition2" BenchmarkPath="src\benchmarks\real-world\ILLink\ILLinkBenchmarks.csproj" BenchmarkBinary="ILLinkBenchmarks.dll" />
251-
<BDN_Partition Include="Partition3" BenchmarkPath="src\benchmarks\real-world\ImageSharp\ImageSharp.Benchmarks.csproj" BenchmarkBinary="ImageSharp.Benchmarks.dll" />
252-
<BDN_Partition Include="Partition4" BenchmarkPath="src\benchmarks\real-world\Microsoft.ML.Benchmarks\Microsoft.ML.Benchmarks.csproj" BenchmarkBinary="Microsoft.ML.Benchmarks.dll" />
253-
<BDN_Partition Include="Partition5" BenchmarkPath="src\benchmarks\real-world\Roslyn\CompilerBenchmarks.csproj" BenchmarkBinary="CompilerBenchmarks.dll" />
254-
<BDN_Partition Include="Partition6" BenchmarkPath="src\benchmarks\real-world\PowerShell.Benchmarks\PowerShell.Benchmarks.csproj" BenchmarkBinary="PowerShell.Benchmarks.dll" />
249+
<BDN_Partition Include="Partition1" BenchmarkPath="src\benchmarks\real-world\ILLink\ILLinkBenchmarks.csproj" BenchmarkBinary="ILLinkBenchmarks.dll" />
250+
<BDN_Partition Include="Partition2" BenchmarkPath="src\benchmarks\real-world\ImageSharp\ImageSharp.Benchmarks.csproj" BenchmarkBinary="ImageSharp.Benchmarks.dll" />
251+
<BDN_Partition Include="Partition3" BenchmarkPath="src\benchmarks\real-world\Microsoft.ML.Benchmarks\Microsoft.ML.Benchmarks.csproj" BenchmarkBinary="Microsoft.ML.Benchmarks.dll" />
252+
<BDN_Partition Include="Partition4" BenchmarkPath="src\benchmarks\real-world\Roslyn\CompilerBenchmarks.csproj" BenchmarkBinary="CompilerBenchmarks.dll" />
253+
<BDN_Partition Include="Partition5" BenchmarkPath="src\benchmarks\real-world\PowerShell.Benchmarks\PowerShell.Benchmarks.csproj" BenchmarkBinary="PowerShell.Benchmarks.dll" />
255254
</ItemGroup>
256255
<ItemGroup Condition="'$(CollectionName)' == 'realworld' and '$(AGENT_OS)' != 'Windows_NT'">
257256
<BDN_Partition Include="Partition0" BenchmarkPath="src/benchmarks/real-world/bepuphysics2/DemoBenchmarks.csproj" BenchmarkBinary="DemoBenchmarks.dll" />
258-
<BDN_Partition Include="Partition1" BenchmarkPath="src/benchmarks/real-world/FSharp/FSharp.fsproj" BenchmarkBinary="FSharp.dll" />
259-
<BDN_Partition Include="Partition2" BenchmarkPath="src/benchmarks/real-world/ILLink/ILLinkBenchmarks.csproj" BenchmarkBinary="ILLinkBenchmarks.dll" />
260-
<BDN_Partition Include="Partition3" BenchmarkPath="src/benchmarks/real-world/ImageSharp/ImageSharp.Benchmarks.csproj" BenchmarkBinary="ImageSharp.Benchmarks.dll" />
261-
<BDN_Partition Include="Partition4" BenchmarkPath="src/benchmarks/real-world/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj" BenchmarkBinary="Microsoft.ML.Benchmarks.dll" />
262-
<BDN_Partition Include="Partition5" BenchmarkPath="src/benchmarks/real-world/Roslyn/CompilerBenchmarks.csproj" BenchmarkBinary="CompilerBenchmarks.dll" />
263-
<BDN_Partition Include="Partition6" BenchmarkPath="src/benchmarks/real-world/PowerShell.Benchmarks/PowerShell.Benchmarks.csproj" BenchmarkBinary="PowerShell.Benchmarks.dll" />
257+
<BDN_Partition Include="Partition1" BenchmarkPath="src/benchmarks/real-world/ILLink/ILLinkBenchmarks.csproj" BenchmarkBinary="ILLinkBenchmarks.dll" />
258+
<BDN_Partition Include="Partition2" BenchmarkPath="src/benchmarks/real-world/ImageSharp/ImageSharp.Benchmarks.csproj" BenchmarkBinary="ImageSharp.Benchmarks.dll" />
259+
<BDN_Partition Include="Partition3" BenchmarkPath="src/benchmarks/real-world/Microsoft.ML.Benchmarks/Microsoft.ML.Benchmarks.csproj" BenchmarkBinary="Microsoft.ML.Benchmarks.dll" />
260+
<BDN_Partition Include="Partition4" BenchmarkPath="src/benchmarks/real-world/Roslyn/CompilerBenchmarks.csproj" BenchmarkBinary="CompilerBenchmarks.dll" />
261+
<BDN_Partition Include="Partition5" BenchmarkPath="src/benchmarks/real-world/PowerShell.Benchmarks/PowerShell.Benchmarks.csproj" BenchmarkBinary="PowerShell.Benchmarks.dll" />
264262
</ItemGroup>
265263

266264
<ItemGroup Condition="'$(CollectionName)' != 'benchmarks' and '$(CollectionName)' != 'realworld'">

0 commit comments

Comments
 (0)