Skip to content

Commit 675336c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200803.5 (#24737)
[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20374.1 to 5.0.0-beta.20403.5 - Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20374.1 to 5.0.0-beta.20403.5
1 parent fa0cb71 commit 675336c

File tree

9 files changed

+123
-70
lines changed

9 files changed

+123
-70
lines changed

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,13 +305,13 @@
305305
<Uri>https://github.com/dotnet/runtime</Uri>
306306
<Sha>9b2f548c3b0da290bc57f1a0460cd0c5c408095e</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20374.1">
308+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20403.5">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
310+
<Sha>7385e2722b9fa517314aa5db1fa598a8d417b3c7</Sha>
311311
</Dependency>
312-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20374.1">
312+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20403.5">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
314+
<Sha>7385e2722b9fa517314aa5db1fa598a8d417b3c7</Sha>
315315
</Dependency>
316316
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20379.3">
317317
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/common/cross/arm64/tizen-fetch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic lin
161161
Inform "fetch coreclr packages"
162162
fetch_tizen_pkgs aarch64 lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
163163
Inform "fetch corefx packages"
164-
fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl1.1-devel krb5 krb5-devel
164+
fetch_tizen_pkgs aarch64 libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165165

166166
Inform "Initialize standard unified"
167167
fetch_tizen_pkgs_init standard unified

‎eng/common/cross/armel/tizen-fetch.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
5151
mkdir -p $TMPDIR
5252
fi
5353

54-
TIZEN_URL=http://download.tizen.org/releases/milestone/tizen
54+
TIZEN_URL=http://download.tizen.org/snapshots/tizen
5555
BUILD_XML=build.xml
5656
REPOMD_XML=repomd.xml
5757
PRIMARY_XML=primary.xml
@@ -157,12 +157,11 @@ fetch_tizen_pkgs()
157157
Inform "Initialize arm base"
158158
fetch_tizen_pkgs_init standard base
159159
Inform "fetch common packages"
160-
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic
161-
fetch_tizen_pkgs noarch linux-glibc-devel
160+
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
162161
Inform "fetch coreclr packages"
163162
fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
164163
Inform "fetch corefx packages"
165-
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel
164+
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
166165

167166
Inform "Initialize standard unified"
168167
fetch_tizen_pkgs_init standard unified

‎eng/common/cross/toolchain.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
1515
set(CMAKE_SYSTEM_PROCESSOR armv7l)
1616
set(TOOLCHAIN "arm-linux-gnueabi")
1717
if("$ENV{__DistroRid}" MATCHES "tizen.*")
18-
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/6.2.1")
18+
set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0")
1919
endif()
2020
elseif(TARGET_ARCH_NAME STREQUAL "arm")
2121
set(CMAKE_SYSTEM_PROCESSOR armv7l)

‎eng/common/performance/crossgen_perf.proj

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
2+
3+
<PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
4+
<Python>py -3</Python>
5+
<HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD%</HelixPreCommands>
6+
<ArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts</ArtifactsDirectory>
7+
<BaseDirectory>$HELIX_CORRELATION_PAYLOAD</BaseDirectory>
8+
<PerformanceDirectory>$(BaseDirectory)/performance</PerformanceDirectory>
9+
</PropertyGroup>
10+
11+
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
12+
<WorkItemCommand>$(PerformanceDirectory)/scripts/benchmarks_ci.py --csproj $(PerformanceDirectory)/$(TargetCsproj)</WorkItemCommand>
13+
<CliArguments>--dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP</CliArguments>
14+
<Python>python3</Python>
15+
<CoreRun>$(BaseDirectory)/Core_Root/corerun</CoreRun>
16+
<HelixPreCommands>$(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh</HelixPreCommands>
17+
<ArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts</ArtifactsDirectory>
18+
<BaselineArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts_Baseline</BaselineArtifactsDirectory>
19+
<ResultsComparer>$(PerformanceDirectory)/src/tools/ResultsComparer/ResultsComparer.csproj</ResultsComparer>
20+
<DotnetExe>$(PerformanceDirectory)/tools/dotnet/$(Architecture)/dotnet</DotnetExe>
21+
<Percent>%25</Percent>
22+
<XMLResults>$HELIX_WORKITEM_ROOT/testResults.xml</XMLResults>
23+
</PropertyGroup>
24+
25+
<ItemGroup>
26+
<HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)">
27+
<PayloadDirectory>%(Identity)</PayloadDirectory>
28+
</HelixCorrelationPayload>
29+
</ItemGroup>
30+
31+
<ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
32+
<HelixWorkItem Include="Crossgen System.Private.Xml.dll">
33+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
34+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
35+
</HelixWorkItem>
36+
<HelixWorkItem Include="Crossgen System.Linq.Expressions.dll">
37+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
38+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
39+
</HelixWorkItem>
40+
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.VisualBasic.dll">
41+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
42+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
43+
</HelixWorkItem>
44+
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.CSharp.dll">
45+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
46+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
47+
</HelixWorkItem>
48+
<HelixWorkItem Include="Crossgen System.Private.CoreLib.dll">
49+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
50+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
51+
</HelixWorkItem>
52+
</ItemGroup>
53+
54+
<ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT' and '$(Architecture)' == 'x64'">
55+
<HelixWorkItem Include="Crossgen2 System.Private.Xml.dll">
56+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
57+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
58+
</HelixWorkItem>
59+
<HelixWorkItem Include="Crossgen2 System.Linq.Expressions.dll">
60+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
61+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
62+
</HelixWorkItem>
63+
<HelixWorkItem Include="Crossgen2 Microsoft.CodeAnalysis.VisualBasic.dll">
64+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
65+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
66+
</HelixWorkItem>
67+
<HelixWorkItem Include="Crossgen2 Microsoft.CodeAnalysis.CSharp.dll">
68+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
69+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
70+
</HelixWorkItem>
71+
<HelixWorkItem Include="Crossgen2 System.Private.CoreLib.dll">
72+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
73+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
74+
</HelixWorkItem>
75+
<HelixWorkItem Include="Crossgen2 Composite Framework R2R">
76+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
77+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --composite %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\framework-r2r.dll.rsp --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
78+
<Timeout>1:00</Timeout>
79+
</HelixWorkItem>
80+
</ItemGroup>
81+
</Project>

‎eng/common/performance/perfhelixpublish.proj renamed to ‎eng/common/performance/microbenchmarks.proj

Lines changed: 4 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<XMLResults>$HELIX_WORKITEM_ROOT/testResults.xml</XMLResults>
4242
</PropertyGroup>
4343

44+
<PropertyGroup Condition="'$(WasmDotnet)' == 'true'">
45+
<CliArguments>$(CliArguments) --wasm</CliArguments>
46+
</PropertyGroup>
47+
4448
<PropertyGroup Condition="'$(MonoDotnet)' == 'true' and '$(AGENT_OS)' == 'Windows_NT'">
4549
<CoreRunArgument>--corerun %HELIX_CORRELATION_PAYLOAD%\dotnet-mono\shared\Microsoft.NETCore.App\5.0.0\corerun.exe</CoreRunArgument>
4650
</PropertyGroup>
@@ -137,56 +141,4 @@
137141
<Timeout>4:00</Timeout>
138142
</HelixWorkItem>
139143
</ItemGroup>
140-
141-
<ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
142-
<HelixWorkItem Include="Crossgen System.Private.Xml.dll">
143-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
144-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
145-
</HelixWorkItem>
146-
<HelixWorkItem Include="Crossgen System.Linq.Expressions.dll">
147-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
148-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
149-
</HelixWorkItem>
150-
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.VisualBasic.dll">
151-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
152-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
153-
</HelixWorkItem>
154-
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.CSharp.dll">
155-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
156-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
157-
</HelixWorkItem>
158-
<HelixWorkItem Include="Crossgen System.Private.CoreLib.dll">
159-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
160-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
161-
</HelixWorkItem>
162-
</ItemGroup>
163-
164-
<ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT' and '$(Architecture)' == 'x64'">
165-
<HelixWorkItem Include="Crossgen2 System.Private.Xml.dll">
166-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
167-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
168-
</HelixWorkItem>
169-
<HelixWorkItem Include="Crossgen2 System.Linq.Expressions.dll">
170-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
171-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
172-
</HelixWorkItem>
173-
<HelixWorkItem Include="Crossgen2 Microsoft.CodeAnalysis.VisualBasic.dll">
174-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
175-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
176-
</HelixWorkItem>
177-
<HelixWorkItem Include="Crossgen2 Microsoft.CodeAnalysis.CSharp.dll">
178-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
179-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
180-
</HelixWorkItem>
181-
<HelixWorkItem Include="Crossgen2 System.Private.CoreLib.dll">
182-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
183-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
184-
</HelixWorkItem>
185-
<HelixWorkItem Include="Crossgen2 Composite Framework R2R">
186-
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
187-
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --composite %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\framework-r2r.dll.rsp --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
188-
<Timeout>1:00</Timeout>
189-
</HelixWorkItem>
190-
191-
</ItemGroup>
192144
</Project>

‎eng/common/performance/performance-setup.sh

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ run_from_perf_repo=false
2424
use_core_run=true
2525
use_baseline_core_run=true
2626
using_mono=false
27+
wasm_runtime_loc=
28+
using_wasm=false
2729

2830
while (($# > 0)); do
2931
lowerI="$(echo $1 | awk '{print tolower($0)}')"
@@ -70,7 +72,7 @@ while (($# > 0)); do
7072
;;
7173
--kind)
7274
kind=$2
73-
configurations="CompliationMode=$compilation_mode RunKind=$kind"
75+
configurations="CompilationMode=$compilation_mode RunKind=$kind"
7476
shift 2
7577
;;
7678
--runcategories)
@@ -101,6 +103,10 @@ while (($# > 0)); do
101103
mono_dotnet=$2
102104
shift 2
103105
;;
106+
--wasm)
107+
wasm_runtime_loc=$2
108+
shift 2
109+
;;
104110
--compare)
105111
compare=true
106112
shift 1
@@ -130,6 +136,7 @@ while (($# > 0)); do
130136
echo " --runcategories <value> Related to csproj. Categories of benchmarks to run. Defaults to \"coreclr corefx\""
131137
echo " --internal If the benchmarks are running as an official job."
132138
echo " --monodotnet Pass the path to the mono dotnet for mono performance testing."
139+
echo " --wasm Path to the unpacked wasm runtime pack."
133140
echo ""
134141
exit 0
135142
;;
@@ -141,7 +148,7 @@ if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-perfo
141148
fi
142149

143150
if [ -z "$configurations" ]; then
144-
configurations="CompliationMode=$compilation_mode"
151+
configurations="CompilationMode=$compilation_mode"
145152
fi
146153

147154
if [ -z "$core_root_directory" ]; then
@@ -191,11 +198,15 @@ if [[ "$mono_dotnet" != "" ]]; then
191198
configurations="$configurations LLVM=$llvm MonoInterpreter=$monointerpreter MonoAOT=$monoaot"
192199
fi
193200

201+
if [[ "$wasm_runtime_loc" != "" ]]; then
202+
configurations="CompilationMode=wasm;RunKind=micro"
203+
fi
204+
194205
if [[ "$monointerpreter" == "true" ]]; then
195-
extra_benchmark_dotnet_arguments="--category-exclusion-filter NoInterpreter"
206+
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --category-exclusion-filter NoInterpreter"
196207
fi
197208

198-
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
209+
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs \"$configurations\" --architecture $architecture"
199210
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
200211

201212

@@ -217,6 +228,13 @@ else
217228
mv $docs_directory $workitem_directory
218229
fi
219230

231+
if [[ "$wasm_runtime_loc" != "" ]]; then
232+
using_wasm=true
233+
wasm_dotnet_path=$payload_directory/dotnet-wasm
234+
mv $wasm_runtime_loc $wasm_dotnet_path
235+
extra_benchmark_dotnet_arguments="$extra_benchmark_dotnet_arguments --wasmMainJS \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm/runtime-test.js --wasmEngine /home/helixbot/.jsvu/v8 --customRuntimePack \$HELIX_CORRELATION_PAYLOAD/dotnet-wasm"
236+
fi
237+
220238
if [[ "$mono_dotnet" != "" ]]; then
221239
using_mono=true
222240
mono_dotnet_path=$payload_directory/dotnet-mono
@@ -259,3 +277,4 @@ Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable fal
259277
Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false
260278
Write-PipelineSetVariable -name "Compare" -value "$compare" -is_multi_job_variable false
261279
Write-PipelineSetVariable -name "MonoDotnet" -value "$using_mono" -is_multi_job_variable false
280+
Write-PipelineSetVariable -name "WasmDotnet" -value "$using_wasm" -is_multi_job_variable false

0 commit comments

Comments
 (0)