Enable IlasmRoundTrip tests for merged tests

eng/Subsets.props

@@ -336,7 +336,8 @@
                              $(CoreClrProjectRoot)tools\r2rdump\R2RDump.csproj;
                              $(CoreClrProjectRoot)tools\dotnet-pgo\dotnet-pgo.csproj;
                              $(CoreClrProjectRoot)tools\aot\ILCompiler\repro\repro.csproj;
-                             $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
+                             $(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj;
+                             $(CoreClrProjectRoot)tools\AssemblyChecker\AssemblyChecker.csproj" Category="clr" Condition="'$(DotNetBuildFromSource)' != 'true'"/>
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.Build.Tasks\ILCompiler.Build.Tasks.csproj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />
     <ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Category="clr" Condition="'$(NativeAotSupported)' == 'true'" />

src/coreclr/tools/AssemblyChecker/AssemblyChecker.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyName>AssemblyChecker</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendTargetFrameworkToOutputPath Condition="'$(BuildingInsideVisualStudio)' == 'true'">true</AppendTargetFrameworkToOutputPath>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <OutputPath>$(RuntimeBinDir)\AssemblyChecker</OutputPath>
+    <RunAnalyzers>false</RunAnalyzers>
+  </PropertyGroup>
+</Project>

src/coreclr/tools/AssemblyChecker/Program.cs

@@ -0,0 +1,124 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// This is a simple console application that is designed to answer True or False
+// questions about whether a given file is a managed assembly or not.
+// You can also ask whether or not the assembly is debuggable.
+// Return code of 0 indicates the file is a managed assembly.
+// Return code of 1 indicates the file is not a managed assembly. No errors will be printed for this one.
+
+using System.Text;
+using System.Diagnostics;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+
+namespace AssemblyChecker
+{
+    public class Program
+    {
+        static bool IsAssembly(string path)
+        {
+            using var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+            // Try to read CLI metadata from the PE file.
+            using var peReader = new PEReader(fs);
+
+            if (!peReader.HasMetadata)
+            {
+                return false; // File does not have CLI metadata.
+            }
+
+            // Check that file has an assembly manifest.
+            MetadataReader reader = peReader.GetMetadataReader();
+            return reader.IsAssembly;
+        }
+
+        static bool IsDebug(string path)
+        {
+            var asm = Assembly.LoadFrom(path);
+            object[] attribs = asm.GetCustomAttributes(typeof(DebuggableAttribute), false);
+
+            if (attribs.Length > 0)
+            {
+                return
+                    attribs.Any(x =>
+                    {
+                        DebuggableAttribute? debuggableAttribute = attribs[0] as DebuggableAttribute;
+                        if (debuggableAttribute != null)
+                        {
+                            return debuggableAttribute.IsJITOptimizerDisabled;
+                        }
+                        return false;
+                    });
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        static bool IsExe(string path)
+        {
+            using var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+            // Try to read CLI metadata from the PE file.
+            using var peReader = new PEReader(fs);
+
+            if (!peReader.HasMetadata)
+            {
+                return false; // File does not have CLI metadata.
+            }
+
+            return peReader.PEHeaders.IsExe;
+        }
+
+        static int Main(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                Console.Error.WriteLine("Expected assembly file-path.");
+                return 2;
+            }
+
+            if (args.Length == 1)
+            {
+                if (IsAssembly(args[0]))
+                    return 0;
+                else
+                    return 1;
+            }
+
+            if (args.Length == 2)
+            {
+                switch (args[0])
+                {
+                    case "--is-debug":
+                        {
+                            if (IsDebug(args[1]))
+                                return 0;
+                            else
+                                return 1;
+                        }
+
+                    case "--is-exe":
+                        {
+                            if (IsExe(args[1]))
+                                return 0;
+                            else
+                                return 1;
+                        }
+
+                    default:
+                        {
+                            Console.Error.WriteLine("Invalid option.");
+                            return 2;
+                        }
+                }
+            }
+
+            Console.Error.WriteLine("Too many arguments.");
+            return 2;
+        }
+    }
+}

src/tests/Common/CLRTest.Jit.targets

@@ -55,60 +55,22 @@ export RunningIlasmRoundTrip=
 ]]>
       </IlasmRoundTripBashScript>
 
-      <IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
+      <IlasmRoundTripBashScript Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(IlasmRoundTripIncompatible)' != 'true'"><![CDATA[
 # IlasmRoundTrip Script
-# Disable Ilasm round-tripping for Linker tests.
-# Todo: Ilasm round-trip on linked binaries.
 
 if [ -z "$DoLink" -a ! -z "$RunningIlasmRoundTrip" ];
 then
-  mkdir IL-RT
-  cp $(InputAssemblyName) $(TargetAssemblyName)
-  echo "$CORE_ROOT/ildasm" -raweh -unicode -out=$(DisassemblyName) $(TargetAssemblyName)
-  "$CORE_ROOT/ildasm" -raweh -unicode -out=$(DisassemblyName) $(TargetAssemblyName)
+  python3 $(AssemblyName)_ilasmroundtrip.py
   ERRORLEVEL=$?
   if [ $ERRORLEVEL -ne 0 ]
   then
-    echo EXECUTION OF ILDASM - FAILED $ERRORLEVEL
-    exit 1
-  fi
-  if [ ! -f "$(DisassemblyName)" ]
-  then
-    echo "EXECUTION OF ILDASM - FAILED $(DisassemblyName) is missing"
-    exit 1
-  fi
-
-  ilasm_count=1
-  while true
-  do
-    echo "$CORE_ROOT/ilasm" -output=$(InputAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
-    "$CORE_ROOT/ilasm" -output=$(InputAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
-    ERRORLEVEL=$?
-    if [ $ERRORLEVEL -eq 0 ]
-    then
-      break
-    fi
-
-    echo EXECUTION $ilasm_count OF ILASM - FAILED with $ERRORLEVEL
-
-    if [ $ilasm_count -eq 3 ]
-    then
-      break
-    fi
-
-    ((ilasm_count++))
-    echo Trying again
-    sleep 10
-  done
-
-  if [ $ERRORLEVEL -ne 0 ]
-  then
+    echo ILASM ROUND-TRIP - FAILED $ERRORLEVEL
     exit 1
   fi
 fi
 ]]>
       </IlasmRoundTripBashScript>
-      <BashIlrtTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
+      <BashIlrtTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(IlasmRoundTripIncompatible)' != 'true'"><![CDATA[
 if [ -z "$DoLink" -a ! -z "$RunningIlasmRoundTrip" ];
 then
   echo $LAUNCHER $(InputAssemblyName) %24(printf "'%s' " "${CLRTestExecutionArguments[@]}")
@@ -140,46 +102,21 @@ set RunningIlasmRoundTrip=
 ]]>
       </IlasmRoundTripBatchScript>
 
-      <IlasmRoundTripBatchScript Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
+      <IlasmRoundTripBatchScript Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(IlasmRoundTripIncompatible)' != 'true'"><![CDATA[
 REM IlasmRoundTrip Script
-REM Disable Ilasm round-tripping for Linker tests.
-REM Todo: Ilasm round-trip on linked binaries.
+
 IF NOT DEFINED DoLink (
   IF DEFINED RunningIlasmRoundTrip (
-    mkdir IL-RT
-    copy $(InputAssemblyName) $(TargetAssemblyName)
-    ECHO %CORE_ROOT%\ildasm.exe /raweh /unicode /out=$(DisassemblyName) $(TargetAssemblyName)
-    %CORE_ROOT%\ildasm.exe /raweh /unicode /out=$(DisassemblyName) $(TargetAssemblyName)
-
-    IF NOT "!ERRORLEVEL!"=="0" (
-      ECHO EXECUTION OF ILDASM - FAILED !ERRORLEVEL!
-      Exit /b 1
-    )
-    IF NOT EXIST $(DisassemblyName) (
-      ECHO EXECUTION OF ILDASM - FAILED $(DisassemblyName) is missing
-      Exit /b 1
-    )
-
-   set ilasm_count=1
-:Try_ilasm
-    ECHO %CORE_ROOT%\ilasm.exe /output=$(InputAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
-    %CORE_ROOT%\ilasm.exe /output=$(InputAssemblyName) $(_IlasmSwitches) $(DisassemblyName)
+    python $(AssemblyName)_ilasmroundtrip.py
     IF NOT "!ERRORLEVEL!"=="0" (
-      ECHO EXECUTION OF ILASM - Try !ilasm_count! FAILED with status !ERRORLEVEL! 
-      IF !ilasm_count! LEQ 3 (
-        ECHO Trying again
-        set /A ilasm_count=ilasm_count+1
-        timeout /t 10 /nobreak
-        goto :Try_ilasm
-      )
-      ECHO EXECUTION OF ILASM - FAILED
+      ECHO ILASM ROUND-TRIP - FAILED !ERRORLEVEL!
       Exit /b 1
     )
   )
 )
 ]]>
       </IlasmRoundTripBatchScript>
-      <BatchIlrtTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun'"><![CDATA[
+      <BatchIlrtTestLaunchCmds Condition="'$(CLRTestKind)' == 'BuildAndRun' And '$(IlasmRoundTripIncompatible)' != 'true'"><![CDATA[
 IF NOT DEFINED DoLink (
   if defined RunningIlasmRoundTrip (
     ECHO %LAUNCHER% $(InputAssemblyName) %CLRTestExecutionArguments%
@@ -365,6 +302,109 @@ set DOTNET_JitPath=%CORE_ROOT%\superpmi-shim-collector.dll
     </PropertyGroup>
   </Target>
 
+  <!--
+  ***********************************************************************************************
+  IlasmRoundTrip for merged tests
+  ***********************************************************************************************
+  -->
+
+  <Target Name="IlasmRoundTripCommand" AfterTargets="AfterBuild" Condition="'$(IlasmRoundTripIncompatible)' != 'true'">
+    <PropertyGroup>
+      <InputAssemblyName>$(AssemblyName).dll</InputAssemblyName>
+      <DisassemblyName>IL-RT/$(AssemblyName).il</DisassemblyName>
+      <TargetAssemblyName>IL-RT/$(AssemblyName).dll</TargetAssemblyName>
+      <_IlasmRoundTripScriptText><![CDATA[
+import os
+import shutil
+import subprocess
+import sys
+import glob
+
+def is_managed_assembly(file):
+    proc = subprocess.Popen([f'{os.environ["CORE_ROOT"]}/corerun', f'{os.environ["CORE_ROOT"]}/AssemblyChecker/AssemblyChecker.dll', file])
+
+    try:
+        proc.communicate()
+        return proc.returncode == 0
+    except:
+        proc.kill()
+        return False
+
+def is_managed_debug_assembly(file):
+    proc = subprocess.Popen([f'{os.environ["CORE_ROOT"]}/corerun', f'{os.environ["CORE_ROOT"]}/AssemblyChecker/AssemblyChecker.dll', "--is-debug", file])
+
+    try:
+        proc.communicate()
+        return proc.returncode == 0
+    except:
+        proc.kill()
+        return False
+
+def is_managed_exe_assembly(file):
+    proc = subprocess.Popen([f'{os.environ["CORE_ROOT"]}/corerun', f'{os.environ["CORE_ROOT"]}/AssemblyChecker/AssemblyChecker.dll', "--is-exe", file])
+
+    try:
+        proc.communicate()
+        return proc.returncode == 0
+    except:
+        proc.kill()
+        return False
+
+print("")
+print("ILASM RoundTrips")
+
+if not os.path.exists("IL-RT"):
+  os.mkdir("IL-RT")
+
+for inputAssemblyName in glob.glob("*.dll"):
+  if is_managed_assembly(inputAssemblyName):
+      print("ILASM RoundTrip for " + inputAssemblyName)
+
+      ilasmSwitches = ""
+
+      if not is_managed_exe_assembly(inputAssemblyName):
+        ilasmSwitches = ilasmSwitches + " -DLL"
+
+      if is_managed_debug_assembly(inputAssemblyName):
+        ilasmSwitches = ilasmSwitches + " -DEBUG"
+
+      disassemblyName = os.path.join("IL-RT", os.path.splitext(os.path.basename(inputAssemblyName))[0] + ".il")
+      targetAssemblyName = os.path.join("IL-RT", os.path.basename(inputAssemblyName))
+
+      shutil.copyfile(inputAssemblyName, targetAssemblyName)
+
+      ildasm_args = f'{os.environ["CORE_ROOT"]}/ildasm -raweh -unicode -out={disassemblyName} {targetAssemblyName}'
+      print(ildasm_args)
+      proc = subprocess.Popen(ildasm_args, shell=True)
+
+      try:
+          proc.communicate()
+      except:
+          proc.kill()
+          sys.exit(1)
+
+      ilasm_args = f'{os.environ["CORE_ROOT"]}/ilasm -output={inputAssemblyName} {ilasmSwitches} {disassemblyName}'
+      print(ilasm_args)
+      proc = subprocess.Popen(ilasm_args, shell=True)
+
+      try:
+          proc.communicate()
+      except:
+          proc.kill()
+          sys.exit(1)
+
+      print("")
+
+print("")
+
+]]></_IlasmRoundTripScriptText>
+    </PropertyGroup>
+    <WriteLinesToFile
+      File="$(OutputPath)$(AssemblyName)_ilasmroundtrip.py"
+      Lines="$(_IlasmRoundTripScriptText)"
+      Overwrite="true" />
+  </Target>
+
   <!--
   ***********************************************************************************************
   GCStress settings

src/tests/Common/Directory.Build.targets

@@ -113,6 +113,11 @@
         <IncludeSubFolders>True</IncludeSubFolders>
       </RunTimeArtifactsIncludeFolders>
 
+      <!-- Used to determine if a file is a managed assembly or a managed assembly built with DEBUG -->
+      <RunTimeArtifactsIncludeFolders Include="AssemblyChecker/" TargetDir="AssemblyChecker/">
+        <IncludeSubFolders>True</IncludeSubFolders>
+      </RunTimeArtifactsIncludeFolders>
+
       <!-- XUnit runner harness assemblies that we don't want to mix in with the framework in Core_Root -->
       <RunTimeArtifactsIncludeFolders Include="xunit/" TargetDir="xunit/" />
     </ItemGroup>

src/tests/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj

@@ -3,6 +3,7 @@
     <!-- Needed for JIT/superpmi/superpmicollect.csproj which depends on the
          individual test .cmd file -->
     <RequiresProcessIsolation>true</RequiresProcessIsolation>
+    <IlasmRoundTripIncompatible>true</IlasmRoundTripIncompatible>
   </PropertyGroup>
   <PropertyGroup>
     <DebugType>Full</DebugType>