Make crossbuilds faster

eng/Subsets.props

@@ -378,7 +378,8 @@
 
   <ItemGroup>
     <!-- crossgen2/ILC have dependencies on the JITs, so build them if the cross component includes crossgen2/ILC. -->
-    <_CrossToolSubset Condition="'$(_BuildCrossComponents)' == 'true' and '$(TargetArchitecture)' != 'wasm' and ($(_subset.Contains('+clr.tools+')) or $(_subset.Contains('+clr.nativecorelib+')) or $(_subset.Contains('+clr.crossarchtools+')))" Include="ClrAllJitsSubset=true" />
+    <_CrossToolSubset Condition="'$(_BuildCrossComponents)' == 'true' and '$(TargetArchitecture)' != 'wasm' and $(_subset.Contains('+clr.toolstests+'))" Include="ClrAllJitsSubset=true" />
+    <_CrossToolSubset Condition="'$(_BuildCrossComponents)' == 'true' and '$(TargetArchitecture)' != 'wasm' and ($(_subset.Contains('+clr.tools+')) or $(_subset.Contains('+clr.nativecorelib+')) or $(_subset.Contains('+clr.crossarchtools+')))" Include="ClrJitSubset=true" />
     <!-- When targeting WebAssembly, only build the wasm JIT for the cross component. -->
     <_CrossToolSubset Condition="'$(_BuildCrossComponents)' == 'true' and '$(TargetArchitecture)' == 'wasm' and ($(_subset.Contains('+clr.tools+')) or $(_subset.Contains('+clr.nativecorelib+')) or $(_subset.Contains('+clr.crossarchtools+')))" Include="ClrWasmJitSubset=true" />
     <!-- When targeting Windows, we need to build a copy of the diagnostic libraries that can run on the host to enable remote debugging of a local build. -->

eng/pipelines/common/global-build-job.yml

@@ -49,17 +49,7 @@ jobs:
     pool: ${{ parameters.pool }}
     container: ${{ parameters.container }}
     condition: and(succeeded(), ${{ parameters.condition }})
-    # Windows arm64 builds are slower than the 60 min ADO default,
-    # so enforce a floor of 75 minutes while still honoring any larger explicit value.
-    ${{ if eq(parameters.platform, 'windows_arm64') }}:
-      ${{ if eq(parameters.timeoutInMinutes, '') }}:
-        timeoutInMinutes: 75
-      ${{ elseif lt(75, parameters.timeoutInMinutes) }}:
-        timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
-      ${{ else }}:
-        timeoutInMinutes: 75
-    ${{ else }}:
-      timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
     enablePublishTestResults: ${{ parameters.enablePublishTestResults }}
     testResultsFormat: ${{ parameters.testResultsFormat }}
     enableMicrobuild: ${{ parameters.isOfficialBuild }}

src/coreclr/jit/CMakeLists.txt

@@ -716,11 +716,12 @@ else()
 endif()
 
 create_standalone_jit(TARGET clrjit OS ${TARGET_OS_NAME} ARCH ${ARCH_TARGET_NAME})
-install_clr(TARGETS clrjit DESTINATIONS . sharedFramework COMPONENT jit)
+install_clr(TARGETS clrjit DESTINATIONS . COMPONENT jit)
 
 if (NOT CLR_CROSS_COMPONENTS_BUILD)
     # Install the clrjit into the sharedframework dir only when we're not doing a cross-components build.
     # We never want to ship the cross-component JIT (it would never be used).
+    install_clr(TARGETS clrjit DESTINATIONS sharedFramework COMPONENT jit)
     install_clr(TARGETS clrjit DESTINATIONS sharedFramework COMPONENT alljits)
 endif()
 

src/coreclr/tools/aot/AotCompilerCommon.props

@@ -16,5 +16,48 @@
     <_LibPrefix Condition="'$(CrossHostArch)' != 'true'">$(HostLibPrefix)</_LibPrefix>
     <_LibSuffix Condition="'$(CrossHostArch)' == 'true'">$(LibSuffix)</_LibSuffix>
     <_LibSuffix Condition="'$(CrossHostArch)' != 'true'">$(HostLibSuffix)</_LibSuffix>
+
+    <TargetArchitectureForSharedLibraries Condition="'$(CrossHostArch)' == ''">$(TargetArchitecture)</TargetArchitectureForSharedLibraries>
+    <TargetArchitectureForSharedLibraries Condition="'$(CrossHostArch)' != ''">$(CrossHostArch)</TargetArchitectureForSharedLibraries>
+    <TargetArchitectureForSharedLibraries Condition="'$(TargetArchitectureForSharedLibraries)'=='armel'">arm</TargetArchitectureForSharedLibraries>
+
+    <JitInterfaceLibraryName>$(_LibPrefix)jitinterface_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)</JitInterfaceLibraryName>
+    <!-- Keep the copied single-JIT name in sync with JitConfigProvider.GetTargetSpec. -->
+    <_TargetArchitectureForJitLibraryName>$(TargetArchitecture)</_TargetArchitectureForJitLibraryName>
+    <_TargetArchitectureForJitLibraryName Condition="'$(_TargetArchitectureForJitLibraryName)' == 'armel'">arm</_TargetArchitectureForJitLibraryName>
+    <_TargetArchitectureForJitLibraryName Condition="'$(_TargetArchitectureForJitLibraryName)' == 'wasm'">wasm</_TargetArchitectureForJitLibraryName>
+    <_TargetOSForJitLibraryName Condition="'$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'armel' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'wasm'">universal</_TargetOSForJitLibraryName>
+    <_TargetOSForJitLibraryName Condition="'$(_TargetOSForJitLibraryName)' == '' and '$(TargetOS)' == 'windows'">win</_TargetOSForJitLibraryName>
+    <_TargetOSForJitLibraryName Condition="'$(_TargetOSForJitLibraryName)' == ''">unix</_TargetOSForJitLibraryName>
+    <SingleJitLibraryName>$(_LibPrefix)clrjit_$(_TargetOSForJitLibraryName)_$(_TargetArchitectureForJitLibraryName)_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)</SingleJitLibraryName>
+    <SingleJitLibrarySourceName>$(_LibPrefix)clrjit$(_LibSuffix)</SingleJitLibrarySourceName>
+    <SingleJitLibrarySourceName Condition="'$(_TargetOSForJitLibraryName)' == 'universal' and '$(TargetOS)' != 'windows'">$(SingleJitLibraryName)</SingleJitLibrarySourceName>
+    <CopyAllJitLibrariesToAotCompilerOutput Condition="'$(CopyAllJitLibrariesToAotCompilerOutput)' == '' and '$(CrossHostArch)' == ''">true</CopyAllJitLibrariesToAotCompilerOutput>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(JitInterfaceLibraryName)"
+      CopyToOutputDirectory="PreserveNewest"
+      CopyToPublishDirectory="PreserveNewest"
+      ExcludeFromSingleFile="$(PublishSingleFile)"
+      Link="%(FileName)%(Extension)"
+      Condition="'$(TargetsWasm)' != 'true' or '$(CrossHostArch)' != ''"
+      />
+
+    <Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(_LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)"
+      CopyToOutputDirectory="PreserveNewest"
+      CopyToPublishDirectory="PreserveNewest"
+      ExcludeFromSingleFile="$(PublishSingleFile)"
+      Link="%(FileName)%(Extension)"
+      Condition="'$(CopyAllJitLibrariesToAotCompilerOutput)' == 'true'"
+      />
+
+    <Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(SingleJitLibrarySourceName)"
+      CopyToOutputDirectory="PreserveNewest"
+      CopyToPublishDirectory="PreserveNewest"
+      ExcludeFromSingleFile="$(PublishSingleFile)"
+      Link="$(SingleJitLibraryName)"
+      Condition="'$(CrossHostArch)' != '' and '$(CopyAllJitLibrariesToAotCompilerOutput)' != 'true'"
+      />
+  </ItemGroup>
 </Project>

src/coreclr/tools/aot/ILCompiler.ReadyToRun.Tests/ILCompiler.ReadyToRun.Tests.csproj

@@ -27,7 +27,8 @@
            even when this test project is built in a different configuration than CoreCLR was (e.g.
            CoreCLR built Release via 'clr -rc release', but the test built/run as Debug). Mirrors the
            CoreLib SetConfiguration pattern in eng/references.targets. -->
-      <SetConfiguration Condition="'$(Configuration)' != '$(CoreCLRConfiguration)'">Configuration=$(CoreCLRConfiguration)</SetConfiguration>
+      <SetConfiguration Condition="'$(Configuration)' == '$(CoreCLRConfiguration)'">CopyAllJitLibrariesToAotCompilerOutput=true</SetConfiguration>
+      <SetConfiguration Condition="'$(Configuration)' != '$(CoreCLRConfiguration)'">Configuration=$(CoreCLRConfiguration);CopyAllJitLibrariesToAotCompilerOutput=true</SetConfiguration>
     </ProjectReference>
   </ItemGroup>
 

src/coreclr/tools/aot/ILCompiler/ILCompiler.props

@@ -53,31 +53,4 @@
   <ItemGroup>
     <Compile Remove="repro\*" />
   </ItemGroup>
-
-  <PropertyGroup>
-    <TargetArchitectureForSharedLibraries Condition="'$(CrossHostArch)' == ''">$(TargetArchitecture)</TargetArchitectureForSharedLibraries>
-    <TargetArchitectureForSharedLibraries Condition="'$(CrossHostArch)' != ''">$(CrossHostArch)</TargetArchitectureForSharedLibraries>
-    <TargetArchitectureForSharedLibraries Condition="'$(TargetArchitectureForSharedLibraries)'=='armel'">arm</TargetArchitectureForSharedLibraries>
-
-    <JitInterfaceLibraryName>$(_LibPrefix)jitinterface_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)</JitInterfaceLibraryName>
-    <!-- This will be provided when using the liveBuild, and unset otherwise. -->
-    <CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == ''">$(RuntimeBinDir)$(CrossHostArch)</CoreCLRArtifactsPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="$(CoreCLRArtifactsPath)/$(JitInterfaceLibraryName)"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="PreserveNewest"
-      ExcludeFromSingleFile="$(PublishSingleFile)"
-      Link="%(FileName)%(Extension)"
-      Condition="'$(TargetsWasm)' != 'true'"
-      />
-
-    <Content Include="$(CoreCLRArtifactsPath)/$(_LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="PreserveNewest"
-      ExcludeFromSingleFile="$(PublishSingleFile)"
-      Link="%(FileName)%(Extension)"
-      />
-  </ItemGroup>
 </Project>

src/coreclr/tools/aot/crossgen2/crossgen2.props

@@ -41,31 +41,6 @@
     <Compile Include="..\..\Common\InstructionSetHelpers.cs" Link="InstructionSetHelpers.cs" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetArchitectureForSharedLibraries Condition="'$(CrossHostArch)' == ''">$(TargetArchitecture)</TargetArchitectureForSharedLibraries>
-    <TargetArchitectureForSharedLibraries Condition="'$(CrossHostArch)' != ''">$(CrossHostArch)</TargetArchitectureForSharedLibraries>
-    <TargetArchitectureForSharedLibraries Condition="'$(TargetArchitectureForSharedLibraries)'=='armel'">arm</TargetArchitectureForSharedLibraries>
-
-    <JitInterfaceLibraryName>$(_LibPrefix)jitinterface_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)</JitInterfaceLibraryName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(JitInterfaceLibraryName)"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="PreserveNewest"
-      ExcludeFromSingleFile="$(PublishSingleFile)"
-      Link="%(FileName)%(Extension)"
-      Condition="'$(TargetsWasm)' != 'true' or '$(CrossHostArch)' != ''"
-      />
-
-    <Content Include="$(CoreCLRArtifactsPath)/$(CrossHostArch)/$(_LibPrefix)clrjit_*_$(TargetArchitectureForSharedLibraries)$(_LibSuffix)"
-      CopyToOutputDirectory="PreserveNewest"
-      CopyToPublishDirectory="PreserveNewest"
-      ExcludeFromSingleFile="$(PublishSingleFile)"
-      Link="%(FileName)%(Extension)"
-      />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetOS)' == 'windows'">
     <Content Include="$(RuntimeBinDir)/pgort*.dll"
       CopyToOutputDirectory="PreserveNewest"