Add additional round-trip fixes and add additional unit tests for greater code coverage

docs/workflow/ci/disabling-tests.md

@@ -72,7 +72,11 @@ Some test configurations must be disabled by editing the `.csproj` or `.ilproj`
 and inserting a property in a `<PropertyGroup>`, as follows:
 
 - Prevent a test from running when testing unloadability: add `<UnloadabilityIncompatible>true</UnloadabilityIncompatible>`
-- Prevent a test from running when testing ildasm/ilasm round-tripping: add `<IlasmRoundTripIncompatible>true</IlasmRoundTripIncompatible>`
+- Prevent a test from running when testing ildasm/ilasm round-tripping: add `<IlasmRoundTripIncompatible>true</IlasmRoundTripIncompatible>`. This also disables managed ilasm round-tripping.
+  - Shared-library projects do not need process isolation for this property; merged runners skip their marked assemblies individually.
+- Prevent a test from running only when testing round-tripping with managed ilasm: add `<ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>`
+  - These are temporary workarounds for bugs that must be fixed before we can ship managed ilasm.
+  - Shared-library projects do not need process isolation for this property; merged runners skip their marked assemblies individually.
 - Prevent a test assembly from being passed to the Mono AOT compiler: add `<MonoAotIncompatible>true</MonoAotIncompatible>`
 - Prevent a test from being passed to CrossGen2: add `<CrossGenTest>false</CrossGenTest>`
 - Prevent a test from running in ReadyToRun (R2R) test legs: add `<R2RIncompatible>true</R2RIncompatible>`

docs/workflow/testing/coreclr/requiresprocessisolation.md

@@ -1,9 +1,10 @@
 # When to Set `<RequiresProcessIsolation>true</RequiresProcessIsolation>`
 
 `RequiresProcessIsolation` prevents a test project from being merged into a shared
-test runner process. When set, the test is built as a standalone executable and
-executed in its own process. A test project must set this property when any of the
-rules below apply.
+test runner process. Runnable tests are built as standalone executables and executed
+in their own processes. When set on a shared-library project, it excludes that library
+from merged runner output folders. A runnable test project must set this property when
+any of the rules below apply.
 
 ## Rules
 
@@ -55,9 +56,14 @@ min-opts, or tiered compilation are active. The skip check is per-process.
 
 The test is skipped during SuperPMI collection runs. The skip check is per-process.
 
-### 9. Project sets `<IlasmRoundTripIncompatible>true</IlasmRoundTripIncompatible>`
+### 9. Project sets an IL round-trip incompatibility property
 
-The test is skipped during IL round-trip validation runs. The skip check is per-process.
+`IlasmRoundTripIncompatible` skips the test during all IL round-trip validation runs and
+implies `ManagedIlasmRoundTripIncompatible`. `ManagedIlasmRoundTripIncompatible` skips
+the test only when managed ilasm performs the round trip. Runnable tests need process
+isolation because their skip checks are per-process. Shared-library projects do not need
+process isolation for either property; merged runners skip their marked assemblies
+individually.
 
 ### 10. Project sets `<UnloadabilityIncompatible>true</UnloadabilityIncompatible>`
 
@@ -203,6 +209,7 @@ If the project file contains **any** of the following MSBuild properties or item
 | `JitOptimizationSensitive` | Per-process skip check |
 | `SuperPMICollectIncompatible` | Per-process skip check |
 | `IlasmRoundTripIncompatible` | Per-process skip check |
+| `ManagedIlasmRoundTripIncompatible` | Per-process skip check |
 | `UnloadabilityIncompatible` | Per-process skip check |
 | `IsLongRunningGCTest` | Per-process skip pre-command |
 | `CLRTestExecutionArguments` (non-empty) | Per-process invocation arguments |

docs/workflow/testing/coreclr/test-configuration.md

@@ -53,8 +53,10 @@ Therefore the managed portion of each test **must not contain**:
     * `<JitOptimizationSensitive>true</JitOptimizationSensitive>`
 * Exclude test from NativeAOT runs runs by adding the following to the csproj:
     * `<NativeAotIncompatible>true</NativeAotIncompatible>`
-* Exclude the test from ilasm round trip testing by adding the following to the csproj
+* Exclude the test from all ilasm round-trip testing by adding the following to the csproj. This also implies `ManagedIlasmRoundTripIncompatible`.
     * `<IlasmRoundTripIncompatible>true</IlasmRoundTripIncompatible>`
+* Exclude the test only when round-trip testing with managed ilasm by adding the following to the csproj:
+    * `<ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>`
 * Exclude the test for unloadability (collectible assemblies) testing
     * `<UnloadabilityIncompatible>true</UnloadabilityIncompatible>`
 * If the test is specific for testing crossgen2, and should be compiled as such in all test modes
@@ -142,4 +144,3 @@ Unless tests are manually run on the command line to repro a problem, these para
 `testFilterString` is any string other that `-stripe`. The only filters supported today are the simple form supported in 'dotnet test --filter' (substrings of the test's fully qualified name).
 
 Either the -stripe <whichStripe> <totalStripes> parameter can be used or the TEST_HARNESS_STRIPE_TO_EXECUTE environment variable may be used to control striping. The TEST_HARNESS_STRIPE_TO_EXECUTE environment variable must be set to a string of the form `.<whichStripe>.<totalStripes>` if it is used. `<whichStripe>` is a 0 based index into the count of stripes, `<totalStripes>` is the total number of stripes.
-

eng/pipelines/common/templates/runtimes/run-test-job.yml

@@ -548,6 +548,7 @@ jobs:
         ${{ if in(parameters.testGroup, 'ilasm') }}:
           scenarios:
           - ilasmroundtrip
+          - managedilasmroundtrip
 
     ########################################################################################################
     #

src/coreclr/tools/aot/AotCompilerCommon.props

@@ -1,15 +1,5 @@
 <Project>
-  <PropertyGroup>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
-    <TieredCompilation>false</TieredCompilation>
-    <EventSourceSupport>true</EventSourceSupport>
-    <OptimizationPreference>Speed</OptimizationPreference>
-    <ControlFlowGuard>Guard</ControlFlowGuard>
-    <InvariantGlobalization>true</InvariantGlobalization>
-    <StripSymbols Condition="'$(KeepNativeSymbols)' == 'true'">false</StripSymbols>
-    <XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
-    <StackTraceLineNumberSupport>true</StackTraceLineNumberSupport>
-  </PropertyGroup>
+  <Import Project="NativeAotToolRuntimeSettings.props" />
 
   <PropertyGroup>
     <_LibPrefix Condition="'$(CrossHostArch)' == 'true'">$(LibPrefix)</_LibPrefix>

src/coreclr/tools/aot/NativeAotToolRuntimeSettings.props

@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
+    <TieredCompilation>false</TieredCompilation>
+    <EventSourceSupport>true</EventSourceSupport>
+    <OptimizationPreference>Speed</OptimizationPreference>
+    <ControlFlowGuard>Guard</ControlFlowGuard>
+    <InvariantGlobalization>true</InvariantGlobalization>
+    <StripSymbols Condition="'$(KeepNativeSymbols)' == 'true'">false</StripSymbols>
+    <XmlResolverIsNetworkingEnabledByDefault>false</XmlResolverIsNetworkingEnabledByDefault>
+    <StackTraceLineNumberSupport>true</StackTraceLineNumberSupport>
+  </PropertyGroup>
+</Project>

src/tests/Common/CLRTest.Execute.Bash.targets

@@ -122,6 +122,14 @@ if [ ! -z "$RunningIlasmRoundTrip" ]
 then
   echo SKIPPING EXECUTION BECAUSE RunningIlasmRoundTrip IS SET
   exit $(IncompatibleTestBashScriptExitCode)
+fi
+      ]]></BashCLRTestEnvironmentCompatibilityCheck>
+      <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(ManagedIlasmRoundTripIncompatible)' == 'true' And '$(IlasmRoundTripIncompatible)' != 'true'"><![CDATA[
+$(BashCLRTestEnvironmentCompatibilityCheck)
+if [ ! -z "$RunningIlasmRoundTrip" ] && [ ! -z "$IlasmRoundTripUseManagedIlasm" ]
+then
+  echo "SKIPPING EXECUTION BECAUSE THE TEST IS INCOMPATIBLE WITH MANAGED ILASM ROUND-TRIP"
+  exit $(IncompatibleTestBashScriptExitCode)
 fi
       ]]></BashCLRTestEnvironmentCompatibilityCheck>
       <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(SuperPmiCollectIncompatible)' == 'true'"><![CDATA[

src/tests/Common/CLRTest.Execute.Batch.targets

@@ -129,6 +129,16 @@ IF NOT "%RunningIlasmRoundTrip%"=="" (
   Exit /b 0
 )
       ]]></BatchCLRTestEnvironmentCompatibilityCheck>
+      <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(ManagedIlasmRoundTripIncompatible)' == 'true' And '$(IlasmRoundTripIncompatible)' != 'true'"><![CDATA[
+$(BatchCLRTestEnvironmentCompatibilityCheck)
+IF NOT "%RunningIlasmRoundTrip%"=="" (
+  IF NOT "%IlasmRoundTripUseManagedIlasm%"=="" (
+    ECHO SKIPPING EXECUTION BECAUSE THE TEST IS INCOMPATIBLE WITH MANAGED ILASM ROUND-TRIP
+    popd
+    Exit /b 0
+  )
+)
+      ]]></BatchCLRTestEnvironmentCompatibilityCheck>
 
       <BatchCLRTestEnvironmentCompatibilityCheck Condition="'$(SuperPmiCollectIncompatible)' == 'true'"><![CDATA[
 $(BatchCLRTestEnvironmentCompatibilityCheck)

src/tests/Common/CLRTest.Execute.targets

@@ -80,6 +80,9 @@ This file contains the logic for providing Execution Script generation.
 
   <Import Project="CLRTest.Jit.targets" />
   <Import Project="CLRTest.CrossGen.targets" />
+  <PropertyGroup>
+    <ManagedIlasmRoundTripIncompatible Condition="'$(IlasmRoundTripIncompatible)' == 'true'">true</ManagedIlasmRoundTripIncompatible>
+  </PropertyGroup>
   <Import Project="CLRTest.GC.targets" />
   <Import Project="CLRTest.Execute.*.targets" />
   <Import Project="CLRTest.MockHosting.targets" Condition="'$(RequiresMockHostPolicy)' == 'true'" />

src/tests/Common/CLRTest.Jit.targets

@@ -336,7 +336,8 @@ def is_managed_exe_assembly(file):
 print("")
 print("ILASM RoundTrips")
 
-if os.environ.get("IlasmRoundTripUseManagedIlasm") == "1":
+use_managed_ilasm = os.environ.get("IlasmRoundTripUseManagedIlasm") == "1"
+if use_managed_ilasm:
   ilasm_path = os.path.join(os.environ["CORE_ROOT"], "managed-ilasm", "ilasm")
 else:
   ilasm_path = os.path.join(os.environ["CORE_ROOT"], "ilasm")
@@ -345,6 +346,17 @@ if not os.path.exists("IL-RT"):
   os.mkdir("IL-RT")
 
 for inputAssemblyName in glob.glob("*.dll"):
+  assemblyNameWithoutExtension = os.path.splitext(inputAssemblyName)[0]
+  ilasm_incompatible_marker = assemblyNameWithoutExtension + ".IlasmRoundTripIncompatible"
+  if os.path.isfile(ilasm_incompatible_marker):
+      print("Skipping ILASM round trip for " + inputAssemblyName)
+      continue
+
+  managed_ilasm_incompatible_marker = assemblyNameWithoutExtension + ".ManagedIlasmRoundTripIncompatible"
+  if use_managed_ilasm and os.path.isfile(managed_ilasm_incompatible_marker):
+      print("Skipping managed ILASM round trip for " + inputAssemblyName)
+      continue
+
   if is_managed_assembly(inputAssemblyName):
       print("ILASM RoundTrip for " + inputAssemblyName)
 

src/tests/Directory.Build.targets

@@ -442,6 +442,12 @@
       <MarkerFile Include="$(IntermediateOutputPath)\$(MSBuildProjectName).XHarnessNoRunner" Condition="'$(EmitXHarnessNoRunnerMarkerFile)' == 'true'">
         <Type>XHarnessNoRunner</Type>
       </MarkerFile>
+      <MarkerFile Include="$(IntermediateOutputPath)\$(AssemblyName).IlasmRoundTripIncompatible" Condition="'$(IlasmRoundTripIncompatible)' == 'true'">
+        <Type>IlasmRoundTripIncompatible</Type>
+      </MarkerFile>
+      <MarkerFile Include="$(IntermediateOutputPath)\$(AssemblyName).ManagedIlasmRoundTripIncompatible" Condition="'$(ManagedIlasmRoundTripIncompatible)' == 'true'">
+        <Type>ManagedIlasmRoundTripIncompatible</Type>
+      </MarkerFile>
       <MarkerFile Include="$(IntermediateOutputPath)\$(AssemblyName).NoMonoAot" Condition="'$(MonoAotIncompatible)' == 'true'">
         <Type>NoMonoAot</Type>
       </MarkerFile>

src/tests/JIT/Directed/Directed_d.csproj

@@ -3,6 +3,8 @@
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
     <HasMergedInTests>true</HasMergedInTests>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <ItemGroup>
     <MergedWrapperProjectReference Include="coverage\importer\badendfinally.ilproj" />

src/tests/JIT/Directed/Directed_do.csproj

@@ -3,6 +3,8 @@
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
     <HasMergedInTests>true</HasMergedInTests>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
     <_UseOutOfProcessPhysicalPromotionTests Condition="'$(TargetsMobile)' != 'true' or ('$(TargetsBrowser)' == 'true' and '$(RuntimeFlavor)' == 'coreclr')">true</_UseOutOfProcessPhysicalPromotionTests>
   </PropertyGroup>
   <ItemGroup>

src/tests/JIT/Directed/Directed_r.csproj

@@ -3,6 +3,8 @@
     <DebugType>None</DebugType>
     <Optimize>False</Optimize>
     <HasMergedInTests>true</HasMergedInTests>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <ItemGroup>
     <MergedWrapperProjectReference Include="arglist\vararg_TargetWindows.csproj" />

src/tests/JIT/Directed/Directed_ro.csproj

@@ -3,6 +3,8 @@
     <DebugType>None</DebugType>
     <Optimize>True</Optimize>
     <HasMergedInTests>true</HasMergedInTests>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <ItemGroup>
     <MergedWrapperProjectReference Include="array-il\_Arrayscomplex3.ilproj" />

src/tests/JIT/Directed/tls/mutualrecurthd-tls.ilproj

@@ -3,6 +3,8 @@
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test relies on tls support see #2441 -->
     <DisableProjectBuild>true</DisableProjectBuild>
+    <!-- Managed ilasm does not support TLS RVA data declarations. -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

src/tests/JIT/Directed/tls/test-tls.ilproj

@@ -3,6 +3,8 @@
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test relies on tls support see #2441 -->
     <DisableProjectBuild>true</DisableProjectBuild>
+    <!-- Managed ilasm does not support TLS RVA data declarations. -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_r.csproj

@@ -4,6 +4,9 @@
 
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
 
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
+
     <!-- Various platforms will always throw, so we don't want to spend cycles running tests unnecessarily -->
     <!-- We don't need to worry about coverage as we have a number of stress tests that can disable intrinsics per ISA and run on the normally supported platforms -->
     <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm64'">true</CLRTestTargetUnsupported>

src/tests/JIT/HardwareIntrinsics/HardwareIntrinsics_Arm_ro.csproj

@@ -4,6 +4,9 @@
 
     <GCStressIncompatible Condition="'$(TargetArchitecture)' == 'arm64' and '$(TargetOS)' == 'osx'">true</GCStressIncompatible>
 
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
+
     <!-- Various platforms will always throw, so we don't want to spend cycles running tests unnecessarily -->
     <!-- We don't need to worry about coverage as we have a number of stress tests that can disable intrinsics per ISA and run on the normally supported platforms -->
     <CLRTestTargetUnsupported Condition="'$(TargetArchitecture)' != 'arm64'">true</CLRTestTargetUnsupported>

src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/Avx512F_r.csproj

@@ -2,6 +2,8 @@
   <PropertyGroup>
     <AssemblyName>X86_Avx512F_r</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>

src/tests/JIT/HardwareIntrinsics/X86_Avx512/Avx512F/Avx512F_ro.csproj

@@ -2,6 +2,8 @@
   <PropertyGroup>
     <AssemblyName>X86_Avx512F_ro</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Embedded</DebugType>

src/tests/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj

@@ -3,6 +3,8 @@
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test relies on tls support see #2441 -->
     <DisableProjectBuild>true</DisableProjectBuild>
+    <!-- Managed ilasm does not support TLS RVA data declarations. -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

src/tests/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj

@@ -3,6 +3,8 @@
     <CLRTestPriority>1</CLRTestPriority>
     <!-- Test relies on tls support see #2441 -->
     <DisableProjectBuild>true</DisableProjectBuild>
+    <!-- Managed ilasm does not support TLS RVA data declarations. -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>PdbOnly</DebugType>

src/tests/JIT/jit64/opt/cse/HugeArray1.csproj

@@ -2,6 +2,8 @@
   <PropertyGroup>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
     <!-- Tracking issue: https://github.com/dotnet/runtime/issues/46622 -->
     <DisableProjectBuild Condition="'$(RuntimeVariant)' == 'monointerpreter' or '$(MonoForceInterpreter)' == 'true'">true</DisableProjectBuild>
   </PropertyGroup>

src/tests/JIT/jit64/opt/cse/HugeField1.csproj

@@ -2,6 +2,8 @@
   <PropertyGroup>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="HugeField1.cs" />

src/tests/JIT/jit64/opt/cse/HugeField2.csproj

@@ -5,6 +5,8 @@
   <PropertyGroup>
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="HugeField2.cs" />

src/tests/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj

@@ -2,6 +2,8 @@
   <PropertyGroup>
     <DebugType>Full</DebugType>
     <Optimize>True</Optimize>
+    <!-- Managed ilasm consumes excessive amount of memory -->
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="hugeSimpleExpr1.cs" />

src/tests/Loader/classloader/regressions/dev10_403582/genmeth.ilproj

@@ -3,6 +3,8 @@
     <!-- Without process isolation, this support assembly gets copied to the merged wrapper folder -->
     <!-- where it subsequently crashes the LLVM AOT compiler. -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
+    <!-- ildasm crashes on this assembly. See https://github.com/dotnet/runtime/issues/127576 -->
+    <IlasmRoundTripIncompatible>true</IlasmRoundTripIncompatible>
     <OutputType>Library</OutputType>
     <CLRTestKind>SharedLibrary</CLRTestKind>
   </PropertyGroup>

src/tests/Loader/classloader/regressions/dev10_403582/gentype.ilproj

@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.IL">
   <PropertyGroup>
+    <ManagedIlasmRoundTripIncompatible>true</ManagedIlasmRoundTripIncompatible>
     <OutputType>Library</OutputType>
   </PropertyGroup>
   <ItemGroup>

src/tools/ilasm/KNOWN-ISSUES.md

@@ -24,3 +24,7 @@ Currently managed ilasm does not do any optimizations of the IL written by the u
 ## -FOLD is a no-op
 
 Currently managed ilasm does not fold identical IL bodies from different methods into the same blob.
+
+## VTable Exports don't support ARM32
+
+VTable exports are Windows-only and Windows ARM32 is unsupported, so managed ILASM doesn't support them.