Skip to content

Commit 71177d9

Browse files
kotlarmiloskotlarmilos
authored
[infra] Enable linux-x64 Mono fullAOT mini job on extra platforms (#96332)
This PR enables the linux-x64 full AOT mini job on extra platforms, utilizing the CBL-Mariner docker image. The parameters as_name and as_options, along with ld_name and ld_options are added to allow parameterization of the toolchain configuration.
1 parent cb63e02 commit 71177d9

File tree

24 files changed

+236
-44
lines changed

24 files changed

+236
-44
lines changed

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

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,48 @@ steps:
3838
archType: ${{ parameters.archType }}
3939
buildConfig: ${{ parameters.buildConfig }}
4040
testBuildArgs: ${{ parameters.testBuildArgs }}
41-
42-
# Build a Mono LLVM AOT cross-compiler for non-amd64 targets (in this case, just arm64)
43-
- ${{ if and(eq(parameters.runtimeFlavor, 'mono'), or(eq(parameters.runtimeVariant, 'llvmaot'), eq(parameters.runtimeVariant, 'llvmfullaot'))) }}:
41+
# Build a Mono AOT cross-compiler for non-amd64 targets (in this case, just arm64)
42+
- ${{ if and(eq(parameters.runtimeFlavor, 'mono'), in(parameters.runtimeVariant, 'llvmaot', 'llvmfullaot', 'minifullaot')) }}:
4443
- ${{ if eq(parameters.archType, 'arm64') }}:
45-
- script: ./build.sh
46-
-subset mono
47-
-c ${{ parameters.buildConfig }}
48-
-arch ${{ parameters.archType }}
49-
/p:BuildMonoAotCrossCompiler=true
50-
/p:BuildMonoAotCrossCompilerOnly=true
51-
/p:MonoLibClang="/usr/local/lib/libclang.so.16"
52-
/p:MonoAOTEnableLLVM=true
53-
/p:CrossBuild=true
54-
displayName: "Build Mono LLVM AOT cross compiler"
44+
- ${{ if eq(parameters.runtimeVariant, 'minifullaot') }}:
45+
- script: ./build.sh
46+
-subset mono
47+
-c ${{ parameters.buildConfig }}
48+
-arch ${{ parameters.archType }}
49+
/p:BuildMonoAotCrossCompiler=true
50+
/p:BuildMonoAotCrossCompilerOnly=true
51+
/p:CrossBuild=true
52+
displayName: "Build Mono Mini AOT cross compiler"
53+
- ${{ else }}:
54+
- script: ./build.sh
55+
-subset mono
56+
-c ${{ parameters.buildConfig }}
57+
-arch ${{ parameters.archType }}
58+
/p:BuildMonoAotCrossCompiler=true
59+
/p:BuildMonoAotCrossCompilerOnly=true
60+
/p:MonoLibClang="/usr/local/lib/libclang.so.16"
61+
/p:MonoAOTEnableLLVM=true
62+
/p:CrossBuild=true
63+
displayName: "Build Mono LLVM AOT cross compiler"
5564

5665
- ${{ if eq(parameters.archType, 'x64') }}:
5766
- ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
58-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }}
59-
displayName: "LLVM AOT compile CoreCLR tests"
67+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }}
68+
displayName: "AOT compile CoreCLR tests"
6069
target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
61-
- ${{ if eq(parameters.runtimeVariant, 'llvmfullaot') }}:
62-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }}
63-
displayName: "LLVM AOT compile CoreCLR tests"
70+
- ${{ 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 }}
72+
displayName: "AOT compile CoreCLR tests"
6473
target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
6574
- ${{ if eq(parameters.archType, 'arm64') }}:
6675
- ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
67-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} cross /p:RuntimeVariant=llvmfullaot -maxcpucount:2
68-
displayName: "LLVM AOT cross-compile CoreCLR tests"
76+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} cross /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:2
77+
displayName: "AOT cross-compile CoreCLR tests"
6978
env:
7079
__MonoToolPrefix: aarch64-linux-gnu-
71-
- ${{ if eq(parameters.runtimeVariant, 'llvmfullaot') }}:
72-
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} cross /p:RuntimeVariant=llvmfullaot -maxcpucount:2
73-
displayName: "LLVM AOT cross-compile CoreCLR tests"
80+
- ${{ if in(parameters.runtimeVariant, 'llvmfullaot', 'minifullaot') }}:
81+
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} cross /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:2
82+
displayName: "AOT cross-compile CoreCLR tests"
7483
env:
7584
__MonoToolPrefix: aarch64-linux-gnu-
7685

‎eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,38 @@ jobs:
149149
# extraVariablesTemplates:
150150
# - template: /eng/pipelines/common/templates/runtimes/test-variables.yml
151151

152+
#
153+
# Mono CoreCLR runtime test executions using live libraries and mini Full AOT
154+
# Only when Mono is changed
155+
#
156+
- template: /eng/pipelines/common/platform-matrix.yml
157+
parameters:
158+
jobTemplate: /eng/pipelines/common/global-build-job.yml
159+
helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
160+
buildConfig: Release
161+
runtimeFlavor: mono
162+
platforms:
163+
- linux_x64
164+
variables:
165+
- name: timeoutPerTestInMinutes
166+
value: 60
167+
- name: timeoutPerTestCollectionInMinutes
168+
value: 180
169+
jobParameters:
170+
testGroup: innerloop
171+
nameSuffix: AllSubsets_Mono_MiniFullAot_RuntimeTests
172+
runtimeVariant: minifullaot
173+
buildArgs: -s mono+libs+clr.hosts -c Release
174+
timeoutInMinutes: 300
175+
postBuildSteps:
176+
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
177+
parameters:
178+
creator: dotnet-bot
179+
llvmAotStepContainer: linux_x64
180+
testRunNamePrefixSuffix: Mono_Release
181+
extraVariablesTemplates:
182+
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
183+
152184
#
153185
# Mono CoreCLR runtime Test executions using live libraries in interpreter mode
154186
# Only when Mono is changed

‎src/mono/mono/metadata/marshal.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5834,8 +5834,19 @@ mono_marshal_load_type_info (MonoClass* klass)
58345834
if (m_class_is_inlinearray (klass)) {
58355835
// Limit the max size of array instance to 1MiB
58365836
const int struct_max_size = 1024 * 1024;
5837+
guint32 initial_size = size;
58375838
size *= m_class_inlinearray_value (klass);
5838-
g_assert ((size > 0) && (size <= struct_max_size));
5839+
if(size == 0 || size > struct_max_size) {
5840+
if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback) {
5841+
if (mono_get_runtime_callbacks ()->mono_class_set_deferred_type_load_failure_callback (klass, "Inline array struct size out of bounds, abnormally large."))
5842+
break;
5843+
else
5844+
size = initial_size; // failure occured during AOT compilation, continue execution
5845+
} else {
5846+
mono_class_set_type_load_failure (klass, "Inline array struct size out of bounds, abnormally large.");
5847+
break;
5848+
}
5849+
}
58395850
}
58405851

58415852
switch (layout) {

‎src/mono/mono/mini/aot-compiler.c

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,11 @@ typedef struct MonoAotOptions {
242242
gboolean child;
243243
char *tool_prefix;
244244
char *as_prefix;
245+
char *as_name;
246+
char *as_options;
245247
char *ld_flags;
246248
char *ld_name;
249+
char *ld_options;
247250
char *mtriple;
248251
char *llvm_path;
249252
char *temp_path;
@@ -8940,10 +8943,16 @@ mono_aot_parse_options (const char *aot_options, MonoAotOptions *opts)
89408943
opts->tool_prefix = g_strdup (arg + strlen ("tool-prefix="));
89418944
} else if (str_begins_with (arg, "as-prefix=")) {
89428945
opts->as_prefix = g_strdup (arg + strlen ("as-prefix="));
8946+
} else if (str_begins_with (arg, "as-name=")) {
8947+
opts->as_name = g_strdup (arg + strlen ("as-name="));
8948+
} else if (str_begins_with (arg, "as-options=")) {
8949+
opts->as_options = g_strdup (arg + strlen ("as-options="));
89438950
} else if (str_begins_with (arg, "ld-flags=")) {
89448951
opts->ld_flags = g_strdup (arg + strlen ("ld-flags="));
89458952
} else if (str_begins_with (arg, "ld-name=")) {
89468953
opts->ld_name = g_strdup (arg + strlen ("ld-name="));
8954+
} else if (str_begins_with (arg, "ld-options=")) {
8955+
opts->ld_options = g_strdup (arg + strlen ("ld-options="));
89478956
} else if (str_begins_with (arg, "soft-debug")) {
89488957
opts->soft_debug = TRUE;
89498958
// Intentionally undocumented x2-- deprecated
@@ -13222,8 +13231,16 @@ compile_asm (MonoAotCompile *acfg)
1322213231
#ifdef TARGET_OSX
1322313232
g_string_append (acfg->as_args, "-c -x assembler ");
1322413233
#endif
13234+
const char *as_binary_name = acfg->aot_opts.as_name;
13235+
if (as_binary_name == NULL) {
13236+
as_binary_name = AS_NAME;
13237+
}
13238+
const char *as_options = acfg->aot_opts.as_options;
13239+
if (as_options == NULL) {
13240+
as_options = AS_OPTIONS;
13241+
}
1322513242

13226-
command = g_strdup_printf ("\"%s%s\" %s %s -o %s %s", as_prefix, AS_NAME, AS_OPTIONS,
13243+
command = g_strdup_printf ("\"%s%s\" %s %s -o %s %s", as_prefix, as_binary_name, as_options,
1322713244
acfg->as_args ? acfg->as_args->str : "",
1322813245
wrap_path (objfile), wrap_path (acfg->asm_fname));
1322913246
aot_printf (acfg, "Executing the native assembler: %s\n", command);
@@ -13234,7 +13251,7 @@ compile_asm (MonoAotCompile *acfg)
1323413251
}
1323513252

1323613253
if (acfg->llvm && !acfg->llvm_owriter) {
13237-
command = g_strdup_printf ("\"%s%s\" %s %s -o %s %s", as_prefix, AS_NAME, AS_OPTIONS,
13254+
command = g_strdup_printf ("\"%s%s\" %s %s -o %s %s", as_prefix, as_binary_name, as_options,
1323813255
acfg->as_args ? acfg->as_args->str : "",
1323913256
wrap_path (acfg->llvm_ofile), wrap_path (acfg->llvm_sfile));
1324013257
aot_printf (acfg, "Executing the native assembler: %s\n", command);
@@ -13283,16 +13300,21 @@ compile_asm (MonoAotCompile *acfg)
1328313300

1328413301
str = g_string_new ("");
1328513302
const char *ld_binary_name = acfg->aot_opts.ld_name;
13303+
13304+
const char *ld_options = acfg->aot_opts.ld_options;
13305+
if (ld_options == NULL) {
13306+
ld_options = LD_OPTIONS;
13307+
}
1328613308
#if defined(LD_NAME)
1328713309
if (ld_binary_name == NULL) {
1328813310
ld_binary_name = LD_NAME;
1328913311
}
1329013312
if (acfg->aot_opts.tool_prefix)
13291-
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, LD_OPTIONS);
13313+
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, ld_options);
1329213314
else if (acfg->aot_opts.llvm_only)
1329313315
g_string_append_printf (str, "%s", acfg->aot_opts.clangxx);
1329413316
else
13295-
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, LD_OPTIONS);
13317+
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, ld_options);
1329613318
#else
1329713319
if (ld_binary_name == NULL) {
1329813320
ld_binary_name = "ld";
@@ -13301,7 +13323,7 @@ compile_asm (MonoAotCompile *acfg)
1330113323
// Default (linux)
1330213324
if (acfg->aot_opts.tool_prefix)
1330313325
/* Cross compiling */
13304-
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, LD_OPTIONS);
13326+
g_string_append_printf (str, "\"%s%s\" %s", tool_prefix, ld_binary_name, ld_options);
1330513327
else if (acfg->aot_opts.llvm_only)
1330613328
g_string_append_printf (str, "%s", acfg->aot_opts.clangxx);
1330713329
else
@@ -14232,8 +14254,11 @@ aot_opts_free (MonoAotOptions *aot_opts)
1423214254
g_free (aot_opts->dedup_include);
1423314255
g_free (aot_opts->tool_prefix);
1423414256
g_free (aot_opts->as_prefix);
14257+
g_free (aot_opts->as_name);
14258+
g_free (aot_opts->as_options);
1423514259
g_free (aot_opts->ld_flags);
1423614260
g_free (aot_opts->ld_name);
14261+
g_free (aot_opts->ld_options);
1423714262
g_free (aot_opts->mtriple);
1423814263
g_free (aot_opts->llvm_path);
1423914264
g_free (aot_opts->temp_path);

‎src/tests/Common/CoreCLRTestLibrary/PlatformDetection.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ public static bool IsNonZeroLowerBoundArraySupported
5050

5151
public static bool IsMonoLLVMAOT => _variant == "llvmaot";
5252
public static bool IsMonoLLVMFULLAOT => _variant == "llvmfullaot";
53+
public static bool IsMonoMINIFULLAOT => _variant == "minifullaot";
54+
public static bool IsMonoFULLAOT => IsMonoLLVMFULLAOT || IsMonoMINIFULLAOT;
5355
public static bool IsMonoInterpreter => _variant == "monointerpreter";
5456

5557
// These platforms have not had their infrastructure updated to support native test assets.

‎src/tests/Common/helixpublishwitharcade.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,8 @@
413413
<HelixCommandLines Include="$(_WorkaroundForNuGetMigrations)" />
414414

415415
<!-- Force assemblies to lazy-load for LLVM AOT test runs to enable using tests that fail at AOT time (and as a result can't be AOTd) -->
416-
<HelixCommandLines Condition="'$(RuntimeVariant)' == 'llvmfullaot'" Include="$(_MergedWrapperRunScriptPrefix)$(_MergedWrapperRunScriptRelative) -usewatcher --aot-lazy-assembly-load" />
417-
<HelixCommandLines Condition="'$(RuntimeVariant)' != 'llvmfullaot'" Include="$(_MergedWrapperRunScriptPrefix)$(_MergedWrapperRunScriptRelative) -usewatcher" />
416+
<HelixCommandLines Condition="'$(RuntimeVariant)' == 'llvmfullaot' or '$(RuntimeVariant)' == 'minifullaot'" Include="$(_MergedWrapperRunScriptPrefix)$(_MergedWrapperRunScriptRelative) -usewatcher --aot-lazy-assembly-load" />
417+
<HelixCommandLines Condition="'$(RuntimeVariant)' != 'llvmfullaot' and '$(RuntimeVariant)' != 'minifullaot'" Include="$(_MergedWrapperRunScriptPrefix)$(_MergedWrapperRunScriptRelative) -usewatcher" />
418418

419419
<!--
420420
Bug Fix: GH Issue #85056 - Helix takes the exit code of the last ran executable. Since that spot has now been

‎src/tests/Common/testenvironment.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
<_TestEnvFileLine Condition="'false' == 'true' and '$(RuntimeVariant)' == 'llvmaot'" Include="export MONO_ENV_OPTIONS=--llvm" />
323323

324324
<!-- Use Mono in Full AOT mode when running the full-AOT-compiled runtime tests -->
325-
<_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmfullaot'" Include="export MONO_ENV_OPTIONS=--full-aot" />
325+
<_TestEnvFileLine Condition="'$(RuntimeVariant)' == 'llvmfullaot' or '$(RuntimeVariant)' == 'minifullaot'" Include="export MONO_ENV_OPTIONS=--full-aot" />
326326

327327
<_TestEnvFileLine Condition="'$(RuntimeVariant)' != ''" Include="export DOTNET_RUNTIME_VARIANT=$(RuntimeVariant)" />
328328

‎src/tests/Interop/DllImportSearchPaths/DllImportSearchPathsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public static void AssemblyDirectory_NotFound()
2121

2222
public static bool CanLoadAssemblyInSubdirectory =>
2323
!TestLibrary.Utilities.IsNativeAot &&
24-
!TestLibrary.PlatformDetection.IsMonoLLVMFULLAOT &&
24+
!TestLibrary.PlatformDetection.IsMonoFULLAOT &&
2525
!OperatingSystem.IsAndroid() &&
2626
!OperatingSystem.IsIOS() &&
2727
!OperatingSystem.IsTvOS() &&

‎src/tests/Interop/Interop.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<PropertyGroup>
33
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
44
<Configurations>Debug;Release;Checked</Configurations>
5+
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
6+
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'minifullaot'">true</CLRTestTargetUnsupported>
57
</PropertyGroup>
68
<ItemGroup>
79
<SupportProject Include="$(TestLibraryProjectPath)" />

‎src/tests/Interop/NativeLibrary/API/NativeLibraryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void LoadLibrary_AssemblyDirectory()
182182

183183
string subdirectory = Path.Combine(testBinDir, "subdirectory");
184184

185-
if (!TestLibrary.Utilities.IsNativeAot && !TestLibrary.PlatformDetection.IsMonoLLVMFULLAOT)
185+
if (!TestLibrary.Utilities.IsNativeAot && !TestLibrary.PlatformDetection.IsMonoFULLAOT)
186186
{
187187
// Library should be found in the assembly directory
188188
Assembly assemblyInSubdirectory = Assembly.LoadFile(Path.Combine(subdirectory, $"{assembly.GetName().Name}{suffix}.dll"));

0 commit comments

Comments
 (0)