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

Jump to bottom

[wasm] Modify workload to pick threading runtime packs #72412

Merged
merged 7 commits into from
Jul 27, 2022
Merged

[wasm] Modify workload to pick threading runtime packs #72412

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
279bb62
[wasm] Modify workload to pick threading runtime packs
Jul 18, 2022
0f9e3b4
Add error condition when both WasmEnableThreading and WasmEnablePerfT…
Jul 19, 2022
d6e57a4
[wasm] Set default value for MonoWasmBuildVariant, for runtime pack n…
radical Jul 26, 2022
6efec93
[wasm] Wasm.Build.Tests: add support for multiple runtime packs
radical Jul 26, 2022
ec9f701
Merge remote-tracking branch 'origin/main' into resolve-wasm-mt-packs
radical Jul 27, 2022
0fa442f
[wasm] Wasm.Build.Tests: build runtime pack nugets with different names
radical Jul 27, 2022
32d220c
fix comment
radical Jul 27, 2022
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
12 changes: 11 additions & 1 deletion src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
"wasm-experimental": {
"description": ".NET WebAssembly experimental",
"packs": [
"Microsoft.NET.Runtime.WebAssembly.Templates"
"Microsoft.NET.Runtime.WebAssembly.Templates",
"Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm",
"Microsoft.NETCore.App.Runtime.Mono.perftrace.browser-wasm"
],
"extends": [ "wasm-tools" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
Expand Down Expand Up @@ -367,6 +369,14 @@
"kind": "framework",
"version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.Mono.multithread.browser-wasm" : {
"kind": "framework",
"version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.Mono.perftrace.browser-wasm" : {
"kind": "framework",
"version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.win-x64" : {
"kind": "framework",
"version": "${PackageVersion}"
Expand Down
3 changes: 3 additions & 0 deletions src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@
<ItemGroup Condition="'$(_MonoWorkloadTargetsMobile)' == 'true'">
<KnownRuntimePack Update="@(KnownRuntimePack)">
<LatestRuntimeFrameworkVersion Condition="'%(KnownRuntimePack.TargetFramework)' == '${NetCoreAppCurrent}' and '%(KnownRuntimePack.RuntimePackLabels)' == 'Mono'">**FromWorkload**</LatestRuntimeFrameworkVersion>
<!-- Overrides for wasm threading support -->
<RuntimePackNamePatterns Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(WasmEnableThreading)' == 'true'">Microsoft.NETCore.App.Runtime.Mono.multithread.**RID**</RuntimePackNamePatterns>
<RuntimePackNamePatterns Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(WasmEnablePerfTrace)' == 'true'">Microsoft.NETCore.App.Runtime.Mono.perftrace.**RID**</RuntimePackNamePatterns>
Comment on lines +92 to +93
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can both of these be true or do we only allow perf trace on a single threaded userspace? do we need another mt perftrace runtime pack?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perftrace is single threaded userspace, multi-threaded runtime. Do you think we should error if both are true?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is probably fine for the moment we may want to have something like named configs once this is supported.

</KnownRuntimePack>
</ItemGroup>

Expand Down