Keccak: header tweaks that make it build on SSE2, AVX or XOP. Maybe n…

…ot 100% but does work. Emits wads of warnings on AVX and XOP though, and AVX is not faster than SSE2.
openwall · Apr 17, 2013 · 1fd965b · 1fd965b
1 parent e632531
commit 1fd965b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/KeccakF-1600-opt64-settings.h b/src/KeccakF-1600-opt64-settings.h
@@ -1,17 +1,17 @@
 #include "arch.h"
 
-#if defined(__AVX__)
-#define UseXOP
-#elif defined(__XOP__)
+#if defined(__XOP__)
 #define UseXOP
+#elif defined(__AVX__)
+#define UseSSE
 #elif defined(__SSE2__)
-//#define UseSSE
+#define UseBebigokimisa
 #else
 #define UseBebigokimisa
 #endif
 
 #define Unrolling 24
-#define UseBebigokimisa
+//#define UseBebigokimisa
 //#define UseSSE
 //#define UseOnlySIMD64
 //#define UseMMX

diff --git a/src/rawKeccak_512_fmt_plug.c b/src/rawKeccak_512_fmt_plug.c
@@ -6,11 +6,12 @@
  * based on rawMD4_fmt.c code, with trivial changes by groszek.
  */
 
+#include <string.h>
+
 #include "arch.h"
 #include "params.h"
 #include "common.h"
 #include "formats.h"
-#include <string.h>
 #include "options.h"
 #include "KeccakF-1600-interface.h"
 #include "KeccakNISTInterface.h"