Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<ManagedAssetsFullPath>$(RuntimePackageRoot)$(ManagedAssetsPackagePath)</ManagedAssetsFullPath>
<NativeAssetsFullPath>$(RuntimePackageRoot)$(NativeAssetsPackagePath)</NativeAssetsFullPath>
<PartialCompositeAssemblyListPath>$(MSBuildThisFileDirectory)\PartialCompositeAssemblyList.txt</PartialCompositeAssemblyListPath>
<InstructionSetSupport Condition="'$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86'">+avx2,+bmi,+bmi2,+lzcnt,+movbe,+fma</InstructionSetSupport>
Copy link
Member

@tannergooding tannergooding Mar 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why these instead of the simpler +x86-x64-v3 that is supported and means the same thing: https://github.com/dotnet/runtime/blob/main/src/coreclr/tools/Common/JitInterface/CorInfoInstructionSet.cs#L990

If you're going to specify them explicitly, then you're missing +popcnt.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Tanner for pointing that out, I have updated the specification in the 4th commit based on your suggestion.

</PropertyGroup>

<RemoveDir Directories="$(CompositeTargetDir)" />
Expand All @@ -515,7 +516,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<WriteLinesToFile File="$(CompositeResponseFile)" Lines="-u:&quot;%(UnrootedAssemblyPaths.Identity)&quot;" Overwrite="false" />
<WriteLinesToFile File="$(CompositeResponseFile)" Lines="&quot;%(PartialCompositeAssemblyPaths.Identity)&quot;" Overwrite="false" />
<WriteLinesToFile File="$(CompositeResponseFile)" Lines="--out:&quot;$(CompositeTargetDir)$(CompositeFileName).dll&quot;" Overwrite="false" />
<WriteLinesToFile File="$(CompositeResponseFile)" Lines="--instruction-set:+avx2,+bmi,+bmi2,+lzcnt,+movbe,+fma" Overwrite="false" />
<WriteLinesToFile File="$(CompositeResponseFile)" Lines="--instruction-set:$(InstructionSetSupport)" Overwrite="false" Condition="$'(InstructionSetSupport)' != ''" />

<ItemGroup>
<NativeSharedObjects Include="$(NativeAssetsFullPath)\*.so" />
Expand Down