dotnet · jkotas · Apr 23, 2024 · Mar 25, 2024 · Mar 25, 2024 · Mar 25, 2024
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
@@ -228,12 +228,12 @@
 
       <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'CoreCLR'"
                              Include="
-        $(CoreCLRNativeArtifactsPath)dotnet.js;
-        $(CoreCLRNativeArtifactsPath)dotnet.js.map;
-        $(CoreCLRNativeArtifactsPath)dotnet.runtime.js;
-        $(CoreCLRNativeArtifactsPath)dotnet.runtime.js.map;
-        $(CoreCLRNativeArtifactsPath)dotnet.d.ts;
-        $(CoreCLRNativeArtifactsPath)package.json;"
+        $(LibrariesNativeArtifactsPath)dotnet.js;
+        $(LibrariesNativeArtifactsPath)dotnet.js.map;
+        $(LibrariesNativeArtifactsPath)dotnet.runtime.js;
+        $(LibrariesNativeArtifactsPath)dotnet.runtime.js.map;
+        $(LibrariesNativeArtifactsPath)dotnet.d.ts;
+        $(LibrariesNativeArtifactsPath)package.json;"
         IsNative="true" />
       <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'CoreCLR'"
                              Include="$(CoreCLRNativeArtifactsPath)src\es6\*.js"

diff --git a/eng/pipelines/runtimelab.yml b/eng/pipelines/runtimelab.yml
@@ -49,139 +49,71 @@ extends:
     stages:
     - stage: Build
       jobs:
-<<<<<<< HEAD
-      #
-      # Build with Release libraries and Debug runtime
-      #
-      - ${{ if ne(variables.isOfficialBuild, true) }}:
-        - template: /eng/pipelines/common/platform-matrix.yml
-          parameters:
-            jobTemplate: /eng/pipelines/common/global-build-job.yml
-            buildConfig: Debug
-            platforms:
-          # - Linux_x64
-            - windows_x64
-            - OSX_x64
-            - Browser_wasm_win
-            - wasi_wasm_win
-            jobParameters:
-              timeoutInMinutes: 300
-              testGroup: innerloop
-              buildArgs: -s clr.aot+libs+nativeaot.packages -lc Release -rc Debug
-              postBuildSteps:
-                - template: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
-                  parameters:
-                    librariesConfiguration: Release
 
-      #
-      # Build with Debug libraries and Checked runtime
-      #
-      - ${{ if ne(variables.isOfficialBuild, true) }}:
-        - template: /eng/pipelines/common/platform-matrix.yml
-          parameters:
-            jobTemplate: /eng/pipelines/common/global-build-job.yml
-            buildConfig: Checked
-            platforms:
-          # - linux_x64
-            - windows_x64
-            jobParameters:
-              timeoutInMinutes: 100
-              testGroup: innerloop
-              buildArgs: -s clr+libs+host+packs -c debug -runtimeConfiguration Checked
-              postBuildSteps:
-                - template: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
-                  parameters:
-                    uploadRuntimeTests: true
-                    librariesConfiguration: Debug
-
-      #
-      # Build with Release libraries and Release runtime (used for official builds) - Wasm
-      #
-      - template: /eng/pipelines/common/platform-matrix.yml
-        parameters:
-          jobTemplate: /eng/pipelines/common/global-build-job.yml
-          buildConfig: Release
-          platforms:
-    #     - linux_x64        # Tests fail with a few errors, e.g. System.BadImageFormatException: Read out of bounds.  TODO-LLVM try to reinstate when more merged
-    #     - linux_musl_x64
-    #     - linux_arm64      # ILCompiler for LLVM depends on libLLVM.runtime.linux-arm64 with version (>= 11.0.0) which is missing https://github.com/microsoft/LLVMSharp/issues/177. TODO: reinstate when we remove LLVMSharp dependency
-    #     - linux_arm        # ILCompiler for LLVM depends on libLLVM.runtime.linux-arm64 with version (>= 11.0.0) which is missing https://github.com/microsoft/LLVMSharp/issues/177. TODO: reinstate when we remove LLVMSharp dependency
-    #     - linux_musl_arm64 # ILCompiler for LLVM depends on libLLVM.runtime.linux-arm64 with version (>= 11.0.0) which is missing https://github.com/microsoft/LLVMSharp/issues/177. TODO: reinstate when we remove LLVMSharp dependency
-    #     - windows_x64      # Part of the combined (target + host) WASM build below
-          - windows_arm64
-          - OSX_x64
-          - Browser_wasm_win
-          - wasi_wasm_win
-          jobParameters:
-            timeoutInMinutes: 300
-            isOfficialBuild: ${{ variables.isOfficialBuild }}
-            testGroup: innerloop
-            postBuildSteps:
-              - template: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
-                parameters:
-                  isOfficialBuild: ${{ variables.isOfficialBuild }}
-                  uploadLibrariesTests: ${{ eq(variables.isOfficialBuild, false) }}
-                  uploadIntermediateArtifacts: ${{ variables.isOfficialBuild }}
-                  librariesConfiguration: Release
-            ${{ if eq(variables.isOfficialBuild, false) }}:
-              buildArgs: -s clr.aot+libs+nativeaot.packages -c $(_BuildConfig) /p:ArchiveTests=true
-            ${{ if eq(variables.isOfficialBuild, true) }}:
-              buildArgs: -s clr.aot+libs+nativeaot.packages -c $(_BuildConfig)
-=======
         - ${{ if ne(variables.isOfficialBuild, true) }}:
           #
-          # Build the whole product with Checked CoreCLR and run runtime tests
+          # Build the whole product with Debug CoreCLR and run runtime tests
           #
           - template: /eng/pipelines/common/platform-matrix.yml
             parameters:
               jobTemplate: /eng/pipelines/common/global-build-job.yml
               helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
-              buildConfig: checked
+              buildConfig: debug
               platforms:
-              - linux_x64
+#              - linux_x64
+              - osx_x64
               - windows_x64
+              - Browser_wasm_win
+              - wasi_wasm_win
               jobParameters:
-                timeoutInMinutes: 200
-                buildArgs: -s clr+libs+hosts+packs -c debug -rc $(_BuildConfig)
+                timeoutInMinutes: 300
+                buildArgs: -s clr.aot+libs+nativeaot.packages -c debug -rc $(_BuildConfig)
                 postBuildSteps:
-                  - template: /eng/pipelines/common/templates/runtimes/build-runtime-tests-and-send-to-helix.yml
+                  - template: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
                     parameters:
-                      creator: dotnet-bot
-                      testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig)
+                      librariesConfiguration: Debug
 
           #
-          # Build the whole product with Release CoreCLR and run libraries tests
+          # Build with Debug libraries and Checked runtime
           #
           - template: /eng/pipelines/common/platform-matrix.yml
             parameters:
               jobTemplate: /eng/pipelines/common/global-build-job.yml
-              helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
-              buildConfig: release
+              helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml
+              buildConfig: Checked
               platforms:
-              - linux_x64
+#              - linux_x64
               - windows_x64
               jobParameters:
-                timeoutInMinutes: 180
-                buildArgs: -s clr+libs+libs.tests+hosts+packs -c $(_BuildConfig) /p:ArchiveTests=true
+                timeoutInMinutes: 300
+                buildArgs: -s clr.aot+libs+nativeaot.packages -c debug -rc $(_BuildConfig)
                 postBuildSteps:
-                  - template: /eng/pipelines/libraries/helix.yml
+                  - template: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
                     parameters:
-                      creator: dotnet-bot
-                      testRunNamePrefixSuffix: Libraries_$(_BuildConfig)
+                      uploadRuntimeTests: true
+                      librariesConfiguration: Debug
 
           #
-          # Build and test libraries AllConfigurations
+          # Build the whole product with Release CoreCLR and run libraries tests
           #
           - template: /eng/pipelines/common/platform-matrix.yml
             parameters:
               jobTemplate: /eng/pipelines/common/global-build-job.yml
-              buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+              helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+              buildConfig: release
               platforms:
+#              - linux_x64
+              - osx_x64
               - windows_x64
+              - Browser_wasm_win
+              - wasi_wasm_win
               jobParameters:
-                buildArgs: -test -s tools+libs+libs.tests -allConfigurations -c $(_BuildConfig) /p:TestAssemblies=false /p:TestPackages=true
-                nameSuffix: Libraries_AllConfigurations
-                timeoutInMinutes: 150
+                timeoutInMinutes: 300
+                buildArgs: -s  clr.aot+libs+nativeaot.packages -c $(_BuildConfig) /p:ArchiveTests=true
+                postBuildSteps:
+                  - template: /eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
+                    parameters:
+                      librariesConfiguration: Release
 
         - ${{ else }}:
           #
@@ -193,7 +125,7 @@ extends:
               helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
               buildConfig: release
               platforms:
-              - linux_x64
+#              - linux_x64
               - windows_x64
               jobParameters:
                 isOfficialBuild: true
@@ -223,9 +155,8 @@ extends:
                     parameters:
                       name: Libraries_AllConfigurations
                 timeoutInMinutes: 95
->>>>>>> runtime/main
 
     - ${{ if eq(variables.isOfficialBuild, true) }}:
       - template: /eng/pipelines/official/stages/publish.yml
         parameters:
-          isOfficialBuild: true
+          isOfficialBuild: true
diff --git a/eng/pipelines/runtimelab/install-llvm.ps1 b/eng/pipelines/runtimelab/install-llvm.ps1
@@ -22,7 +22,7 @@ if (!(gcm cmake -ErrorAction SilentlyContinue))
 if (!$NoClone)
 {
     $LlvmProjectTag = "llvmorg-17.0.4"
-    $DepthOption = if ($CI) {"--depth","1"} {}
+    $DepthOption = if ($CI) {"--depth","1"} else {}
     git clone https://github.com/llvm/llvm-project --branch $LlvmProjectTag $DepthOption
 }
 elseif (!(Test-Path llvm-project))
@@ -72,7 +72,7 @@ foreach ($Config in $Configs)
     }
     else
     {
-        $LlvmCmakeConfigEnvVarName = if ($Config -eq "Release") {"LLVM_CMAKE_CONFIG_RELEASE"} {"LLVM_CMAKE_CONFIG_DEBUG"}
+        $LlvmCmakeConfigEnvVarName = if ($Config -eq "Release") {"LLVM_CMAKE_CONFIG_RELEASE"} else {"LLVM_CMAKE_CONFIG_DEBUG"}
     }
 
     Write-Host "Setting $LlvmCmakeConfigEnvVarName to '$LlvmCmakeConfigPath'"

diff --git a/eng/pipelines/runtimelab/runtimelab-post-build-steps.yml b/eng/pipelines/runtimelab/runtimelab-post-build-steps.yml
@@ -29,12 +29,12 @@ steps:
   - ${{ if eq(parameters.platform, 'browser_wasm_win') }}:
     - script: |
         call $(Build.SourcesDirectory)\wasm-tools\emsdk\emsdk_env
-        $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} tree nativeaot
+        $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }}
       displayName: Build WebAssembly tests
   - ${{ elseif eq(parameters.platform, 'wasi_wasm_win') }}:
     - script: |
         call $(Build.SourcesDirectory)\wasm-tools\emsdk\emsdk_env
-        $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} wasi tree nativeaot
+        $(Build.SourcesDirectory)/src/tests/build$(scriptExt) nativeaot $(buildConfigUpper) ${{ parameters.archType }} wasi tree nativeaot /p:LibrariesConfiguration=${{ parameters.librariesConfiguration }}
       displayName: Build WebAssembly tests
 
   - ${{ elseif eq(parameters.osGroup, 'windows') }}:

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -153,11 +153,7 @@ endif(NOT CLR_CMAKE_TARGET_ARCH_WASM)
 
 if(NOT CLR_CROSS_COMPONENTS_BUILD)
   # NativeAOT only buildable for a subset of CoreCLR-supported configurations
-<<<<<<< HEAD
-  if(CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_WASM)
-=======
-  if(CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM OR (CLR_CMAKE_HOST_ARCH_I386 AND CLR_CMAKE_HOST_WIN32))
->>>>>>> runtime/main
+  if(CLR_CMAKE_HOST_ARCH_ARM64 OR CLR_CMAKE_HOST_ARCH_AMD64 OR CLR_CMAKE_HOST_ARCH_ARM OR CLR_CMAKE_TARGET_ARCH_WASM OR (CLR_CMAKE_HOST_ARCH_I386 AND CLR_CMAKE_HOST_WIN32))
     add_subdirectory(nativeaot)
   endif()
 endif(NOT CLR_CROSS_COMPONENTS_BUILD)

diff --git a/src/coreclr/inc/crosscomp.h b/src/coreclr/inc/crosscomp.h
@@ -26,10 +26,6 @@
 #endif
 #endif // TARGET_WINDOWS
 
-#ifdef TARGET_WASM
-#include "wasm.h"
-#endif
-
 #ifdef UNICODE
 #define MAKE_TARGET_DLLNAME(name) MAKE_TARGET_DLLNAME_W(name)
 #else

diff --git a/src/coreclr/jit/compiler.cpp b/src/coreclr/jit/compiler.cpp
@@ -7621,11 +7621,7 @@ void Compiler::compInitVarScopeMap()
     compVarScopeMap = new (getAllocator()) VarNumToScopeDscMap(getAllocator());
 
     // 599 prime to limit huge allocations; for ex: duplicated scopes on single var.
-<<<<<<< HEAD
-    compVarScopeMap->Reallocate(min(info.compVarScopesCount, 599U));
-=======
     compVarScopeMap->Reallocate(min(info.compVarScopesCount, 599u));
->>>>>>> runtime/main
 
     for (unsigned i = 0; i < info.compVarScopesCount; ++i)
     {

diff --git a/src/coreclr/jit/compiler.h b/src/coreclr/jit/compiler.h
@@ -499,19 +499,13 @@ class LclVarDsc
     // The constructor. Most things can just be zero'ed.
     //
     // Initialize the ArgRegs to REG_STK.
-<<<<<<< HEAD
-    // Morph will update if this local is passed in a register.
     LclVarDsc() :
 #if defined(TARGET_WASM)
         lvLlvmArgNum(BAD_LLVM_ARG_NUM),
         lvCorInfoType(CORINFO_TYPE_UNDEF),
         lvHasLocalAddr(0),
 #endif // TARGET_WASM
         _lvArgReg(REG_STK)
-=======
-    LclVarDsc()
-        : _lvArgReg(REG_STK)
->>>>>>> runtime/main
 #if FEATURE_MULTIREG_ARGS
         , _lvOtherArgReg(REG_STK)
 #endif // FEATURE_MULTIREG_ARGS

diff --git a/src/coreclr/jit/flowgraph.cpp b/src/coreclr/jit/flowgraph.cpp
@@ -2354,14 +2354,10 @@ PhaseStatus Compiler::fgAddInternal()
     // Merge return points if required or beneficial
     MergedReturns merger(this);
 
-<<<<<<< HEAD
 #ifdef TARGET_WASM
     m_llvm->AddUnhandledExceptionHandler();
 #endif // TARGET_WASM
 
-#if defined(FEATURE_EH_FUNCLETS)
-=======
->>>>>>> runtime/main
     // Add the synchronized method enter/exit calls and try/finally protection. Note
     // that this must happen before the one BBJ_RETURN block is created below, so the
     // BBJ_RETURN block gets placed at the top-level, not within an EH region. (Otherwise,

diff --git a/src/coreclr/jit/gentree.cpp b/src/coreclr/jit/gentree.cpp
@@ -2081,8 +2081,7 @@ void CallArgs::Remove(CallArg* arg)
     assert(!"Did not find arg to remove in CallArgs::Remove");
 }
 
-<<<<<<< HEAD
-#if TARGET_WASM
+#ifdef TARGET_WASM
 //------------------------------------------------------------------------
 // MoveLateToEarly: Sets all late nodes as the early nodes
 //
@@ -2103,7 +2102,6 @@ void CallArgs::MoveLateToEarly()
     m_lateHead = nullptr;
 }
 #endif
-=======
 #ifdef TARGET_XARCH
 //---------------------------------------------------------------
 // NeedsVzeroupper: Determines if the call needs a vzeroupper emitted before it is invoked
@@ -2172,7 +2170,6 @@ bool GenTreeCall::NeedsVzeroupper(Compiler* comp)
     return needsVzeroupper;
 }
 #endif // TARGET_XARCH
->>>>>>> runtime/main
 
 //---------------------------------------------------------------
 // GetOtherRegMask: Get the reg mask of gtOtherRegs of call node
@@ -4744,8 +4741,6 @@ bool genCreateAddrMode(Compiler* compiler,
        constant, or we have gone through a GT_NOP or GT_COMMA node. We never come back
        here if we find a scaled index.
     */
-    CLANG_FORMAT_COMMENT_ANCHOR;
-
     assert(mul == 0);
 
     /* Special case: keep constants as 'op2' */