[RuntimeAsync] Make runtime async tests to build and pass locally. (#115499)

* missing parts to make tests buildable

* move tests into directories

* intrisics location

* fix for arm64

Author: VSadov

src/coreclr/jit/importer.cpp

@@ -6041,7 +6041,7 @@ bool Compiler::impMatchAwaitPattern(const BYTE* codeAddr, const BYTE* codeEndp,
 
         // check if it is an Await intrinsic
         if (eeIsIntrinsic(nextCallTok.hMethod) &&
-            lookupNamedIntrinsic(nextCallTok.hMethod) == NI_System_Runtime_CompilerServices_RuntimeHelpers_Await)
+            lookupNamedIntrinsic(nextCallTok.hMethod) == NI_System_Runtime_CompilerServices_AsyncHelpers_Await)
         {
             // yes, this is an Await
             return true;

src/coreclr/jit/importercalls.cpp

@@ -3333,15 +3333,15 @@ GenTree* Compiler::impIntrinsic(CORINFO_CLASS_HANDLE    clsHnd,
         return node;
     }
 
-    if (ni == NI_System_Runtime_CompilerServices_RuntimeHelpers_AsyncSuspend)
+    if (ni == NI_System_Runtime_CompilerServices_AsyncHelpers_AsyncSuspend)
     {
         GenTree* node = gtNewOperNode(GT_RETURN_SUSPEND, TYP_VOID, impPopStack().val);
         node->SetHasOrderingSideEffect();
         node->gtFlags |= GTF_CALL | GTF_GLOB_REF;
         return node;
     }
 
-    if (ni == NI_System_Runtime_CompilerServices_RuntimeHelpers_Await)
+    if (ni == NI_System_Runtime_CompilerServices_AsyncHelpers_Await)
     {
         // These are marked intrinsics simply to match them by name in
         // the Await pattern optimization. Make sure we keep pIntrinsicName assigned
@@ -11059,13 +11059,16 @@ NamedIntrinsic Compiler::lookupNamedIntrinsic(CORINFO_METHOD_HANDLE method)
                             {
                                 result = NI_System_Runtime_CompilerServices_RuntimeHelpers_GetMethodTable;
                             }
-                            else if (strcmp(methodName, "Await") == 0)
+                        }
+                        else if (strcmp(className, "AsyncHelpers") == 0)
+                        {
+                            if (strcmp(methodName, "AsyncSuspend") == 0)
                             {
-                                result = NI_System_Runtime_CompilerServices_RuntimeHelpers_Await;
+                                result = NI_System_Runtime_CompilerServices_AsyncHelpers_AsyncSuspend;
                             }
-                            else if (strcmp(methodName, "AsyncSuspend") == 0)
+                            else if (strcmp(methodName, "Await") == 0)
                             {
-                                result = NI_System_Runtime_CompilerServices_RuntimeHelpers_AsyncSuspend;
+                                result = NI_System_Runtime_CompilerServices_AsyncHelpers_Await;
                             }
                         }
                         else if (strcmp(className, "StaticsHelpers") == 0)

src/coreclr/jit/namedintrinsiclist.h

@@ -121,8 +121,9 @@ enum NamedIntrinsic : unsigned short
     NI_System_Runtime_CompilerServices_RuntimeHelpers_IsKnownConstant,
     NI_System_Runtime_CompilerServices_RuntimeHelpers_IsReferenceOrContainsReferences,
     NI_System_Runtime_CompilerServices_RuntimeHelpers_GetMethodTable,
-    NI_System_Runtime_CompilerServices_RuntimeHelpers_Await,
-    NI_System_Runtime_CompilerServices_RuntimeHelpers_AsyncSuspend,
+
+    NI_System_Runtime_CompilerServices_AsyncHelpers_AsyncSuspend,
+    NI_System_Runtime_CompilerServices_AsyncHelpers_Await,
 
     NI_System_Runtime_CompilerServices_StaticsHelpers_VolatileReadAsByref,
 

src/coreclr/vm/arm64/stubs.cpp

@@ -772,7 +772,7 @@ void HijackFrame::UpdateRegDisplay_Impl(const PREGDISPLAY pRD, bool updateFloats
 
      pRD->volatileCurrContextPointers.X0 = &m_Args->X0;
      pRD->volatileCurrContextPointers.X1 = &m_Args->X1;
-     pRD->volatileCurrContextPointers.X1 = &m_Args->X2;
+     pRD->volatileCurrContextPointers.X2 = &m_Args->X2;
 
      pRD->pCurrentContext->X19 = m_Args->X19;
      pRD->pCurrentContext->X20 = m_Args->X20;

src/tests/async/Directory.Build.props

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Merged.props', $(MSBuildThisFileDirectory)..))" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', $(MSBuildThisFileDirectory)..))" />
+
+  <PropertyGroup>
+    <RunAnalyzers>true</RunAnalyzers>
+    <NoWarn>$(NoWarn);xUnit1013</NoWarn>
+    <EnableNETAnalyzers>false</EnableNETAnalyzers>
+  </PropertyGroup>
+</Project>

src/tests/async/asynctests.csproj src/tests/async/async.csprojsrc/tests/async/asynctests.csproj renamed to src/tests/async/async.csproj

@@ -1,8 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <ItemGroup>
     <MergedWrapperProjectReference Include="*/**/*.??proj" />
-    <MergedWrapperProjectReference Include="*.??proj" />
-    <MergedWrapperProjectReference Remove="$(MSBuildProjectName).csproj" />
 
     <!-- Remove manual benchmarks from the test wrapper -->
     <MergedWrapperProjectReference Remove="eh-microbench.csproj" />