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.

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

[WIP][mono] Enable runtime tests in AOT modes on linux-arm64 #100685

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
a8f6053
Enable linux_arm64 platform in extra-platforms and runtime-llvm pipel…
kotlarmilos Apr 5, 2024
633c73a
Remove unused LLVMAot test build configuration
kotlarmilos Apr 5, 2024
22a5d2a
Add MonoLibClang parameter to the AOT build on arm64
kotlarmilos Apr 5, 2024
cbc027c
Exclude Microsoft.CodeAnalysis.dll to test OOM issue
kotlarmilos Apr 8, 2024
32768af
Disable failing AOT llvm tests on arm64
kotlarmilos Apr 8, 2024
a29b9ab
Limit maxcpucount to 1 on arm64
kotlarmilos Apr 8, 2024
6068e5c
Disable mini fullAOT failing tests
kotlarmilos Apr 8, 2024
05da18f
Disable failing fullAOT mini tests on arm64
kotlarmilos Apr 9, 2024
b8d3a09
Resolve AOT compilation failures
kotlarmilos Apr 9, 2024
f84feb5
Disable failing fullAOT mini tests on arm64
kotlarmilos Apr 9, 2024
9854381
Test GCC directive in arm64_emit_load_got_slot
kotlarmilos Apr 9, 2024
ecd921c
Introduce AsmType enum
kotlarmilos Apr 11, 2024
aae414a
Test arm64_emit_load_got_slot with clang
kotlarmilos Apr 11, 2024
5f6af99
Test arm64_emit_load_got_slot with clang
kotlarmilos Apr 12, 2024
77acadf
Revert changes
kotlarmilos Apr 12, 2024
fe61b45
Fix g_assert in mono_arch_patch_plt_entry
kotlarmilos Apr 12, 2024
c0f3003
Print ins in mono_arch_patch_plt_entry
kotlarmilos Apr 17, 2024
3206717
Use PAGE and PAGEOFF for arm64 reloc
kotlarmilos Apr 22, 2024
6cf2229
Use PAGE and PAGEOFF for arm64 reloc
kotlarmilos Apr 22, 2024
70b3118
Use GOTPAGE and GOTPAGEOFF for arm64 reloc
kotlarmilos Apr 22, 2024
2fa6762
Add support for relocations within the same page on arm64 using clang…
kotlarmilos Apr 24, 2024
748f747
Add displacement to the base address for adr ins in plt relocation
kotlarmilos Apr 25, 2024
2c45972
Fix displacement for adr ins in mono_arch_patch_plt_entry
kotlarmilos Apr 25, 2024
cc8e72c
Merge branch 'main' of github.com:kotlarmilos/runtime into improvemen…
kotlarmilos May 30, 2024
896a9fe
Add ROOTFS_HOST_DIR environment variable
kotlarmilos May 30, 2024
6e2e74a
Update llvm path to work with the new docker image
kotlarmilos May 30, 2024
9ad4df9
Update MonoCrossDir condition to point to the host rootfs
kotlarmilos May 31, 2024
629a203
Fix reloc condition for nop ins
kotlarmilos May 31, 2024
f917792
Fix reloc condition for nop ins
kotlarmilos May 31, 2024
0b05347
Add debug print to mono_arch_patch_plt_entry
kotlarmilos Jun 5, 2024
516c39e
Fix typo
kotlarmilos Jun 5, 2024
06d2391
Add debug print
kotlarmilos Jun 5, 2024
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
20 changes: 0 additions & 20 deletions eng/pipelines/common/platform-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -355,26 +355,6 @@ jobs:
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Mono LLVMAot test build

- ${{ if containsValue(parameters.platforms, 'linux_x64_llvmaot') }}:
- template: xplat-setup.yml
parameters:
jobTemplate: ${{ parameters.jobTemplate }}
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
variables: ${{ parameters.variables }}
osGroup: linux
archType: x64
targetRid: linux-x64
platform: linux_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container: linux_x64_llvmaot
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
buildConfig: ${{ parameters.buildConfig }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Linux s390x

- ${{ if containsValue(parameters.platforms, 'linux_s390x') }}:
Expand Down
4 changes: 1 addition & 3 deletions eng/pipelines/common/templates/pipeline-with-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ extends:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-arm64-net9.0
env:
ROOTFS_DIR: /crossrootfs/arm64
ROOTFS_HOST_DIR: /

linux_musl_x64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-cross-amd64-alpine-net9.0
Expand Down Expand Up @@ -101,9 +102,6 @@ extends:
debian-12-gcc14-amd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64

linux_x64_llvmaot:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8

browser_wasm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-webassembly-amd64-net9.0
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ parameters:
nativeAotTest: false
runtimeFlavor: 'mono'
runtimeVariant: 'monointerpreter'
llvmAotStepContainer: ''
scenarios:
- normal
variables: {}
Expand Down Expand Up @@ -48,6 +47,7 @@ steps:
-arch ${{ parameters.archType }}
/p:BuildMonoAotCrossCompiler=true
/p:BuildMonoAotCrossCompilerOnly=true
/p:MonoLibClang="/usr/local/lib/libclang.so"
/p:CrossBuild=true
displayName: "Build Mono Mini AOT cross compiler"
- ${{ else }}:
Expand All @@ -57,31 +57,25 @@ steps:
-arch ${{ parameters.archType }}
/p:BuildMonoAotCrossCompiler=true
/p:BuildMonoAotCrossCompilerOnly=true
/p:MonoLibClang="/usr/local/lib/libclang.so.16"
/p:MonoLibClang="/usr/local/lib/libclang.so"
/p:MonoAOTEnableLLVM=true
/p:CrossBuild=true
displayName: "Build Mono LLVM AOT cross compiler"

- ${{ if eq(parameters.archType, 'x64') }}:
- ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }}
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:1
displayName: "AOT compile CoreCLR tests"
target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
- ${{ if in(parameters.runtimeVariant, 'llvmfullaot', 'minifullaot') }}:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:1
displayName: "AOT compile CoreCLR tests"
target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
- ${{ if eq(parameters.archType, 'arm64') }}:
- ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} cross /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:2
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_aot ${{ parameters.buildConfig }} ${{ parameters.archType }} cross /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:1
displayName: "AOT cross-compile CoreCLR tests"
env:
__MonoToolPrefix: aarch64-linux-gnu-
- ${{ if in(parameters.runtimeVariant, 'llvmfullaot', 'minifullaot') }}:
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} cross /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:2
- script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} cross /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:1
displayName: "AOT cross-compile CoreCLR tests"
env:
__MonoToolPrefix: aarch64-linux-gnu-

# Checks the value of the compileOnHelix parameter
# and if set invokes libraries pipeline for AOT on Helix
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ jobs:
runtimeFlavor: mono
platforms:
- linux_x64
# Tracking issue: https://github.com/dotnet/runtime/issues/90427
# linux_arm64
- linux_arm64
variables:
- name: timeoutPerTestInMinutes
value: 60
Expand All @@ -143,7 +142,6 @@ jobs:
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
parameters:
creator: dotnet-bot
llvmAotStepContainer: linux_x64
testRunNamePrefixSuffix: Mono_Release
extraVariablesTemplates:
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
Expand Down
12 changes: 3 additions & 9 deletions eng/pipelines/runtime-llvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ extends:
runtimeFlavor: mono
platforms:
- linux_x64
# Disabled pending outcome of https://github.com/dotnet/runtime/issues/60234 investigation
#- linux_arm64
- linux_arm64
variables:
- name: timeoutPerTestInMinutes
value: 60
Expand All @@ -156,7 +155,6 @@ extends:
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
parameters:
creator: dotnet-bot
llvmAotStepContainer: linux_x64_llvmaot
testRunNamePrefixSuffix: Mono_Release
extraVariablesTemplates:
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
Expand All @@ -174,8 +172,7 @@ extends:
runtimeFlavor: mono
platforms:
- linux_x64
# Tracking issue: https://github.com/dotnet/runtime/issues/90427
# - linux_arm64
- linux_arm64
variables:
- name: timeoutPerTestInMinutes
value: 60
Expand All @@ -197,7 +194,6 @@ extends:
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
parameters:
creator: dotnet-bot
llvmAotStepContainer: linux_x64_llvmaot
testRunNamePrefixSuffix: Mono_Release
testBuildArgs: >-
-tree:CoreMangLib -tree:Exceptions -tree:GC -tree:Interop -tree:Loader -tree:Regressions -tree:baseservices
Expand All @@ -221,8 +217,7 @@ extends:
runtimeFlavor: mono
platforms:
- linux_x64
# Tracking issue: https://github.com/dotnet/runtime/issues/90427
# - linux_arm64
- linux_arm64
variables:
- name: timeoutPerTestInMinutes
value: 60
Expand All @@ -244,7 +239,6 @@ extends:
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
parameters:
creator: dotnet-bot
llvmAotStepContainer: linux_x64_llvmaot
testRunNamePrefixSuffix: Mono_Release
testBuildArgs: -tree:JIT/Intrinsics -tree:JIT/HardwareIntrinsics -tree:JIT/SIMD
extraVariablesTemplates:
Expand Down
1 change: 0 additions & 1 deletion eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1609,7 +1609,6 @@ extends:
- template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
parameters:
creator: dotnet-bot
llvmAotStepContainer: linux_x64_llvmaot
testRunNamePrefixSuffix: Mono_Release
extraVariablesTemplates:
- template: /eng/pipelines/common/templates/runtimes/test-variables.yml
Expand Down
8 changes: 4 additions & 4 deletions src/mono/mono.proj
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
</PropertyGroup>

<RemoveDir Directories="$(EMSDK_PATH)" />

<ItemGroup>
<EmsdkFiles Condition="'%(PackageReference.Identity)' != 'runtime.$(_portableHostOS)-$(BuildArchitecture).Microsoft.NETCore.Runtime.Wasm.Node.Transport' and '%(PackageReference.Identity)' != 'Microsoft.NET.Runtime.Emscripten.3.1.34.Python.win-$(BuildArchitecture)'"
Include="$(NuGetPackageRoot)\$([System.String]::Copy(%(PackageReference.Identity)).ToLowerInvariant())\%(PackageReference.Version)\tools\**" />
Expand All @@ -281,7 +281,7 @@
<ReadLinesFromFile File="$(EMSDK_PATH)emsdk_env$(ScriptExt)">
<Output TaskParameter="Lines" PropertyName="_EmsdkEnvFileText" />
</ReadLinesFromFile>
<WriteLinesToFile File="$(EMSDK_PATH)emsdk_env$(ScriptExt)"
<WriteLinesToFile File="$(EMSDK_PATH)emsdk_env$(ScriptExt)"
Overwrite="true"
Lines="$(_EmsdkPaths);$(_EmsdkEnvFileText)" />
<WriteLinesToFile File="$(EMSDK_PATH)emscripten/.emscripten"
Expand All @@ -299,7 +299,7 @@

<PropertyGroup>
<ShouldProvisionEmscripten>false</ShouldProvisionEmscripten>
</PropertyGroup>
</PropertyGroup>
</Target>

<!-- Sets up WASI SDK if you don't have the WASI_SDK_PATH env variable set -->
Expand Down Expand Up @@ -932,7 +932,7 @@
The runtime is built using the 'ROOTFS_DIR' which points to '/crossrootfs/arm64'.
The 'mono-aot-cross' is built using the 'ROOTFS_HOST_DIR' which points to '/crossrootfs/x64'.
-->
<PropertyGroup Condition="'$(CrossBuild)' == 'true' and '$(ROOTFS_HOST_DIR)' != '' and $(ROOTFS_HOST_DIR.Contains('$(AotHostArchitecture)'))">
<PropertyGroup Condition="'$(CrossBuild)' == 'true' and '$(ROOTFS_HOST_DIR)' != ''">
<MonoCrossDir>$(ROOTFS_HOST_DIR)</MonoCrossDir>
</PropertyGroup>

Expand Down Expand Up @@ -1003,7 +1003,7 @@
</PropertyGroup>
<Message Condition="'$(_MonoSkipAotCMakeConfigure)' == 'true'" Text="The AOT Cross CMake command line is the same as the last run. Skipping running CMake configure." Importance="High"/>
<Message Condition="'$(_MonoSkipAotCMakeConfigure)' != 'true'" Text="Running '$(_MonoAotCMakeConfigureCommand)' in '$(MonoObjCrossDir)'" Importance="High"/>
<Exec Condition="'$(_MonoSkipAotCMakeConfigure)' != 'true'" Command="$(_MonoAotCMakeConfigureCommand)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjCrossDir)"/>

Check failure on line 1006 in src/mono/mono.proj

View check run for this annotation

Azure Pipelines / runtime (Build linux-arm64 release CrossAOT_Mono crossaot)

src/mono/mono.proj#L1006

src/mono/mono.proj(1006,5): error MSB3073: (NETCORE_ENGINEERING_TELEMETRY=Build) The command "sh -c 'build_arch="arm64" ROOTFS_DIR="/" compiler="clang" . "/__w/1/s/eng/common/native/init-compiler.sh" && TARGET_BUILD_ARCH=arm64 cmake -DMONO_SET_RPATH_ORIGIN=true -DCMAKE_TOOLCHAIN_FILE=/__w/1/s/eng/common/cross/toolchain.cmake -DAOT_TARGET_TRIPLE=x86_64-none-linux-android -DCMAKE_INSTALL_PREFIX=/__w/1/s/artifacts/obj/mono/android.x64.Release/cross/out -DCMAKE_BUILD_TYPE=Release -DENABLE_MINIMAL= -DENABLE_ICALL_SYMBOL_MAP=1 -DDISABLE_SHARED_LIBS=1 -DDISABLE_LIBS=1 -DAOT_COMPONENTS=1 -DSTATIC_COMPONENTS=1 -DAOT_OFFSETS_FILE="/__w/1/s/artifacts/obj/mono/android.x64.Release/cross/offsets-x64-android.h" -DLLVM_PREFIX=/__w/1/s/artifacts/obj/mono/android.x64.Release/llvm//arm64 -DCMAKE_C_FLAGS=" -Wl,--build-id=sha1" -DCMAKE_CXX_FLAGS=" -I/__w/1/s/artifacts/obj/mono/android.x64.Release/llvm//arm64/include/c++/v1 -L/__w/1/s/artifacts/obj/mono/android.x64.Release/llvm//arm64/lib -stdlib=libc++ -Wl,--build-id=sha1" -DGC_SUSPEND=hybrid -DMONO_CROSS_COMPILE_EXECUTABLE_NAME=1 "/__w/1/s/src/mono"'" exited with code 1.

Check failure on line 1006 in src/mono/mono.proj

View check run for this annotation

Azure Pipelines / runtime

src/mono/mono.proj#L1006

src/mono/mono.proj(1006,5): error MSB3073: (NETCORE_ENGINEERING_TELEMETRY=Build) The command "sh -c 'build_arch="arm64" ROOTFS_DIR="/" compiler="clang" . "/__w/1/s/eng/common/native/init-compiler.sh" && TARGET_BUILD_ARCH=arm64 cmake -DMONO_SET_RPATH_ORIGIN=true -DCMAKE_TOOLCHAIN_FILE=/__w/1/s/eng/common/cross/toolchain.cmake -DAOT_TARGET_TRIPLE=x86_64-none-linux-android -DCMAKE_INSTALL_PREFIX=/__w/1/s/artifacts/obj/mono/android.x64.Release/cross/out -DCMAKE_BUILD_TYPE=Release -DENABLE_MINIMAL= -DENABLE_ICALL_SYMBOL_MAP=1 -DDISABLE_SHARED_LIBS=1 -DDISABLE_LIBS=1 -DAOT_COMPONENTS=1 -DSTATIC_COMPONENTS=1 -DAOT_OFFSETS_FILE="/__w/1/s/artifacts/obj/mono/android.x64.Release/cross/offsets-x64-android.h" -DLLVM_PREFIX=/__w/1/s/artifacts/obj/mono/android.x64.Release/llvm//arm64 -DCMAKE_C_FLAGS=" -Wl,--build-id=sha1" -DCMAKE_CXX_FLAGS=" -I/__w/1/s/artifacts/obj/mono/android.x64.Release/llvm//arm64/include/c++/v1 -L/__w/1/s/artifacts/obj/mono/android.x64.Release/llvm//arm64/lib -stdlib=libc++ -Wl,--build-id=sha1" -DGC_SUSPEND=hybrid -DMONO_CROSS_COMPILE_EXECUTABLE_NAME=1 "/__w/1/s/src/mono"'" exited with code 1.
<WriteLinesToFile
Condition="'$(_MonoSkipAotCMakeConfigure)' != 'true'"
File="$(MonoObjCrossDir)cmake_cmd_line.txt"
Expand Down
61 changes: 50 additions & 11 deletions src/mono/mono/mini/tramp-arm64.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,66 @@ mono_arch_patch_plt_entry (guint8 *code, gpointer *got, host_mgreg_t *regs, guin
* aot-compiler.c
*/

// print next 4 instructions
printf ("\n");
printf ("mono_arch_patch_plt_entry begin\n");
printf ("code addr: %p\n", code);
printf ("ins0: %08x\n", ((guint32*)code) [0]);
printf ("ins1: %08x\n", ((guint32*)code) [1]);
printf ("ins2: %08x\n", ((guint32*)code) [2]);

/* adrp */
ins = ((guint32*)code) [0];
g_assert (((ins >> 24) & 0x1f) == 0x10);
disp = (((ins >> 5) & 0x7ffff) << 2) | ((ins >> 29) & 0x3);
/* FIXME: disp is signed */
g_assert ((disp >> 20) == 0);

slot_addr = ((guint64)code + (disp << 12)) & ~0xfff;

/* add x16, x16, :lo12:got */
ins = ((guint32*)code) [1];
g_assert (((ins >> 22) & 0x3) == 0);
slot_addr += (ins >> 10) & 0xfff;
printf ("ins: %08x\n", ins);
if (((ins >> 24) & 0x1f) == 0x10) {
printf("ADRP instruction detected\n");
// adrp x16, address
// add x16, x16, offset
disp = (((ins >> 5) & 0x7ffff) << 2) | ((ins >> 29) & 0x3);
printf("disp: %08x\n", disp);
/* FIXME: disp is signed */
g_assert ((disp >> 20) == 0);

slot_addr = ((guint64)code + (disp << 12)) & ~0xfff;
printf("slot_addr: %llx\n", slot_addr);

/* add x16, x16, :lo12:got */
ins = ((guint32*)code) [1];
printf ("ins[1]: %08x\n", ins);
g_assert (((ins >> 22) & 0x3) == 0);
slot_addr += (ins >> 10) & 0xfff;
printf ("slot_addr (adrp): %llx\n", slot_addr);
} else if (((ins >> 24) & 0x1f) == 0x15) {
printf("ADR instruction detected\n");
// nop
// adr x16, address
ins = ((guint32*)code) [1];
printf ("ins[1]: %08x\n", ins);
disp = (((ins >> 5) & 0x7ffff) << 2);
printf("disp: %08x\n", disp);
if (disp & (1 << 20)) {
disp |= ~((1 << 21) - 1);
}
printf("disp fix: %08x\n", disp);
/* FIXME: disp is signed */
g_assert ((disp >> 20) == 0);
slot_addr = (guint64)((char*)code + disp);
printf ("slot_addr (adr): %llx\n", slot_addr);
} else {
g_assert_not_reached ();
}

/* ldr x16, [x16, <offset>] */
ins = ((guint32*)code) [2];
printf ("ins[2]: %08x\n", ins);
g_assert (((ins >> 24) & 0x3f) == 0x39);
slot_addr += ((ins >> 10) & 0xfff) * 8;
printf ("slot_addr (ldr): %llx\n", slot_addr);

g_assert (*(guint64*)slot_addr);
*(gpointer*)slot_addr = addr;

printf ("mono_arch_patch_plt_entry end\n");
}

void
Expand Down
2 changes: 1 addition & 1 deletion src/tests/Interop/Interop.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'llvmfullaot'">true</CLRTestTargetUnsupported>
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'minifullaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Configurations>Debug;Release;Checked</Configurations>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<DebugType>Full</DebugType>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="25paramMixed_d.il" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
<Optimize>False</Optimize>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="25paramMixed_r.il" />
Expand Down
4 changes: 2 additions & 2 deletions src/tests/JIT/Methodical/VT/callconv/jumper4_r.ilproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="jumper4_r.il" />
Expand Down
4 changes: 2 additions & 2 deletions src/tests/JIT/Methodical/VT/callconv/jumper5_r.ilproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
</PropertyGroup>
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="jumper5_r.il" />
Expand Down
2 changes: 2 additions & 0 deletions src/tests/JIT/Methodical/tailcall/deep_value_d.ilproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<DebugType>Full</DebugType>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="deep_value_d.il" />
Expand Down
2 changes: 2 additions & 0 deletions src/tests/JIT/Methodical/tailcall/deep_value_r.ilproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.IL">
<PropertyGroup>
<DebugType>PdbOnly</DebugType>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="deep_value_r.il" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<PropertyGroup>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and '$(RuntimeVariant)' == 'llvmaot'">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).il" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<PropertyGroup>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).il" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Optimize>True</Optimize>
<!-- Tracking issue: https://github.com/dotnet/runtime/issues/90427 -->
<CLRTestTargetUnsupported Condition="'$(RuntimeFlavor)' == 'mono' and ('$(RuntimeVariant)' == 'llvmaot' or '$(RuntimeVariant)' == 'llvmfullaot')">true</CLRTestTargetUnsupported>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildProjectName).cs" />
</ItemGroup>
</Project>
</Project>
Loading
Loading