Skip to content
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

[wasm] Fix perf pipeline runs #93688

Merged
merged 5 commits into from
Oct 20, 2023
Merged

[wasm] Fix perf pipeline runs #93688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a231d4a
[wasm] perf: Copy targeting pack nuget also for perf pipeline
radical Oct 18, 2023
a40db02
[wasm] perf: remove workaround added for 8.0 to 9.0 transition
radical Oct 18, 2023
ebdce82
Merge branch 'dotnet:main' into perf-nugets-ci
radical Oct 19, 2023
d59be81
Use built-nugets as an additional nuget source, for microbenchmarks
radical Oct 19, 2023
ee917e7
perf CI: run only a few benchmarks when running for sanity check
radical Oct 20, 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
8 changes: 4 additions & 4 deletions eng/pipelines/coreclr/perf-wasm-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ jobs:
logicalmachine: 'perftiger'
javascriptEngine: 'v8'
# For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm)
additionalSetupParameters: '--dotnet-versions 8.0.0'
#additionalSetupParameters: '--dotnet-versions 8.0.0'
collectHelixLogsScript: ${{ parameters.collectHelixLogsScript }}
compare: ${{ parameters.compare }}
onlySanityCheck: ${{ parameters.onlySanityCheck }}
Expand All @@ -145,7 +145,7 @@ jobs:
logicalmachine: 'perftiger'
javascriptEngine: 'v8'
# For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm)
additionalSetupParameters: '--dotnet-versions 8.0.0' # passed to ci_setup.py
#additionalSetupParameters: '--dotnet-versions 8.0.0' # passed to ci_setup.py
collectHelixLogsScript: ${{ parameters.collectHelixLogsScript }}
compare: ${{ parameters.compare }}
onlySanityCheck: ${{ parameters.onlySanityCheck }}
Expand All @@ -169,7 +169,7 @@ jobs:
runKind: blazor_scenarios
runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
# For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm)
additionalSetupParameters: '--dotnetversions 8.0.0' # passed to performance-setup.sh
#additionalSetupParameters: '--dotnetversions 8.0.0' # passed to performance-setup.sh
logicalmachine: 'perftiger'
downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }}
perfForkToUse: ${{ parameters.perfForkToUse }}
Expand All @@ -192,7 +192,7 @@ jobs:
runKind: blazor_scenarios
runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml
# For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm)
additionalSetupParameters: '--dotnetversions 8.0.0' # passed to performance-setup.sh
#additionalSetupParameters: '--dotnetversions 8.0.0' # passed to performance-setup.sh
logicalmachine: 'perftiger'
downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }}
perfForkToUse: ${{ parameters.perfForkToUse }}
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ steps:
cp -r $(Build.SourcesDirectory)/artifacts/bin/dotnet-latest $(Build.SourcesDirectory)/artifacts/staging &&
cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.runtime.browser-wasm $(Build.SourcesDirectory)/artifacts/staging &&
cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.ref $(Build.SourcesDirectory)/artifacts/staging &&
cp -r $(Build.SourcesDirectory)/artifacts/packages/${{ parameters.configForBuild }}/Shipping/Microsoft.NET.Sdk.WebAssembly.Pack* $(Build.SourcesDirectory)/artifacts/staging/built-nugets
cp -r $(Build.SourcesDirectory)/artifacts/packages/${{ parameters.configForBuild }}/Shipping/Microsoft.NET.Sdk.WebAssembly.Pack* $(Build.SourcesDirectory)/artifacts/staging/built-nugets &&
cp -r $(Build.SourcesDirectory)/artifacts/packages/${{ parameters.configForBuild }}/Shipping/Microsoft.NETCore.App.Ref* $(Build.SourcesDirectory)/artifacts/staging/built-nugets
displayName: "Prepare artifacts staging directory"

- template: /eng/pipelines/common/upload-artifact-step.yml
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/coreclr/templates/run-performance-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ jobs:
- HelixPreCommandsWasmOnLinux: echo
- HelixPreCommandStemWindows: 'set ORIGPYPATH=%PYTHONPATH%;py -m pip install -U pip;py -3 -m venv %HELIX_WORKITEM_PAYLOAD%\.venv;call %HELIX_WORKITEM_PAYLOAD%\.venv\Scripts\activate.bat;set PYTHONPATH=;py -3 -m pip install -U pip;py -3 -m pip install urllib3==1.26.15;py -3 -m pip install azure.storage.blob==12.0.0;py -3 -m pip install azure.storage.queue==12.0.0;set "PERFLAB_UPLOAD_TOKEN=$(HelixPerfUploadTokenValue)"'
- HelixPreCommandStemLinux: >-
export RestoreAdditionalProjectSources=$HELIX_CORRELATION_PAYLOAD/built-nugets
export ORIGPYPATH=$PYTHONPATH
export CRYPTOGRAPHY_ALLOW_OPENSSL_102=true;
echo "** Installing prerequistes **";
Expand Down
2 changes: 2 additions & 0 deletions eng/testing/performance/microbenchmarks.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
<PropertyGroup>
<WorkItemTimeout>6:00</WorkItemTimeout>
<WorkItemTimeout Condition="'$(OnlySanityCheck)' == 'true'">1:30</WorkItemTimeout>

<ExtraBenchmarkDotNetArguments Condition="'$(OnlySanityCheck)' == 'true'">$(ExtraBenchmarkDotNetArguments) --filter System.Tests.Perf_*</ExtraBenchmarkDotNetArguments>
</PropertyGroup>

<ItemGroup>
Expand Down