Merge branch 'main' into wasi_testing

dotnet · Sep 4, 2024 · 3321dd6 · 3321dd6
2 parents 6136d63 + 6e68f92
commit 3321dd6
Show file tree

Hide file tree

Showing 103 changed files with 1,707 additions and 570 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "9.0.0-prerelease.24420.3",
+      "version": "9.0.0-prerelease.24452.1",
       "commands": [
         "xharness"
       ]

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -316,17 +316,17 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>7cb32e193a55a95c74fc3bd56501b951b48b700f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24420.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24452.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>69f15217657bc3a7f0102911aa967525529fdfdb</Sha>
+      <Sha>c2215b88cdac5390888de3e6ad301c113f40ed6c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24420.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.24452.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>69f15217657bc3a7f0102911aa967525529fdfdb</Sha>
+      <Sha>c2215b88cdac5390888de3e6ad301c113f40ed6c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24420.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.24452.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>69f15217657bc3a7f0102911aa967525529fdfdb</Sha>
+      <Sha>c2215b88cdac5390888de3e6ad301c113f40ed6c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24423.2">
       <Uri>https://github.com/dotnet/arcade</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -180,9 +180,9 @@
     <!-- Testing -->
     <MicrosoftNETCoreCoreDisToolsVersion>1.4.0</MicrosoftNETCoreCoreDisToolsVersion>
     <MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24420.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24420.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24420.3</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.24452.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.24452.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.24452.1</MicrosoftDotNetXHarnessCLIVersion>
     <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.24419.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <NUnitVersion>3.12.0</NUnitVersion>
     <NUnit3TestAdapterVersion>4.5.0</NUnit3TestAdapterVersion>

diff --git a/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml b/eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
@@ -68,7 +68,7 @@ steps:
           displayName: "AOT compile CoreCLR tests"
           target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
       - ${{ if in(parameters.runtimeVariant, 'llvmfullaot', 'minifullaot') }}:
-        - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:1
+        - script: $(Build.SourcesDirectory)/src/tests/build$(scriptExt) $(logRootNameArg)MonoAot mono_fullaot ${{ parameters.buildConfig }} ${{ parameters.archType }} /p:RuntimeVariant=${{ parameters.runtimeVariant }} -maxcpucount:2
           displayName: "AOT compile CoreCLR tests"
           target: ${{ coalesce(parameters.llvmAotStepContainer, parameters.container) }}
     - ${{ if eq(parameters.archType, 'arm64') }}:

diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml
@@ -78,6 +78,7 @@ jobs:
           export NODE_MAJOR=18 &&
           echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list &&
           sudo apt-get update &&
+          sudo apt autoremove -y &&
           sudo apt-get install nodejs -y &&
           test -n "$(V8Version)" &&
           npm install --prefix $HELIX_WORKITEM_PAYLOAD jsvu -g &&

diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml
@@ -99,7 +99,10 @@ extends:
         displayName: Docker NanoServer
         timeoutInMinutes: 150
         variables:
-          DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share"
+          # This will get assigned to the DUMPS_SHARE_MOUNT_ROOT environment
+          # variable in the stress test script. We need to keep the
+          # DUMPS_SHARE_MOUNT_ROOT variable empty during the build step.
+          DUMPS_SHARE_MOUNT_ROOT_PATH: "C:/dumps-share"
 
           # The 1es-windows-2022-open image has an issue where the Chocolatey-installed V1 docker-compose takes precendence over the
           # V2 docker-compose required by the stress tests, see: https://github.com/actions/runner-images/issues/7080
@@ -140,6 +143,7 @@ extends:
 
         - powershell: |
             cd '$(httpStressProject)'
+            $env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
             $env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/3.0"
             $env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/3.0"
             New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory
@@ -152,6 +156,7 @@ extends:
 
         - powershell: |
             cd '$(httpStressProject)'
+            $env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
             $env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/2.0"
             $env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/2.0"
             New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory
@@ -164,6 +169,7 @@ extends:
 
         - powershell: |
             cd '$(httpStressProject)'
+            $env:DUMPS_SHARE_MOUNT_ROOT = $env:DUMPS_SHARE_MOUNT_ROOT_PATH
             $env:CLIENT_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/client/1.1"
             $env:SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/1.1"
             New-Item -Force $env:CLIENT_DUMPS_SHARE -ItemType Directory

diff --git a/eng/pipelines/runtime-llvm.yml b/eng/pipelines/runtime-llvm.yml
@@ -144,7 +144,7 @@ extends:
             nameSuffix: AllSubsets_Mono_LLVMFULLAOT_RuntimeTests
             runtimeVariant: llvmfullaot
             buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) /p:MonoEnableLLVM=true
-            timeoutInMinutes: 360
+            timeoutInMinutes: 400
             condition: >-
               or(
                 eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
@@ -191,7 +191,7 @@ extends:
             nameSuffix: AllSubsets_Mono_LLVMFULLAOT_RuntimeIntrinsicsTests
             runtimeVariant: llvmfullaot
             buildArgs: -s mono+libs+clr.hosts+clr.iltools -c $(_BuildConfig) /p:MonoEnableLLVM=true
-            timeoutInMinutes: 360
+            timeoutInMinutes: 400
             condition: >-
               or(
                 eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),

diff --git a/src/coreclr/gc/gc.cpp b/src/coreclr/gc/gc.cpp
@@ -16,6 +16,43 @@
 // allocation helpers in gcscan.cpp
 //
 
+#include "common.h"
+#include "gcenv.h"
+
+#include "gc.h"
+#include "gcscan.h"
+#include "gcdesc.h"
+#include "softwarewritewatch.h"
+#include "handletable.h"
+#include "handletable.inl"
+#include "gcenv.inl"
+#include "gceventstatus.h"
+
+#ifdef __INTELLISENSE__
+#if defined(FEATURE_SVR_GC)
+
+#define SERVER_GC 1
+
+#else // defined(FEATURE_SVR_GC)
+
+#ifdef SERVER_GC
+#undef SERVER_GC
+#endif
+
+#endif // defined(FEATURE_SVR_GC)
+#endif // __INTELLISENSE__
+
+#ifdef TARGET_AMD64
+#include "vxsort/do_vxsort.h"
+#endif
+
+#ifdef SERVER_GC
+namespace SVR {
+#else // SERVER_GC
+namespace WKS {
+#endif // SERVER_GC
+
+#include "gcimpl.h"
 #include "gcpriv.h"
 
 #ifdef TARGET_AMD64
@@ -53401,3 +53438,5 @@ size_t gc_heap::get_mark_array_size (heap_segment* seg)
     return 0;
 }
 #endif //USE_REGIONS
+
+}
diff --git a/src/coreclr/gc/gcee.cpp b/src/coreclr/gc/gcee.cpp
@@ -7,6 +7,35 @@
 
 // sets up vars for GC
 
+#include "common.h"
+#include "gcenv.h"
+
+#include "gc.h"
+#include "gcscan.h"
+#include "gchandletableimpl.h"
+#include "gceventstatus.h"
+
+#ifdef __INTELLISENSE__
+#if defined(FEATURE_SVR_GC)
+
+#define SERVER_GC 1
+
+#else // defined(FEATURE_SVR_GC)
+
+#ifdef SERVER_GC
+#undef SERVER_GC
+#endif
+
+#endif // defined(FEATURE_SVR_GC)
+#endif // __INTELLISENSE__
+
+#ifdef SERVER_GC
+namespace SVR {
+#else // SERVER_GC
+namespace WKS {
+#endif // SERVER_GC
+
+#include "gcimpl.h"
 #include "gcpriv.h"
 
 #ifndef DACCESS_COMPILE
@@ -540,4 +569,4 @@ uint64_t GCHeap::GetGenerationBudget(int generation)
 
 #endif // !DACCESS_COMPILE
 
-
+}
diff --git a/src/coreclr/gc/gceesvr.cpp b/src/coreclr/gc/gceesvr.cpp
@@ -1,25 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-
-
-#include "common.h"
-
 #if defined(FEATURE_SVR_GC)
-
-#include "gcenv.h"
-
-#include "gc.h"
-#include "gcscan.h"
-#include "gchandletableimpl.h"
-#include "gceventstatus.h"
-
 #define SERVER_GC 1
-
-
-namespace SVR {
-#include "gcimpl.h"
 #include "gcee.cpp"
-}
-
 #endif // FEATURE_SVR_GC
diff --git a/src/coreclr/gc/gceewks.cpp b/src/coreclr/gc/gceewks.cpp
@@ -1,23 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-
-
-#include "common.h"
-
-#include "gcenv.h"
-
-#include "gc.h"
-#include "gcscan.h"
-#include "gchandletableimpl.h"
-#include "gceventstatus.h"
-
 #ifdef SERVER_GC
 #undef SERVER_GC
 #endif
 
-namespace WKS {
-#include "gcimpl.h"
 #include "gcee.cpp"
-}
-
diff --git a/src/coreclr/gc/gcsvr.cpp b/src/coreclr/gc/gcsvr.cpp
@@ -1,32 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-
-
-#include "common.h"
-
-#if defined(FEATURE_SVR_GC)
-
-#include "gcenv.h"
-
-#include "gc.h"
-#include "gcscan.h"
-#include "gcdesc.h"
-#include "softwarewritewatch.h"
-#include "handletable.h"
-#include "handletable.inl"
-#include "gcenv.inl"
-#include "gceventstatus.h"
-
+#ifdef FEATURE_SVR_GC
 #define SERVER_GC 1
-
-#ifdef TARGET_AMD64
-#include "vxsort/do_vxsort.h"
-#endif
-
-namespace SVR {
-#include "gcimpl.h"
 #include "gc.cpp"
-}
-
-#endif // defined(FEATURE_SVR_GC)
+#endif // FEATURE_SVR_GC
diff --git a/src/coreclr/gc/gcwks.cpp b/src/coreclr/gc/gcwks.cpp
@@ -1,31 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-
-
-#include "common.h"
-
-#include "gcenv.h"
-
-#include "gc.h"
-#include "gcscan.h"
-#include "gcdesc.h"
-#include "softwarewritewatch.h"
-#include "handletable.h"
-#include "handletable.inl"
-#include "gcenv.inl"
-#include "gceventstatus.h"
-
 #ifdef SERVER_GC
 #undef SERVER_GC
 #endif
 
-#ifdef TARGET_AMD64
-#include "vxsort/do_vxsort.h"
-#endif
-
-namespace WKS {
-#include "gcimpl.h"
 #include "gc.cpp"
-}
-
diff --git a/src/coreclr/jit/emitarm64.cpp b/src/coreclr/jit/emitarm64.cpp
@@ -12248,7 +12248,7 @@ size_t emitter::emitOutputInstr(insGroup* ig, instrDesc* id, BYTE** dp)
                 }
                 else
                 {
-                    assert(id->idReg3() == REG_SP);
+                    assert(encodingZRtoSP(id->idReg3()) == REG_SP);
                 }
                 assert(varNum2 != -1);
 #endif // DEBUG
@@ -17082,7 +17082,7 @@ emitter::RegisterOrder emitter::IsOptimizableLdrStrWithPair(
     }
 
     regNumber prevReg1   = emitLastIns->idReg1();
-    regNumber prevReg2   = emitLastIns->idReg2();
+    regNumber prevReg2   = encodingZRtoSP(emitLastIns->idReg2());
     insFormat lastInsFmt = emitLastIns->idInsFmt();
     emitAttr  prevSize   = emitLastIns->idOpSize();
     ssize_t   prevImm    = emitGetInsSC(emitLastIns);

diff --git a/src/coreclr/jit/hwintrinsic.h b/src/coreclr/jit/hwintrinsic.h
@@ -229,6 +229,9 @@ enum HWIntrinsicFlag : unsigned int
     // (HW_Flag_BaseTypeFrom{First, Second}Arg must also be set to denote the position of the ValueTuple)
     HW_Flag_BaseTypeFromValueTupleArg = 0x1000000,
 
+    // The intrinsic is a reduce operation.
+    HW_Flag_ReduceOperation = 0x2000000,
+
 #else
 #error Unsupported platform
 #endif
@@ -998,6 +1001,12 @@ struct HWIntrinsicInfo
         return (flags & HW_Flag_BaseTypeFromValueTupleArg) != 0;
     }
 
+    static bool IsReduceOperation(NamedIntrinsic id)
+    {
+        const HWIntrinsicFlag flags = lookupFlags(id);
+        return (flags & HW_Flag_ReduceOperation) != 0;
+    }
+
     static NamedIntrinsic GetScalarInputVariant(NamedIntrinsic id)
     {
         assert(HasScalarInputVariant(id));