compile composite with avx2 on x64 (#55057)

* compile composite with avx2 on x64

* fix xml coding style

diff --git a/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx b/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx
index c031f30..56fbb93 100644 (file)
--- a/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx
+++ b/src/coreclr/tools/aot/crossgen2/Properties/Resources.resx
@@ -169,7 +169,7 @@
     <value>Instruction set(s) to use for compilation</value>
   </data>
   <data name="InstructionSetMustNotBe" xml:space="preserve">
-    <value>Instruction set must not be '{0}' for this architecture and operating system</value>
+    <value>Instruction set '{0}' is not valid for this architecture and operating system</value>
   </data>
   <data name="InstructionSetWithoutInputBubble" xml:space="preserve">
     <value>Instruction set(s) specified without also specifying input-bubble</value>

diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj
index 0cd2644..a3f3648 100644 (file)
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.Composite.sfxproj
@@ -32,6 +32,9 @@
 
   <ItemGroup>
     <PublishReadyToRunCrossgen2ExtraArgsList Include="--compositekeyfile:$(AssemblyOriginatorKeyFile)"/>
+    <!-- Compile with avx2 on x64 -->
+    <PublishReadyToRunCrossgen2ExtraArgsList Condition="'$(TargetArchitecture)' == 'x64'" Include="--inputbubble" />
+    <PublishReadyToRunCrossgen2ExtraArgsList Condition="'$(TargetArchitecture)' == 'x64'" Include="--instruction-set:avx2" />
   </ItemGroup>
 
   <Import Project="ReadyToRun.targets" />