Skip to content

Commit f6524cc

Browse files
noahfalknoahfalk
authored
Merge branch 'main' into eventpipe_metadata_tests
2 parents 6ae708d + d3dffb9 commit f6524cc

File tree

110 files changed

+1845
-5666
lines changed

Some content is hidden

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

110 files changed

+1845
-5666
lines changed

‎eng/pipelines/coreclr/hardware-intrinsics.yml‎

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
trigger: none
2+
pr:
3+
branches:
4+
include:
5+
- main
6+
paths:
7+
include:
8+
- eng/pipelines/**
9+
- src/coreclr/jit/**
10+
- src/tests/Common/GenerateHWIntrinsicTests/**
11+
- src/tests/JIT/HardwareIntrinsics/**
12+
13+
variables:
14+
- template: /eng/pipelines/common/variables.yml
15+
16+
extends:
17+
template: /eng/pipelines/common/templates/pipeline-with-resources.yml
18+
parameters:
19+
isOfficialBuild: false
20+
stages:
21+
- stage: Build
22+
jobs:
23+
- template: /eng/pipelines/common/platform-matrix.yml
24+
parameters:
25+
jobTemplate: /eng/pipelines/common/global-build-job.yml
26+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
27+
buildConfig: Release
28+
platforms:
29+
- windows_x86
30+
- windows_x64
31+
variables:
32+
- name: timeoutPerTestInMinutes
33+
value: 60
34+
- name: timeoutPerTestCollectionInMinutes
35+
value: 180
36+
jobParameters:
37+
testGroup: outerloop
38+
nameSuffix: CoreCLR
39+
buildArgs: -s clr+libs -c $(_BuildConfig)
40+
timeoutInMinutes: 360
41+
postBuildSteps:
42+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
43+
parameters:
44+
creator: dotnet-bot
45+
testBuildArgs: 'tree JIT/HardwareIntrinsics'
46+
testRunNamePrefixSuffix: CoreCLR
47+
extraVariablesTemplates:
48+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
49+
parameters:
50+
testGroup: outerloop
51+
52+
- template: /eng/pipelines/common/platform-matrix.yml
53+
parameters:
54+
jobTemplate: /eng/pipelines/common/global-build-job.yml
55+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
56+
buildConfig: Release
57+
platforms:
58+
- linux_arm
59+
- linux_x64
60+
- osx_arm64
61+
variables:
62+
- name: timeoutPerTestInMinutes
63+
value: 60
64+
- name: timeoutPerTestCollectionInMinutes
65+
value: 180
66+
jobParameters:
67+
testGroup: outerloop
68+
nameSuffix: CoreCLR
69+
buildArgs: -s clr+libs -c $(_BuildConfig)
70+
timeoutInMinutes: 360
71+
postBuildSteps:
72+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
73+
parameters:
74+
creator: dotnet-bot
75+
testBuildArgs: '-tree:JIT/HardwareIntrinsics'
76+
testRunNamePrefixSuffix: CoreCLR
77+
extraVariablesTemplates:
78+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
79+
parameters:
80+
testGroup: outerloop
81+
82+
- template: /eng/pipelines/common/platform-matrix.yml
83+
parameters:
84+
jobTemplate: /eng/pipelines/common/global-build-job.yml
85+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
86+
buildConfig: Release
87+
platforms:
88+
- windows_x86
89+
- windows_x64
90+
variables:
91+
- name: timeoutPerTestInMinutes
92+
value: 60
93+
- name: timeoutPerTestCollectionInMinutes
94+
value: 180
95+
jobParameters:
96+
testGroup: outerloop
97+
nameSuffix: NativeAOT
98+
buildArgs: -s clr.aot+libs.native+libs.sfx -c $(_BuildConfig)
99+
timeoutInMinutes: 360
100+
postBuildSteps:
101+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
102+
parameters:
103+
creator: dotnet-bot
104+
testBuildArgs: 'tree JIT/HardwareIntrinsics'
105+
testRunNamePrefixSuffix: NativeAOT
106+
nativeAotTest: true
107+
extraVariablesTemplates:
108+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
109+
parameters:
110+
testGroup: outerloop
111+
112+
- template: /eng/pipelines/common/platform-matrix.yml
113+
parameters:
114+
jobTemplate: /eng/pipelines/common/global-build-job.yml
115+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
116+
buildConfig: Release
117+
platforms:
118+
- linux_arm
119+
- linux_x64
120+
- osx_arm64
121+
variables:
122+
- name: timeoutPerTestInMinutes
123+
value: 60
124+
- name: timeoutPerTestCollectionInMinutes
125+
value: 180
126+
jobParameters:
127+
testGroup: outerloop
128+
nameSuffix: NativeAOT
129+
buildArgs: -s clr.aot+libs.native+libs.sfx -c $(_BuildConfig)
130+
timeoutInMinutes: 360
131+
postBuildSteps:
132+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
133+
parameters:
134+
creator: dotnet-bot
135+
testBuildArgs: '-tree:JIT/HardwareIntrinsics'
136+
testRunNamePrefixSuffix: NativeAOT
137+
nativeAotTest: true
138+
extraVariablesTemplates:
139+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
140+
parameters:
141+
testGroup: outerloop

‎eng/pipelines/runtime.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ extends:
604604
- template: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
605605
parameters:
606606
creator: dotnet-bot
607-
testBuildArgs: 'nativeaot tree ";nativeaot;Loader;Interop;JIT/HardwareIntrinsics;" /p:BuildNativeAotFrameworkObjects=true'
607+
testBuildArgs: 'nativeaot tree ";nativeaot;Loader;Interop;" /p:BuildNativeAotFrameworkObjects=true'
608608
liveLibrariesBuildConfig: Release
609609
testRunNamePrefixSuffix: NativeAOT_$(_BuildConfig)
610610
extraVariablesTemplates:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,9 @@
235235
<Compile Include="$(BclSourcesRoot)\System\StubHelpers.cs" />
236236
<Compile Include="$(BclSourcesRoot)\System\Text\StringBuilder.CoreCLR.cs" />
237237
<Compile Include="$(BclSourcesRoot)\System\Threading\Interlocked.CoreCLR.cs" />
238+
<Compile Include="$(BclSourcesRoot)\System\Threading\ManagedThreadId.CoreCLR.cs" />
238239
<Compile Include="$(BclSourcesRoot)\System\Threading\Monitor.CoreCLR.cs" />
240+
<Compile Include="$(BclSourcesRoot)\System\Threading\ObjectHeader.CoreCLR.cs" />
239241
<Compile Include="$(BclSourcesRoot)\System\Threading\SynchronizationContext.CoreCLR.cs" />
240242
<Compile Include="$(BclSourcesRoot)\System\Threading\Thread.CoreCLR.cs" />
241243
<Compile Include="$(BclSourcesRoot)\System\Threading\WaitHandle.CoreCLR.cs" />

‎src/coreclr/System.Private.CoreLib/src/System/Environment.CoreCLR.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private static unsafe string[] InitializeCommandLineArgs(char* exePath, int argc
104104
}
105105

106106
[LibraryImport(RuntimeHelpers.QCall, EntryPoint = "Environment_GetProcessorCount")]
107-
private static partial int GetProcessorCount();
107+
internal static partial int GetProcessorCount();
108108

109109
// Used by VM
110110
internal static string? GetResourceStringLocal(string key) => SR.GetResourceString(key);

‎src/coreclr/System.Private.CoreLib/src/System/Threading/ManagedThreadId.CoreCLR.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
4+
using System.Diagnostics;
5+
6+
namespace System.Threading
7+
{
8+
internal static class ManagedThreadId
9+
{
10+
// This will be initialized by the runtime.
11+
[ThreadStatic]
12+
private static int t_currentManagedThreadId;
13+
internal static int CurrentManagedThreadIdUnchecked => t_currentManagedThreadId;
14+
15+
public static int Current => t_currentManagedThreadId;
16+
}
17+
}

0 commit comments

Comments
 (0)