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

Setup OSX.1100.ARM64.* helix queues #47919

Merged
merged 9 commits into from
Mar 2, 2021
Merged

Setup OSX.1100.ARM64.* helix queues #47919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ddcafc8
Setup OSX.1100.ARM64.* helix queues
sdmaclea Feb 5, 2021
a1de69c
Limit OSX.1100.ARM64.* queues to CI builds until we understand capacity
sdmaclea Feb 5, 2021
783393b
For CI testing, add OSX_arm64 to the platformGroup all and gcstress
sdmaclea Feb 5, 2021
136f9a0
Run jitstress on Apple Silicon
sdmaclea Feb 24, 2021
b57b635
Enable Apple Silicon on more pipelines
sdmaclea Feb 25, 2021
6146fd2
Enable more Apple Silicon pipelines
sdmaclea Feb 25, 2021
965efb3
Fixup libraries outerloop
sdmaclea Feb 26, 2021
763770d
Disable failing Apple Silicon PAL tests
sdmaclea Feb 26, 2021
144d483
Revert "Apple Silicon disable failing PAL tests (#48782)"
sdmaclea Feb 26, 2021
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: 12 additions & 0 deletions eng/pipelines/coreclr/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ jobs:
jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml
buildConfig: checked
platformGroup: all
platforms:
# It is too early to include OSX_arm64 in platform group all
# Adding it here will enable it also
- OSX_arm64
jobParameters:
testGroup: outerloop

Expand Down Expand Up @@ -82,6 +86,10 @@ jobs:
jobTemplate: /eng/pipelines/libraries/build-job.yml
buildConfig: Release
platformGroup: all
platforms:
# It is too early to include OSX_arm64 in platform group all
# Adding it here will enable it also
- OSX_arm64
jobParameters:
isOfficialBuild: false
liveRuntimeBuildConfig: checked
Expand All @@ -107,6 +115,10 @@ jobs:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: checked
platformGroup: all
platforms:
# It is too early to include OSX_arm64 in platform group all
# Adding it here will enable it to also run this test
- OSX_arm64
helixQueueGroup: ci
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
jobParameters:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/ilasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
buildConfig: checked
platforms:
# Linux tests are built on the OSX machines.
- OSX_arm64
- OSX_x64
- Linux_arm
- Linux_arm64
Expand All @@ -51,7 +51,7 @@ jobs:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: checked
platforms:
# Linux tests are built on the OSX machines.
- OSX_arm64
- OSX_x64
- Linux_arm
- Linux_arm64
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/coreclr/jitrollingbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
jobTemplate: /eng/pipelines/coreclr/templates/build-jit-job.yml
buildConfig: checked
platforms:
- OSX_arm64
- OSX_x64
# Currently, Linux arm/arm64 machines don't have the Python 'pip3' tool, nor the azure-storage-blob package that
# is required to do the JIT upload to Azure Storage. Thus, these platforms are disabled. If we can figure out how
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/coreclr/jitstress-isas-arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ jobs:
buildConfig: checked
platforms:
- Linux_arm64
- OSX_arm64
- windows_arm64
- CoreClrTestBuildHost # Either OSX_x64 or Linux_x64
jobParameters:
Expand All @@ -37,6 +38,7 @@ jobs:
buildConfig: checked
platforms:
- Linux_arm64
- OSX_arm64
- windows_arm64
helixQueueGroup: ci
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/jitstress.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
buildConfig: checked
platforms:
# Linux tests are built on the OSX machines.
- OSX_arm64
- OSX_x64
- Linux_arm
- Linux_arm64
Expand All @@ -48,7 +48,7 @@ jobs:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: checked
platforms:
# Linux tests are built on the OSX machines.
- OSX_arm64
- OSX_x64
- Linux_arm
- Linux_arm64
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/jitstress2-jitstressregs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
buildConfig: checked
platforms:
# Linux tests are built on the OSX machines.
- OSX_arm64
- OSX_x64
- Linux_arm
- Linux_arm64
Expand All @@ -42,7 +42,7 @@ jobs:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: checked
platforms:
# Linux tests are built on the OSX machines.
- OSX_arm64
- OSX_x64
- Linux_arm
- Linux_arm64
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/jitstressregs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
buildConfig: checked
platforms:
# Linux tests are built on the OSX machines.
- OSX_arm64
- OSX_x64
- Linux_arm
- Linux_arm64
Expand All @@ -42,7 +42,7 @@ jobs:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: checked
platforms:
# Linux tests are built on the OSX machines.
- OSX_arm64
- OSX_x64
- Linux_arm
- Linux_arm64
Expand Down
8 changes: 8 additions & 0 deletions eng/pipelines/coreclr/release-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ jobs:
jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml
buildConfig: release
platformGroup: all
platforms:
# It is too early to include OSX_arm64 in platform group all
# Adding it here will enable it also
- OSX_arm64
jobParameters:
isOfficialBuild: false

Expand All @@ -42,6 +46,10 @@ jobs:
jobTemplate: /eng/pipelines/common/templates/runtimes/run-test-job.yml
buildConfig: release
platformGroup: all
platforms:
# It is too early to include OSX_arm64 in platform group all
# Adding it here will enable it also
- OSX_arm64
helixQueueGroup: ci
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
jobParameters:
Expand Down
7 changes: 7 additions & 0 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ jobs:
- (Fedora.30.Amd64)Ubuntu.1604.amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-30-helix-20200512010621-4f8cef7
- RedHat.7.Amd64

# OSX arm64
- ${{ if eq(parameters.platform, 'OSX_arm64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'ci', 'libraries')) }}:
- OSX.1100.ARM64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.1100.ARM64

# OSX x64
- ${{ if eq(parameters.platform, 'OSX_x64') }}:
- ${{ if and(eq(variables['System.TeamProject'], 'public'), in(parameters.jobParameters.helixQueueGroup, 'pr', 'ci', 'libraries')) }}:
Expand Down
5 changes: 5 additions & 0 deletions eng/pipelines/libraries/helix-queues-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ jobs:
# Limiting interp runs as we don't need as much coverage.
- Debian.9.Amd64.Open

# OSX arm64
- ${{ if eq(parameters.platform, 'OSX_arm64') }}:
sdmaclea marked this conversation as resolved.
Show resolved Hide resolved
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
Copy link
Member

Choose a reason for hiding this comment

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

I know we discussed this earlier, but I believe we should remove this condition for libraries and then instead condition the test runs in the yml entry point?

- OSX.1100.ARM64.Open

# OSX x64
- ${{ if eq(parameters.platform, 'OSX_x64') }}:
- ${{ if eq(parameters.jobParameters.isFullMatrix, true) }}:
Expand Down
5 changes: 5 additions & 0 deletions eng/pipelines/libraries/outerloop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ jobs:
- Linux_arm64
- Linux_musl_arm64
- ${{ if eq(variables['includeOsxOuterloop'], true) }}:
- ${{ if eq(variables['isFullMatrix'], true) }}:
- OSX_arm64
- OSX_x64
jobParameters:
testGroup: innerloop
Expand All @@ -55,6 +57,7 @@ jobs:
- Linux_musl_x64
- Linux_musl_arm64
- ${{ if and(eq(variables['includeOsxOuterloop'], true), eq(variables['isFullMatrix'], true)) }}:
- OSX_arm64
- OSX_x64
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
jobParameters:
Expand All @@ -76,6 +79,8 @@ jobs:
- Linux_x64
- Linux_musl_x64
- ${{ if eq(variables['includeOsxOuterloop'], true) }}:
- ${{ if eq(variables['isFullMatrix'], true) }}:
- OSX_arm64
- OSX_x64
helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
jobParameters:
Expand Down
8 changes: 0 additions & 8 deletions src/coreclr/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ void sigsegv_handler(int code, siginfo_t *siginfo, void *context)

int main(int argc, char *argv[])
{
#if defined(TARGET_OSX) && defined(TARGET_ARM64)
// Helix and/or build error...
// dyld: Library not loaded: libpaltest_pal_sxs_test1_dll1.dylib
printf("paltest_pal_sxs_test1 has been disabled on this platform\n");

return PASS;
#else // defined(TARGET_OSX) && defined(TARGET_ARM64)
struct sigaction newAction;
struct sigaction oldAction;
newAction.sa_flags = SA_SIGINFO | SA_RESTART;
Expand Down Expand Up @@ -120,5 +113,4 @@ int main(int argc, char *argv[])

printf("ERROR: code was executed after the access violation.\n");
return FAIL;
#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)
}
5 changes: 0 additions & 5 deletions src/coreclr/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@ BOOL readTest_ReadFile_test2(DWORD dwByteCount, char cResult)

PALTEST(file_io_ReadFile_test2_paltest_readfile_test2, "file_io/ReadFile/test2/paltest_readfile_test2")
{
#if defined(TARGET_OSX) && defined(TARGET_ARM64)
// Test hard codes PAGE_SIZE = 4096. Apple Silicon does not have 4K pages.
printf("file_io_ReadFile_test2_paltest_readfile_test2 has been disabled on this platform\n");
#else // defined(TARGET_OSX) && defined(TARGET_ARM64)
HANDLE hFile = NULL;
const int BUFFER_SIZE = 2 * PAGESIZE;

Expand Down Expand Up @@ -191,7 +187,6 @@ PALTEST(file_io_ReadFile_test2_paltest_readfile_test2, "file_io/ReadFile/test2/p

VirtualFree(readBuffer_ReadFile_test2, BUFFER_SIZE, MEM_RELEASE);
PAL_Terminate();
#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)
return PASS;
}

5 changes: 0 additions & 5 deletions src/coreclr/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ PALTEST(filemapping_memmgt_VirtualProtect_test4_paltest_virtualprotect_test4, "f
ExitProcess(FAIL);
}

#if defined(TARGET_OSX) && defined(TARGET_ARM64)
// AppleSilcon does not allow mapping general pages as RWX
printf("filemapping_memmgt_VirtualProtect_test4_paltest_virtualprotect_test4 has been disabled on this platform\n");
#else // defined(TARGET_OSX) && defined(TARGET_ARM64)
//Allocate the physical storage in memory or in the paging file on disk
lpVirtualAddress = VirtualAlloc(NULL,//determine where to allocate the region
REGIONSIZE, //specify the size
Expand Down Expand Up @@ -65,7 +61,6 @@ PALTEST(filemapping_memmgt_VirtualProtect_test4_paltest_virtualprotect_test4, "f
{
Fail("\nFailed to call VirtualFree API!\n");
}
#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)

PAL_Terminate();
return PASS;
Expand Down
17 changes: 17 additions & 0 deletions src/coreclr/pal/tests/palsuite/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,21 @@
<Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
</ExcludeList>
</ItemGroup>

<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'OSX'">
<ExcludeList Include="miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1">
<Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
</ExcludeList>
<ExcludeList Include="exception_handling/pal_sxs/test1/paltest_pal_sxs_test1">
<Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
</ExcludeList>
<ExcludeList Include="file_io/ReadFile/test2/paltest_readfile_test2">
<!-- Test hard codes PAGE_SIZE = 4096. Apple Silicon does not have 4K pages. -->
<Issue>https://github.com/dotnet/runtime/issues/42292</Issue>
</ExcludeList>
<ExcludeList Include="filemapping_memmgt/VirtualProtect/test4/paltest_virtualprotect_test4">
<!-- Test tries to set RWX on general memory page -->
<Issue>https://github.com/dotnet/runtime/issues/7639</Issue>
</ExcludeList>
</ItemGroup>
</Project>
5 changes: 0 additions & 5 deletions src/coreclr/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@

PALTEST(miscellaneous_queryperformancecounter_test1_paltest_queryperformancecounter_test1, "miscellaneous/queryperformancecounter/test1/paltest_queryperformancecounter_test1")
{
#if defined(TARGET_OSX) && defined(TARGET_ARM64)
// We are see > 100 ms of average error on this platform
printf("miscellaneous_queryperformancecounter_test1_paltest_queryperformancecounter_test1 has been disabled on this platform\n");
#else // defined(TARGET_OSX) && defined(TARGET_ARM64)
/* Milliseconds of error which are acceptable Function execution time, etc.
FreeBSD has a "standard" resolution of 50ms for waiting operations, so we
must take that into account as well */
Expand Down Expand Up @@ -104,7 +100,6 @@ PALTEST(miscellaneous_queryperformancecounter_test1_paltest_queryperformancecoun
/* Terminate the PAL.
*/
PAL_Terminate();
#endif // defined(TARGET_OSX) && defined(TARGET_ARM64)
return PASS;
}

Expand Down