diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-04-05 15:17:34 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-05 15:17:34 +0300 |
commit | 5a5549fbcc56a51d18e6e861571847c7ab3a1440 (patch) | |
tree | 777e78d539ccbfa309bd58f786ffdda5f8c6c390 /eng/common | |
parent | 6d25a089a35860951e4432b656da908efb06dbec (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20210403.1 (#1939)
[main] Update dependencies from dotnet/arcade
Diffstat (limited to 'eng/common')
-rw-r--r-- | eng/common/performance/android_scenarios.proj | 34 | ||||
-rw-r--r-- | eng/common/performance/performance-setup.ps1 | 13 |
2 files changed, 46 insertions, 1 deletions
diff --git a/eng/common/performance/android_scenarios.proj b/eng/common/performance/android_scenarios.proj new file mode 100644 index 000000000..a9d4ce9eb --- /dev/null +++ b/eng/common/performance/android_scenarios.proj @@ -0,0 +1,34 @@ +<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test"> + <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'"> + <Python>python3</Python> + <HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands> + </PropertyGroup> + + <ItemGroup> + <HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)"> + <PayloadDirectory>%(Identity)</PayloadDirectory> + </HelixCorrelationPayload> + </ItemGroup> + + <PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'"> + <ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory> + </PropertyGroup> + <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'"> + <ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory> + </PropertyGroup> + + <ItemGroup> + <HelixWorkItem Include="SOD - Android HelloWorld APK Size"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)helloandroid;copy %HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + <HelixWorkItem Include="SOD - Android HelloWorld Extracted Size"> + <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> + <PreCommands>cd $(ScenarioDirectory)helloandroid;copy %HELIX_CORRELATION_PAYLOAD%\HelloAndroid.apk .;$(Python) pre.py --unzip</PreCommands> + <Command>$(Python) test.py sod --scenario-name "%(Identity)"</Command> + <PostCommands>$(Python) post.py</PostCommands> + </HelixWorkItem> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index b6324039a..b18599eda 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -19,7 +19,8 @@ Param( [switch] $Compare, [string] $MonoDotnet="", [string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind", - [string] $LogicalMachine="" + [string] $LogicalMachine="", + [switch] $AndroidMono ) $RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance") @@ -41,6 +42,7 @@ if ($Internal) { "perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } "perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" } "perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" } + "perfpixel4a" { $Queue = "Windows.10.Amd64.Pixel.Perf" } Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" } } $PerfLabArguments = "--upload-to-perflab-container" @@ -102,6 +104,15 @@ if ($UseBaselineCoreRun) { Move-Item -Path $BaselineCoreRootDirectory -Destination $NewBaselineCoreRoot } +if ($AndroidMono) { + if(!(Test-Path $WorkItemDirectory)) + { + mkdir $WorkItemDirectory + } + Copy-Item -path "$SourceDirectory\artifacts\bin\AndroidSampleApp\arm64\Release\android-arm64\publish\apk\bin\HelloAndroid.apk" $PayloadDirectory + $SetupArguments = $SetupArguments -replace $Architecture, 'arm64' +} + $DocsDir = (Join-Path $PerformanceDirectory "docs") robocopy $DocsDir $WorkItemDirectory |