Skip to content

Commit c2a124c

Browse files
evoskuilevoskuil
authored
Merge pull request #291 from evoskuil/master
regenerate artifacts
2 parents cd190c0 + 9a2637a commit c2a124c

File tree

3 files changed

+28
-33
lines changed

3 files changed

+28
-33
lines changed

‎builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<Configuration>ReleaseLIB</Configuration>
6161
<Platform>x64</Platform>
6262
</ProjectConfiguration>
63-
<ProjectConfiguration Include="DebugDLL|ARM">
63+
<ProjectConfiguration Include="DebugDLL|ARM">
6464
<Configuration>DebugDLL</Configuration>
6565
<Platform>ARM</Platform>
6666
</ProjectConfiguration>

‎builds/msvc/vs2022/libbitcoin-system.import.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
<!-- These will compile to the target regardless of the compiling platform. -->
1818
<!-- That will result in a crash of test/executable execution if mismatched. -->
1919
<PropertyGroup>
20-
<Option-avx512>false</Option-avx512>
21-
<Option-avx2>true</Option-avx2>
22-
<Option-sse41>true</Option-sse41>
23-
<Option-shani>false</Option-shani>
24-
<Option-neon>false</Option-neon>
20+
<!--<Option-512>false</Option-512>-->
21+
<!--<Option-256>true</Option-256>-->
22+
<!--<Option-128>true</Option-128>-->
23+
<Option-sha>false</Option-sha>
2524
</PropertyGroup>
2625
<ItemDefinitionGroup>
2726
<ClCompile>
2827
<!-- order matters -->
29-
<EnableEnhancedInstructionSet Condition="'$(Option-avx2)' == 'true'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
30-
<EnableEnhancedInstructionSet Condition="'$(Option-avx512)' == 'true'">AdvancedVectorExtensions512</EnableEnhancedInstructionSet>
28+
<!-- Native configuration now specifyies avx, avx2 or avx512 - in which case we run 128, 256, 512. -->
29+
<!--<EnableEnhancedInstructionSet Condition="'$(Option-128)' == 'true'">AdvancedVectorExtensions</EnableEnhancedInstructionSet>-->
30+
<!--<EnableEnhancedInstructionSet Condition="'$(Option-256)' == 'true'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>-->
31+
<!--<EnableEnhancedInstructionSet Condition="'$(Option-512)' == 'true'">AdvancedVectorExtensions512</EnableEnhancedInstructionSet>-->
3132
</ClCompile>
3233
</ItemDefinitionGroup>
3334

3435
<!-- Messages -->
3536

3637
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
37-
<Message Text="Option-avx512 : $(Option-avx512)" Importance="high"/>
38-
<Message Text="Option-avx2 : $(Option-avx2)" Importance="high"/>
39-
<Message Text="Option-sse41 : $(Option-sse41)" Importance="high"/>
40-
<Message Text="Option-shani : $(Option-shani)" Importance="high"/>
41-
<Message Text="Option-neon : $(Option-neon)" Importance="high"/>
42-
</Target>
38+
<Message Text="Option-sha : $(Option-sha)" Importance="high"/>
39+
<!--<Message Text="Option-512 : $(Option-512)" Importance="high"/>-->
40+
<!--<Message Text="Option-256 : $(Option-256)" Importance="high"/>-->
41+
<!--<Message Text="Option-128 : $(Option-128)" Importance="high"/>-->
42+
</Target>
4343

4444
<!-- Linkage -->
4545

@@ -55,11 +55,11 @@
5555
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-system)' == 'static' Or '$(Linkage-libbitcoin-system)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5656
<PreprocessorDefinitions Condition="$(Configuration.IndexOf('Debug')) != -1">_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5757
<!-- Enable use of CPU intrinsics. -->
58-
<PreprocessorDefinitions Condition="'$(Option-avx512)' == 'true'">WITH_AVX512;%(PreprocessorDefinitions)</PreprocessorDefinitions>
59-
<PreprocessorDefinitions Condition="'$(Option-avx2)' == 'true'">WITH_AVX2;%(PreprocessorDefinitions)</PreprocessorDefinitions>
60-
<PreprocessorDefinitions Condition="'$(Option-sse41)' == 'true'">WITH_SSE41;%(PreprocessorDefinitions)</PreprocessorDefinitions>
61-
<PreprocessorDefinitions Condition="'$(Option-shani)' == 'true'">WITH_SHANI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
62-
<PreprocessorDefinitions Condition="'$(Option-neon)' == 'true'">WITH_NEON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
58+
<!-- Eventually these options will be used to select SVE levels. -->
59+
<PreprocessorDefinitions Condition="'$(Option-sha)' == 'true'">WITH_SHA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
60+
<!--<PreprocessorDefinitions Condition="'$(Option-512)' == 'true'">WITH_512;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
61+
<!--<PreprocessorDefinitions Condition="'$(Option-256)' == 'true'">WITH_256;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
62+
<!--<PreprocessorDefinitions Condition="'$(Option-128)' == 'true'">WITH_128;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
6363
</ClCompile>
6464
<Link>
6565
<!-- 4099: warns about missing PDB files. -->

‎builds/msvc/vs2022/libbitcoin-system.import.xml‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,29 @@
1616
</Rule>
1717
<Rule Name="libbitcoin-system-options-uiextension" PageTemplate="tool" DisplayName="Bitcoin System Options" SwitchPrefix="/" Order="1">
1818
<Rule.Categories>
19-
<Category Name="avx512" DisplayName="avx512" />
20-
<Category Name="avx2" DisplayName="avx2" />
21-
<Category Name="sse41" DisplayName="sse41" />
22-
<Category Name="shani" DisplayName="shani" />
23-
<Category Name="neon" DisplayName="neon" />
19+
<!--<Category Name="512" DisplayName="512" />-->
20+
<!--<Category Name="256" DisplayName="256" />-->
21+
<!--<Category Name="128" DisplayName="128" />-->
22+
<Category Name="sha" DisplayName="sha" />
2423
</Rule.Categories>
2524
<Rule.DataSource>
2625
<DataSource Persistence="ProjectFile" ItemType="" />
2726
</Rule.DataSource>
28-
<EnumProperty Name="Option-avx512" DisplayName="Enable AVX512 Intrinsics" Description="Use AVX512 intrinsics." Category="avx512">
27+
<EnumProperty Name="Option-sha" DisplayName="Enable SHA Native Hashing" Description="Requires SHANI (xcpu) or Neon (arm) CPU." Category="sha">
2928
<EnumValue Name="false" DisplayName="No" />
3029
<EnumValue Name="true" DisplayName="Yes" />
3130
</EnumProperty>
32-
<EnumProperty Name="Option-avx2" DisplayName="Enable AVX2 Intrinsics" Description="Use AVX2 intrinsics." Category="avx2">
31+
<!--<EnumProperty Name="Option-512" DisplayName="Enable 512 Bit Vectorization" Description="Requires AVX512 (xcpu) or SVE (arm) CPU." Category="512">
3332
<EnumValue Name="false" DisplayName="No" />
3433
<EnumValue Name="true" DisplayName="Yes" />
3534
</EnumProperty>
36-
<EnumProperty Name="Option-sse41" DisplayName="Enable SSE4.1 Intrinsics" Description="Use SSE4.1 intrinsics." Category="sse41">
35+
<EnumProperty Name="Option-256" DisplayName="Enable 256 Bit Vectorization" Description="Requires AVX2 (xcpu) or SVE (arm) CPU." Category="256">
3736
<EnumValue Name="false" DisplayName="No" />
3837
<EnumValue Name="true" DisplayName="Yes" />
3938
</EnumProperty>
40-
<EnumProperty Name="Option-shani" DisplayName="Enable SHA Native Intrinsics" Description="Use SHA native intrinsics." Category="shani">
39+
<EnumProperty Name="Option-128" DisplayName="Enable 128 Bit Vectorization" Description="Requires SSE4.1 (xcpu) or Neon (arm) CPU." Category="128">
4140
<EnumValue Name="false" DisplayName="No" />
4241
<EnumValue Name="true" DisplayName="Yes" />
43-
</EnumProperty>
44-
<EnumProperty Name="Option-neon" DisplayName="Enable ARM Neon Intrinsics" Description="Use ARM Neon intrinsics." Category="neon">
45-
<EnumValue Name="false" DisplayName="No" />
46-
<EnumValue Name="true" DisplayName="Yes" />
47-
</EnumProperty>
42+
</EnumProperty>-->
4843
</Rule>
4944
</ProjectSchemaDefinitions>

0 commit comments

Comments
 (0)