Skip to content

Commit c8c3d04

Browse files
yowlyowl
committed
change FeatureWasmManagedThreads to WasmEnableThreads
1 parent b3edc51 commit c8c3d04

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

‎docs/workflow/building/coreclr/nativeaot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ build clr.aot+libs+nativeaot.packages -c Debug -a wasm -os browser -cmakeargs -D
8888
```
8989
To build the runtime tests for WASI
9090
```
91-
src\tests\build nativeaot Debug wasm tree nativeaot wasi /p:LibrariesConfiguration=debug /p:TestWrapperTargetsWindows=true /p:FeatureWasmManagedThreads=true
91+
src\tests\build nativeaot Debug wasm tree nativeaot wasi /p:LibrariesConfiguration=debug /p:TestWrapperTargetsWindows=true /p:WasmEnableThreads=true
9292
```
9393
To build the runtime tests for browser
9494
```
95-
src\tests\build nativeaot Debug wasm tree nativeaot browser /p:LibrariesConfiguration=debug /p:TestWrapperTargetsWindows=true /p:FeatureWasmManagedThreads=true /p:WasmEnableThreads=true
95+
src\tests\build nativeaot Debug wasm tree nativeaot browser /p:LibrariesConfiguration=debug /p:TestWrapperTargetsWindows=true /p:WasmEnableThreads=true
9696
```
9797

9898

‎eng/pipelines/runtimelab/runtimelab-post-build-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ steps:
3333
- ${{ if eq(parameters.archType, 'wasm') }}:
3434
- ${{ if eq(parameters.platform, 'browser_multithread_wasm_win') }}:
3535
- script: |
36-
$(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} $(crossArg) $(_officialBuildParameter) ci browser tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} /p:FeatureWasmManagedThreads=true /p:WasmEnableThreads=true
36+
$(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} $(crossArg) $(_officialBuildParameter) ci browser tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} /p:WasmEnableThreads=true
3737
displayName: Build WebAssembly browser Mutlithread runtime tests
3838
- ${{ elseif eq(parameters.platform, 'wasi_multithread_wasm_win') }}:
3939
- script: |
40-
$(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} $(crossArg) $(_officialBuildParameter) ci wasi tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} /p:FeatureWasmManagedThreads=true
40+
$(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} $(crossArg) $(_officialBuildParameter) ci wasi tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }} /p:WasmEnableThreads=true
4141
displayName: Build WebAssembly wasi Mutlithread runtime tests
4242
- ${{ else }}:
4343
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.osGroup }} $(crossArg) $(_officialBuildParameter) ci tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }}

‎src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
<PropertyGroup Condition="'$(TargetsSingleThreadedWasm)' != 'true'">
3636
<FeaturePortableThreadPool>true</FeaturePortableThreadPool>
3737
<FeaturePortableTimer>true</FeaturePortableTimer>
38+
<!-- LLVM-TODO: Remove FeatureWasmManagedThreads in favor of WasmEnableThreads. -->
3839
<FeatureWasmManagedThreads Condition="'$(WasmEnableThreads)' == 'true'">true</FeatureWasmManagedThreads>
3940
<FeatureWasmPerfTracing Condition="('$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true') and ('$(WasmEnableThreads)' == 'true')">true</FeatureWasmPerfTracing>
40-
<DefineConstants Condition="'$(FeatureWasmManagedThreads)' == 'true'">$(DefineConstants);FEATURE_WASM_MANAGED_THREADS</DefineConstants>
41+
<DefineConstants Condition="'$(WasmEnableThreads)' == 'true'">$(DefineConstants);FEATURE_WASM_MANAGED_THREADS</DefineConstants>
4142
<DefineConstants Condition="'$(FeatureWasmPerfTracing)' == 'true'">$(DefineConstants);FEATURE_WASM_PERFTRACING</DefineConstants>
4243
</PropertyGroup>
4344
<PropertyGroup>
@@ -351,8 +352,8 @@
351352
<Compile Include="System\Diagnostics\StackFrame.NativeAot.Wasm.cs" />
352353
<Compile Include="System\Diagnostics\StackFrame.NativeAot.Wasi.cs" Condition="'$(TargetsWasi)' == 'true'" />
353354
<Compile Include="System\Diagnostics\StackFrame.NativeAot.Browser.cs" Condition="'$(TargetsBrowser)' == 'true'" />
354-
<Compile Include="System\Threading\PortableThreadPool.NativeAot.Browser.cs" Condition="'$(TargetsBrowser)' == 'true' and '$(FeatureWasmManagedThreads)' == 'true'" />
355-
<Compile Include="System\Threading\ThreadPool.NativeAot.Browser.cs" Condition="'$(TargetsBrowser)' == 'true' and '$(FeatureWasmManagedThreads)' == 'true'" />
355+
<Compile Include="System\Threading\PortableThreadPool.NativeAot.Browser.cs" Condition="'$(TargetsBrowser)' == 'true' and '$(WasmEnableThreads)' == 'true'" />
356+
<Compile Include="System\Threading\ThreadPool.NativeAot.Browser.cs" Condition="'$(TargetsBrowser)' == 'true' and '$(WasmEnableThreads)' == 'true'" />
356357
</ItemGroup>
357358

358359
<!-- WASM-specific things. Keep in sync with Mono. -->

‎src/tests/Common/dirs.proj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\HelloWasm\WasmDebugging.csproj" Condition="'$(TargetOS)' == 'browser' or '$(OS)' == 'Windows_NT' or '$(Configuration)' != 'Debug'" />
3131
<DisabledProjects Include="$(TestRoot)readytorun\**\*.csproj" Condition="'$(TestBuildMode)' == 'nativeaot'" />
3232

33-
<!-- WaitForPendingFinalizers fails, FinalizeFinalizableObjects is not implemented when FeatureWasmManagedThreads. -->
34-
<DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\DynamicGenerics\DynamicGenerics.csproj" Condition="'$(FeatureWasmManagedThreads)' == 'true'"/>
33+
<!-- WaitForPendingFinalizers fails, FinalizeFinalizableObjects is not implemented when WasmEnableThreads. -->
34+
<DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\DynamicGenerics\DynamicGenerics.csproj" Condition="'$(WasmEnableThreads)' == 'true'"/>
3535
<!-- Hangs attemping to create thread. -->
36-
<DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\HelloWasm\HelloWasm.csproj" Condition="'$(FeatureWasmManagedThreads)' == 'true' and '$(TargetOS)' == 'browser'"/>
36+
<DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\HelloWasm\HelloWasm.csproj" Condition="'$(WasmEnableThreads)' == 'true' and '$(TargetOS)' == 'browser'"/>
3737
<!-- Fails with MONO_WASM: Assert failed: Expect to have one js-module-threads asset in resources -->
38-
<DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\DotnetJs\DotNetJs.App.csproj" Condition="'$(FeatureWasmManagedThreads)' == 'true' and '$(TargetOS)' == 'browser'"/>
38+
<DisabledProjects Include="$(TestRoot)nativeaot\SmokeTests\DotnetJs\DotNetJs.App.csproj" Condition="'$(WasmEnableThreads)' == 'true' and '$(TargetOS)' == 'browser'"/>
3939
</ItemGroup>
4040

4141
<ItemGroup>

‎src/tests/build.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,6 @@
490490
<GroupBuildCmd Condition="'$(MonoForceInterpreter)' == 'true'">$(GroupBuildCmd) "/p:MonoForceInterpreter=true"</GroupBuildCmd>
491491
<GroupBuildCmd Condition="'$(RunAOTCompilation)' == 'true'">$(GroupBuildCmd) "/p:RunAOTCompilation=true"</GroupBuildCmd>
492492
<GroupBuildCmd Condition="'$(DevTeamProvisioning)' != ''">$(GroupBuildCmd) "/p:DevTeamProvisioning=$(DevTeamProvisioning)"</GroupBuildCmd>
493-
<GroupBuildCmd Condition="'$(FeatureWasmManagedThreads)' != ''">$(GroupBuildCmd) "/p:FeatureWasmManagedThreads=$(FeatureWasmManagedThreads)"</GroupBuildCmd>
494493
<GroupBuildCmd Condition="'$(WasmEnableThreads)' != ''">$(GroupBuildCmd) "/p:WasmEnableThreads=$(WasmEnableThreads)"</GroupBuildCmd>
495494
</PropertyGroup>
496495

‎src/tests/nativeaot/SmokeTests/HelloWasm/HelloWasm.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RequiresProcessIsolation>true</RequiresProcessIsolation>
1111
<ReferenceXUnitWrapperGenerator>false</ReferenceXUnitWrapperGenerator>
1212
<CLRTestTargetUnsupported Condition="'$(TargetsWasm)' != 'true'">true</CLRTestTargetUnsupported>
13-
<DefineConstants Condition="'$(TargetsWasm)' == 'true' and '$(FeatureWasmManagedThreads)' == 'true'">$(DefineConstants);NO_EXPLICIT_FINALIZER</DefineConstants>
13+
<DefineConstants Condition="'$(TargetsWasm)' == 'true' and '$(WasmEnableThreads)' == 'true'">$(DefineConstants);NO_EXPLICIT_FINALIZER</DefineConstants>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

0 commit comments

Comments
 (0)