Skip to content
This repository has been archived by the owner on Jan 9, 2021. It is now read-only.

Commit

Permalink
Significant Axiom speedup
Browse files Browse the repository at this point in the history
Up to +85% Axiom hashing speed-up.
  • Loading branch information
nicehashdev committed Sep 3, 2015
1 parent 966e6b1 commit 57bd235
Show file tree
Hide file tree
Showing 12 changed files with 2,348 additions and 1,103 deletions.
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ cpuminer_SOURCES = \
crypto/c_skein.c \
crypto/hash.c \
crypto/aesb.c \
crypto/mshabal.c \
lyra2/Lyra2.c lyra2/Sponge.c \
algo/animecoin.c \
algo/axiom.c \
Expand Down Expand Up @@ -104,7 +103,8 @@ if HAVE_WINDOWS
endif

cpuminer_LDFLAGS = @LDFLAGS@
cpuminer_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@
#cpuminer_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@
cpuminer_LDADD = /usr/local/lib/libcurl.a -lwldap32 /usr/lib/libz.a -lws2_32 -lcrypto @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@

This comment has been minimized.

Copy link
@tpruvot

tpruvot Sep 3, 2015

this change is wrong, should be done with "configure --with-curl=/usr/local/lib"

This comment has been minimized.

Copy link
@nicehashdev

nicehashdev Sep 3, 2015

We wanted to include statically linked CURL. If you have a suggestion how to do it so it will work for Mingw64 too and just running ./mingw64.sh then, let us know.

This comment has been minimized.

Copy link
@tpruvot

tpruvot via email Sep 3, 2015

This comment has been minimized.

Copy link
@tpruvot

tpruvot via email Sep 3, 2015

This comment has been minimized.

Copy link
@nicehashdev

nicehashdev Sep 3, 2015

I reverted back. Does that help with compiling on linux?

This comment has been minimized.

Copy link
@tpruvot

tpruvot via email Sep 3, 2015

This comment has been minimized.

Copy link
@tpruvot

tpruvot via email Sep 3, 2015

cpuminer_CPPFLAGS = @LIBCURL_CPPFLAGS@ $(ALL_INCLUDES)
cpuminer_CFLAGS = -Wno-pointer-sign -Wno-pointer-to-int-cast $(disable_flags)

Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Special thanks to sandor111 (https://bitcointalk.org/index.php?action=profile;u=42873) for providing Axiom CPU optimizations!
His BTC for donations: 1AMsjqzXQpRunxUmtn3xzQ5cMdhV7fmet2

CPUMiner-Multi
==============

Expand Down
579 changes: 386 additions & 193 deletions algo/axiom.c

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cpuminer.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;USE_AVX;USE_AVX2;USE_XOP;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.;compat;compat\curl-for-windows\curl\include;compat\jansson;compat\getopt;compat\pthreads;compat\curl-for-windows\openssl\openssl\include;compat\curl-for-windows\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand Down Expand Up @@ -153,6 +153,7 @@
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>.;compat;compat\curl-for-windows\curl\include;compat\jansson;compat\getopt;compat\pthreads;compat\curl-for-windows\openssl\openssl\include;compat\curl-for-windows\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
</ClCompile>
<Link>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down Expand Up @@ -184,7 +185,6 @@
<Optimization Condition="'$(Configuration)'=='Release'">Full</Optimization>
</ClCompile>
<ClCompile Include="api.c" />
<ClCompile Include="crypto\mshabal.c" />
<ClCompile Include="sysinfos.c" />
<ClCompile Include="crypto\aesb.c" />
<ClCompile Include="crypto\c_blake256.c" />
Expand Down
3 changes: 0 additions & 3 deletions cpuminer.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,6 @@
<ClCompile Include="algo\axiom.c">
<Filter>algo</Filter>
</ClCompile>
<ClCompile Include="crypto\mshabal.c">
<Filter>crypto</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="sha3\sph_blake.h">
Expand Down
Loading

1 comment on commit 57bd235

@pallas1
Copy link

Choose a reason for hiding this comment

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

it now segfaults both on an old core-i5 cpu and a modern amd fx processor.

Please sign in to comment.