From 5bed9e7a3f2be403f78bb7e69e9e92848938f5b6 Mon Sep 17 00:00:00 2001
From: Andy Ayers <andya@microsoft.com>
Date: Mon, 29 Jun 2020 19:26:10 -0700
Subject: [PATCH] Fix sizeof tests for arm and x86 (#38577)

On these tests the arm class layout happens to match the x64/arm64 layout and
is different than the x86 layout.

So, introduce arm specific test projects for these tests.

Also in the recent test build conversion one project was overlooked, so update
that project to work with this new scheme as well.

Remove all exclusions for these and older variants of these tests.

Closes #37470.
---
 src/coreclr/tests/issues.targets              | 36 -------------------
 .../_il_dbgsizeof32_Target_32Bit_arm.ilproj   | 14 ++++++++
 ...> _il_dbgsizeof32_Target_32Bit_x86.ilproj} |  7 ++--
 .../_il_dbgsizeof64_Target_32Bit_arm.ilproj   | 14 ++++++++
 .../_il_dbgsizeof64_Target_32Bit_x86.ilproj   | 13 +++++++
 ...oj => _il_dbgsizeof64_Target_64Bit.ilproj} |  6 ++--
 .../_il_dbgsizeof_Target_32Bit_arm.ilproj     | 14 ++++++++
 ... => _il_dbgsizeof_Target_32Bit_x86.ilproj} |  4 +--
 .../_il_relsizeof32_Target_32Bit_arm.ilproj   | 14 ++++++++
 ...> _il_relsizeof32_Target_32Bit_x86.ilproj} |  4 +--
 .../_il_relsizeof64_Target_32Bit_arm.ilproj   | 14 ++++++++
 ...> _il_relsizeof64_Target_32Bit_x86.ilproj} |  4 +--
 .../_il_relsizeof_Target_32Bit_arm.ilproj     | 14 ++++++++
 ... => _il_relsizeof_Target_32Bit_x86.ilproj} |  4 +--
 14 files changed, 111 insertions(+), 51 deletions(-)
 create mode 100644 src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_arm.ilproj
 rename src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/{_il_dbgsizeof64.ilproj => _il_dbgsizeof32_Target_32Bit_x86.ilproj} (51%)
 create mode 100644 src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_arm.ilproj
 create mode 100644 src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_x86.ilproj
 rename src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/{_il_dbgsizeof32_Target_32Bit.ilproj => _il_dbgsizeof64_Target_64Bit.ilproj} (59%)
 create mode 100644 src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_arm.ilproj
 rename src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/{_il_dbgsizeof_Target_32Bit.ilproj => _il_dbgsizeof_Target_32Bit_x86.ilproj} (58%)
 create mode 100644 src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_arm.ilproj
 rename src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/{_il_relsizeof32_Target_32Bit.ilproj => _il_relsizeof32_Target_32Bit_x86.ilproj} (59%)
 create mode 100644 src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_arm.ilproj
 rename src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/{_il_relsizeof64_Target_32Bit.ilproj => _il_relsizeof64_Target_32Bit_x86.ilproj} (59%)
 create mode 100644 src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_arm.ilproj
 rename src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/{_il_relsizeof_Target_32Bit.ilproj => _il_relsizeof_Target_32Bit_x86.ilproj} (59%)

diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index d23ee70a320a3..bb56963e3224e 100644
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -121,24 +121,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/baseservices/mono/runningmono/*">
             <Issue>This test is to verify we are running mono, and therefore only makes sense on mono.</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit/*">
-            <Issue>https://github.com/dotnet/runtime/issues/37470</Issue>
-        </ExcludeList>
     </ItemGroup>
 
     <!-- All Unix targets on all runtimes -->
@@ -166,24 +148,6 @@
         <ExcludeList Include="$(XunitTestBinBase)/CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubTests/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32BIT/*">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32BIT/*">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32BIT/*">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32BIT/*">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32BIT/*">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32BIT/*">
-            <Issue>needs triage</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)/JIT/jit64/opt/cse/HugeArray1/*">
             <Issue>needs triage</Issue>
         </ExcludeList>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_arm.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_arm.ilproj
new file mode 100644
index 0000000000000..65a24402d953d
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_arm.ilproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.IL">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RestorePackages>true</RestorePackages>
+    <CLRTestPriority>1</CLRTestPriority>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported>
+    <DebugType>Full</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Note arm happens to have the same class layout as 64 bit targets on this test -->
+    <Compile Include="64sizeof32.il" />
+  </ItemGroup>
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_x86.ilproj
similarity index 51%
rename from src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj
rename to src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_x86.ilproj
index 972c489bb437b..572ecc10bf8e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit_x86.ilproj
@@ -3,12 +3,11 @@
     <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
-  </PropertyGroup>
-  <PropertyGroup>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
     <DebugType>Full</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Condition="'$(TargetArchitecture)' == 'x86'" Include="sizeof64.il" />
-    <Compile Condition="'$(TargetArchitecture)' != 'x86'" Include="64sizeof64.il" />
+    <Compile Include="sizeof32.il" />
   </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_arm.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_arm.ilproj
new file mode 100644
index 0000000000000..ddb0208a5e46b
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_arm.ilproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.IL">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RestorePackages>true</RestorePackages>
+    <CLRTestPriority>1</CLRTestPriority>
+    <DebugType>Full</DebugType>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Note arm happens to have the same class layout as 64 bit targets on this test -->
+    <Compile Include="64sizeof64.il" />
+  </ItemGroup>
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_x86.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_x86.ilproj
new file mode 100644
index 0000000000000..7f7c6d1fedcf7
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_32Bit_x86.ilproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk.IL">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RestorePackages>true</RestorePackages>
+    <CLRTestPriority>1</CLRTestPriority>
+    <DebugType>Full</DebugType>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="sizeof64.il" />
+  </ItemGroup>
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_64Bit.ilproj
similarity index 59%
rename from src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit.ilproj
rename to src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_64Bit.ilproj
index 849f46eb4408c..6884ad18cb77a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32_Target_32Bit.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64_Target_64Bit.ilproj
@@ -3,11 +3,11 @@
     <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
-    <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
-    <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
     <DebugType>Full</DebugType>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '64'">true</CLRTestTargetUnsupported>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="sizeof32.il" />
+    <Compile Include="64sizeof64.il" />
   </ItemGroup>
 </Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_arm.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_arm.ilproj
new file mode 100644
index 0000000000000..1362d5ef32697
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_arm.ilproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.IL">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RestorePackages>true</RestorePackages>
+    <CLRTestPriority>1</CLRTestPriority>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported>
+    <DebugType>Full</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Note arm happens to have the same class layout as 64 bit targets on this test -->
+    <Compile Include="64sizeof.il" />
+  </ItemGroup>
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_x86.ilproj
similarity index 58%
rename from src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit.ilproj
rename to src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_x86.ilproj
index a86b6c326ba7c..0d72b3995b715 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof_Target_32Bit_x86.ilproj
@@ -3,8 +3,8 @@
     <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
-    <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
-    <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
     <DebugType>Full</DebugType>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_arm.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_arm.ilproj
new file mode 100644
index 0000000000000..da97def20711a
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_arm.ilproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.IL">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RestorePackages>true</RestorePackages>
+    <CLRTestPriority>1</CLRTestPriority>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported>
+    <DebugType>PdbOnly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Note arm happens to have the same class layout as 64 bit targets on this test -->
+    <Compile Include="64sizeof32.il" />
+  </ItemGroup>
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_x86.ilproj
similarity index 59%
rename from src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit.ilproj
rename to src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_x86.ilproj
index 472701bf4d763..a994cef174203 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32_Target_32Bit_x86.ilproj
@@ -3,8 +3,8 @@
     <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
-    <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
-    <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
     <DebugType>PdbOnly</DebugType>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_arm.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_arm.ilproj
new file mode 100644
index 0000000000000..39e76aef597b3
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_arm.ilproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.IL">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RestorePackages>true</RestorePackages>
+    <CLRTestPriority>1</CLRTestPriority>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported>
+    <DebugType>PdbOnly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Note arm happens to have the same class layout as 64 bit targets on this test -->
+    <Compile Include="64sizeof64.il" />
+  </ItemGroup>
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_x86.ilproj
similarity index 59%
rename from src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit.ilproj
rename to src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_x86.ilproj
index 0cf68852ad24e..a9ed1470bd255 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64_Target_32Bit_x86.ilproj
@@ -3,8 +3,8 @@
     <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
-    <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
-    <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
     <DebugType>PdbOnly</DebugType>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_arm.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_arm.ilproj
new file mode 100644
index 0000000000000..699db1add1736
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_arm.ilproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk.IL">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <RestorePackages>true</RestorePackages>
+    <CLRTestPriority>1</CLRTestPriority>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'armel'">true</CLRTestTargetUnsupported>
+    <DebugType>PdbOnly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Note arm happens to have the same class layout as 64 bit targets on this test -->
+    <Compile Include="64sizeof.il" />
+  </ItemGroup>
+</Project>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_x86.ilproj
similarity index 59%
rename from src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit.ilproj
rename to src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_x86.ilproj
index 7cd349423f116..63101d4a8517b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof_Target_32Bit_x86.ilproj
@@ -3,8 +3,8 @@
     <OutputType>Exe</OutputType>
     <RestorePackages>true</RestorePackages>
     <CLRTestPriority>1</CLRTestPriority>
-    <!-- There is a 32 and 64 version of this test to allow it to be compiled for all targets -->
-    <CLRTestTargetUnsupported Condition="'$(TargetBits)' != '32'">true</CLRTestTargetUnsupported>
+    <!-- There are arch-specific versions of this test to allow it to be compiled for all targets -->
+    <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'x86'">true</CLRTestTargetUnsupported>
     <DebugType>PdbOnly</DebugType>
   </PropertyGroup>
   <ItemGroup>