[NO-MERGE / DESIGN DISCUSSION ONLY] Infra fixes for Ivan's JIT count test

src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

@@ -184,10 +184,12 @@ private static void AddRunnerSource(SourceProductionContext context, ImmutableAr
 
     private static void CheckNoEntryPoint(SourceProductionContext context, CompData compData)
     {
+        /*
         foreach (IMethodSymbol entryPoint in compData.PossibleEntryPoints)
         {
             context.ReportDiagnostic(Diagnostic.Create(Descriptors.XUWG1001, entryPoint.Locations[0]));
         }
+        */
     }
 
     private static void AppendAliasMap(CodeBuilder builder, ImmutableDictionary<string, string> aliasMap)

src/tests/Directory.Build.targets

@@ -153,6 +153,7 @@
   <Target Name="CheckForTestOutsideOfGroup" BeforeTargets="Build">
     <Error Condition="'$(InMergedTestDirectory)' == 'true'
       and '$(OutputType)' == 'Exe'
+      and '$(_CLRTestNeedsToRun)' == 'true'
       and '$(RequiresProcessIsolation)' != 'true'
       and '$(BuildAsStandalone)' != 'true'
       and '$(IsMergedTestRunnerAssembly)' != 'true'"

src/tests/JIT/Performance/JIT.performance.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <MergedWrapperProjectReference Include="*/**/*.??proj" />
+    <MergedWrapperProjectReference Remove="JittedMethodsCountingTest/HelloWorld/Helloworld.csproj" />
   </ItemGroup>
 
   <Import Project="$(TestSourceDir)MergedTestRunner.targets" />

src/tests/JIT/Performance/JittedMethodsCountingTest/HelloWorld/HelloWorld.cs

@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+internal class HelloWorld
+{
+    static int Main(string[] args)
+    {
+        Console.WriteLine("Hello World!");
+        return 0;
+    }
+}

src/tests/JIT/Performance/JittedMethodsCountingTest/HelloWorld/HelloWorld.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <CLRTestKind>BuildOnly</CLRTestKind>
+    <TargetFramework>$(NetCoreAppToolCurrent)</TargetFramework>
+    <!-- <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> -->
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="HelloWorld.cs" />
+  </ItemGroup>
+
+</Project>

src/tests/JIT/Performance/JittedMethodsCountingTest/JittedMethodsCountingTest.cs

@@ -0,0 +1,82 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Xunit;
+
+public class JittedMethodsCountingTest
+{
+    private const int MAX_JITTED_METHODS_ACCEPTED = 50;
+
+    [Fact]
+    public static int TestEntryPoint()
+    {
+        string testAppFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+        string appName = Path.Combine(testAppFolder, "HelloWorld.dll");
+        string jitOutputFile = Path.Combine(testAppFolder, "jits.txt");
+
+        int appResult = RunHelloWorldApp(appName, jitOutputFile);
+        int jits = GetNumberOfJittedMethods(jitOutputFile);
+
+        return jits > 0 && jits <= MAX_JITTED_METHODS_ACCEPTED ? 100 : 101;
+    }
+
+    private static int RunHelloWorldApp(string appName, string jitOutputFile)
+    {
+        int appExitCode = -1;
+        string osExeSuffix = (OperatingSystem.IsWindows() ? ".exe" : "");
+        string coreRootPath = Environment.GetEnvironmentVariable("CORE_ROOT");
+        string coreRunPath = Path.Combine(coreRootPath, "corerun" + osExeSuffix);
+
+        using (Process app = new Process())
+        {
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = coreRunPath,
+                Arguments = appName,
+                CreateNoWindow = true,
+                UseShellExecute = false,
+            };
+
+            Console.WriteLine("Launching: {0} {1}", startInfo.FileName, startInfo.Arguments);
+
+            startInfo.EnvironmentVariables.Add("DOTNET_JitDisasmSummary", "1");
+            startInfo.EnvironmentVariables.Add("DOTNET_TieredCompilation", "0");
+            startInfo.EnvironmentVariables.Add("DOTNET_ReadyToRun", "1");
+            startInfo.EnvironmentVariables.Add("DOTNET_JitStdOutFile", jitOutputFile);
+
+            app.StartInfo = startInfo;
+            app.Start();
+            app.WaitForExit();
+
+            appExitCode = app.ExitCode;
+            Console.WriteLine("Exit code: {0}", appExitCode);
+            Console.WriteLine("JIT file: {0} ({1} B)", jitOutputFile, new FileInfo(jitOutputFile).Length);
+        }
+
+        return appExitCode;
+    }
+
+    private static int GetNumberOfJittedMethods(string jitOutputFile)
+    {
+        string[] lines = File.ReadAllLines(jitOutputFile);
+
+        Console.WriteLine("=========== App standard output ===========");
+        foreach (string line in lines)
+        {
+            Console.WriteLine(line);
+        }
+        Console.WriteLine("=========== End of app standard output ===========");
+
+        string[] tokens = lines.Last().Split(":");
+
+        int numJittedMethods = Int32.Parse(tokens[0]);
+        return numJittedMethods;
+    }
+}
+

src/tests/JIT/Performance/JittedMethodsCountingTest/JittedMethodsCountingTest.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="JittedMethodsCountingTest.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="HelloWorld/HelloWorld.csproj">
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </ProjectReference>
+  </ItemGroup>
+
+  <PropertyGroup>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark/obj/project.assets.json</ProjectAssetsFile>
+  </PropertyGroup>
+</Project>
+

src/tests/JittedMethodsCountingTest/JittedMethodsCounter/JittedMethodsCounter.cs

@@ -0,0 +1,77 @@
+// TODO: Add the Microsoft License header here.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using Xunit;
+
+public class JittedMethodsCounter
+{
+    [Fact]
+    public static int TestEntryPoint()
+    {
+        string appName = "HelloWorld";
+        string jitOutputFile = "jits.txt";
+        int testReturnCode = 0;
+
+        int appResult = RunHelloWorldApp(appName, jitOutputFile);
+        int jits = GetNumberOfJittedMethods(jitOutputFile);
+
+        Console.WriteLine($"\nApp's Exit Code: {appResult}");
+        Console.WriteLine($"App's Total Jitted Methods: {jits}");
+
+        if (jits < 100)
+        {
+            testReturnCode = 100;
+            Console.WriteLine("Less than 100 methods were Jitted so the test"
+                              + " has passed!");
+        }
+        else
+        {
+            testReturnCode = 101;
+            Console.WriteLine("More than 100 methods were Jitted so the test"
+                              + " does not pass.");
+        }
+
+        return testReturnCode;
+    }
+
+    private static int RunHelloWorldApp(string appName, string jitOutputFile)
+    {
+        int exitCode = -1;
+
+        using (Process app = new Process())
+        {
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = appName,
+                CreateNoWindow = true,
+                UseShellExecute = false,
+            };
+
+            startInfo.EnvironmentVariables.Add("DOTNET_JitDisasmSummary", "1");
+            startInfo.EnvironmentVariables.Add("DOTNET_TieredCompilation", "0");
+            startInfo.EnvironmentVariables.Add("DOTNET_ReadyToRun", "1");
+            startInfo.EnvironmentVariables.Add("DOTNET_JitStdOutFile", jitOutputFile);
+
+            app.StartInfo = startInfo;
+            app.Start();
+            app.WaitForExit();
+
+            exitCode = app.ExitCode;
+        }
+
+        return exitCode;
+    }
+
+    private static int GetNumberOfJittedMethods(string jitOutputFile)
+    {
+        string[] tokens = File.ReadLines(jitOutputFile)
+                              .Last()
+                              .Split(":");
+
+        int numJittedMethods = Int32.Parse(tokens[0]);
+        return numJittedMethods;
+    }
+}

src/tests/JittedMethodsCountingTest/JittedMethodsCounter/JittedMethodsCounter.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).cs" />
+  </ItemGroup>
+  <PropertyGroup>
+    <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark\obj\project.assets.json</ProjectAssetsFile>
+  </PropertyGroup>
+
+</Project>

src/tests/JittedMethodsCountingTest/JittedMethodsCountingTest.cs

@@ -0,0 +1,19 @@
+// TODO: Add the Microsoft License header here.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using Xunit;
+
+public class JittedMethodsCountingTest
+{
+    [Fact]
+    public static int TestEntryPoint()
+    {
+        int testReturnCode = 0;
+        return testReturnCode;
+    }
+
+}
+

src/tests/JittedMethodsCountingTest/JittedMethodsCountingTest.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+      <DebugType>pdbonly</DebugType>
+      <Optimize>true</Optimize>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Compile Include="$(MSBuildProjectName).cs" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <ProjectAssetsFile>$(JitPackagesConfigFileDirectory)benchmark/obj/project.assets.json</ProjectAssetsFile>
+    </PropertyGroup>
+</Project>
+

src/tests/build.proj

@@ -28,6 +28,15 @@
     <RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_Arm.csproj" />
     <RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_General.csproj" />
     <RestoreProjects Include="Common\GenerateHWIntrinsicTests\GenerateHWIntrinsicTests_X86.csproj" />
+
+    <!-- Putting this one here for development and testing purposes. -->
+    <!-- Need guidance on how to build it separately but within a Merged Test
+         Project Group. This is due to it being just a simple dotnet app the actual
+         test depends on. Merged Test Groups don't like separate apps being built
+         together with the test projects. -->
+
+    <!-- <RestoreProjects Include="Common\HelloWorld\HelloWorld.csproj" /> -->
+
     <RestoreProjects Include="Common\XUnitLogChecker\XUnitLogChecker.csproj" />
     <RestoreProjects Include="Common\XUnitWrapperGenerator\XUnitWrapperGenerator.csproj" />
     <RestoreProjects Include="Common\XUnitWrapperLibrary\XUnitWrapperLibrary.csproj" />
@@ -612,6 +621,12 @@
       Targets="EmitTestExclusionList"
       Properties="XunitTestBinBase=$(XunitTestBinBase)" />
 
+    <!-- Same as before, putting this here just for testing and development purposes. -->
+    <!-- Explanation is on this file's Line 32-36. -->
+    <!-- <MSBuild -->
+    <!--   Projects="Common/HelloWorld/HelloWorld.csproj" -->
+    <!--   Targets="Build" /> -->
+
     <MSBuild
       Projects="Common\XUnitLogChecker\XUnitLogChecker.csproj"
       Targets="Build" />