Skip to content

Commit 3321dd6

Browse files
pavelsavarapavelsavara
authored
Merge branch 'main' into wasi_testing
2 parents 6136d63 + 6e68f92 commit 3321dd6

File tree

103 files changed

+1707
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1707
-570
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "9.0.0-prerelease.24420.3",
18+
"version": "9.0.0-prerelease.24452.1",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,17 @@
316316
<Uri>https://github.com/dotnet/runtime</Uri>
317317
<Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
318318
</Dependency>
319-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24420.3">
319+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24452.1">
320320
<Uri>https://github.com/dotnet/xharness</Uri>
321-
<Sha>69f15217657bc3a7f0102911aa967525529fdfdb</Sha>
321+
<Sha>c2215b88cdac5390888de3e6ad301c113f40ed6c</Sha>
322322
</Dependency>
323-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24420.3">
323+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24452.1">
324324
<Uri>https://github.com/dotnet/xharness</Uri>
325-
<Sha>69f15217657bc3a7f0102911aa967525529fdfdb</Sha>
325+
<Sha>c2215b88cdac5390888de3e6ad301c113f40ed6c</Sha>
326326
</Dependency>
327-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24420.3">
327+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24452.1">
328328
<Uri>https://github.com/dotnet/xharness</Uri>
329-
<Sha>69f15217657bc3a7f0102911aa967525529fdfdb</Sha>
329+
<Sha>c2215b88cdac5390888de3e6ad301c113f40ed6c</Sha>
330330
</Dependency>
331331
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24423.2">
332332
<Uri>https://github.com/dotnet/arcade</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@
180180
<!-- Testing -->
181181
<MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
182182
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
183-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24420.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
184-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24420.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
185-
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24420.3</MicrosoftDotNetXHarnessCLIVersion>
183+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24452.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
184+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24452.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
185+
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24452.1</MicrosoftDotNetXHarnessCLIVersion>
186186
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24419.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
187187
<NUnitVersion>3.12.0</NUnitVersion>
188188
<NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>

‎eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ steps:
6868
displayName: "AOT compile CoreCLR tests"
6969
target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
7070
- ${{ if in(parameters.runtimeVariant, 'llvmfullaot', 'minifullaot') }}:
71-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:1
71+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:2
7272
displayName: "AOT compile CoreCLR tests"
7373
target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
7474
- ${{ if eq(parameters.archType, 'arm64') }}:

‎eng/pipelines/coreclr/templates/run-performance-job.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ jobs:
7878
export NODE_MAJOR=18 &&
7979
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list &&
8080
sudo apt-get update &&
81+
sudo apt autoremove -y &&
8182
sudo apt-get install nodejs -y &&
8283
test -n "$(V8Version)" &&
8384
npm install --prefix $HELIX_WORKITEM_PAYLOAD jsvu -g &&

‎eng/pipelines/libraries/stress/http.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ extends:
9999
displayName: Docker NanoServer
100100
timeoutInMinutes: 150
101101
variables:
102-
DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share"
102+
# This will get assigned to the DUMPS_SHARE_MOUNT_ROOT environment
103+
# variable in the stress test script. We need to keep the
104+
# DUMPS_SHARE_MOUNT_ROOT variable empty during the build step.
105+
DUMPS_SHARE_MOUNT_ROOT_PATH: "C:/dumps-share"
103106

104107
# The 1es-windows-2022-open image has an issue where the Chocolatey-installed V1 docker-compose takes precendence over the
105108
# V2 docker-compose required by the stress tests, see: https://github.com/actions/runner-images/issues/7080
@@ -140,6 +143,7 @@ extends:
140143
141144
- powershell: |
142145
cd '$(httpStressProject)'
146+
$env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
143147
$env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/3.0"
144148
$env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/3.0"
145149
New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory
@@ -152,6 +156,7 @@ extends:
152156
153157
- powershell: |
154158
cd '$(httpStressProject)'
159+
$env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
155160
$env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/2.0"
156161
$env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/2.0"
157162
New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory
@@ -164,6 +169,7 @@ extends:
164169
165170
- powershell: |
166171
cd '$(httpStressProject)'
172+
$env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
167173
$env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/1.1"
168174
$env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/1.1"
169175
New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory

‎eng/pipelines/runtime-llvm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ extends:
144144
nameSuffix: AllSubsets_Mono_LLVMFULLAOT_RuntimeTests
145145
runtimeVariant: llvmfullaot
146146
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) /p:MonoEnableLLVM=true
147-
timeoutInMinutes: 360
147+
timeoutInMinutes: 400
148148
condition: >-
149149
or(
150150
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -191,7 +191,7 @@ extends:
191191
nameSuffix: AllSubsets_Mono_LLVMFULLAOT_RuntimeIntrinsicsTests
192192
runtimeVariant: llvmfullaot
193193
buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) /p:MonoEnableLLVM=true
194-
timeoutInMinutes: 360
194+
timeoutInMinutes: 400
195195
condition: >-
196196
or(
197197
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),

‎src/coreclr/gc/gc.cpp‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,43 @@
1616
// allocation helpers in gcscan.cpp
1717
//
1818

19+
#include "common.h"
20+
#include "gcenv.h"
21+
22+
#include "gc.h"
23+
#include "gcscan.h"
24+
#include "gcdesc.h"
25+
#include "softwarewritewatch.h"
26+
#include "handletable.h"
27+
#include "handletable.inl"
28+
#include "gcenv.inl"
29+
#include "gceventstatus.h"
30+
31+
#ifdef __INTELLISENSE__
32+
#if defined(FEATURE_SVR_GC)
33+
34+
#define SERVER_GC 1
35+
36+
#else // defined(FEATURE_SVR_GC)
37+
38+
#ifdef SERVER_GC
39+
#undef SERVER_GC
40+
#endif
41+
42+
#endif // defined(FEATURE_SVR_GC)
43+
#endif // __INTELLISENSE__
44+
45+
#ifdef TARGET_AMD64
46+
#include "vxsort/do_vxsort.h"
47+
#endif
48+
49+
#ifdef SERVER_GC
50+
namespace SVR {
51+
#else // SERVER_GC
52+
namespace WKS {
53+
#endif // SERVER_GC
54+
55+
#include "gcimpl.h"
1956
#include "gcpriv.h"
2057

2158
#ifdef TARGET_AMD64
@@ -53401,3 +53438,5 @@ size_t gc_heap::get_mark_array_size (heap_segment* seg)
5340153438
return 0;
5340253439
}
5340353440
#endif //USE_REGIONS
53441+
53442+
}

‎src/coreclr/gc/gcee.cpp‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,35 @@
77

88
// sets up vars for GC
99

10+
#include "common.h"
11+
#include "gcenv.h"
12+
13+
#include "gc.h"
14+
#include "gcscan.h"
15+
#include "gchandletableimpl.h"
16+
#include "gceventstatus.h"
17+
18+
#ifdef __INTELLISENSE__
19+
#if defined(FEATURE_SVR_GC)
20+
21+
#define SERVER_GC 1
22+
23+
#else // defined(FEATURE_SVR_GC)
24+
25+
#ifdef SERVER_GC
26+
#undef SERVER_GC
27+
#endif
28+
29+
#endif // defined(FEATURE_SVR_GC)
30+
#endif // __INTELLISENSE__
31+
32+
#ifdef SERVER_GC
33+
namespace SVR {
34+
#else // SERVER_GC
35+
namespace WKS {
36+
#endif // SERVER_GC
37+
38+
#include "gcimpl.h"
1039
#include "gcpriv.h"
1140

1241
#ifndef DACCESS_COMPILE
@@ -540,4 +569,4 @@ uint64_t GCHeap::GetGenerationBudget(int generation)
540569

541570
#endif // !DACCESS_COMPILE
542571

543-
572+
}

‎src/coreclr/gc/gceesvr.cpp‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,7 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
5-
6-
#include "common.h"
7-
84
#if defined(FEATURE_SVR_GC)
9-
10-
#include "gcenv.h"
11-
12-
#include "gc.h"
13-
#include "gcscan.h"
14-
#include "gchandletableimpl.h"
15-
#include "gceventstatus.h"
16-
175
#define SERVER_GC 1
18-
19-
20-
namespace SVR {
21-
#include "gcimpl.h"
226
#include "gcee.cpp"
23-
}
24-
257
#endif // FEATURE_SVR_GC

0 commit comments

Comments
 (0)