From fb290ed56e4f9e977e107d9d337b5701f0e97e31 Mon Sep 17 00:00:00 2001 From: magnum Date: Mon, 14 Nov 2011 16:18:41 +0100 Subject: [PATCH 20/20] j8: Unify "algorithm name" (MMX, SSE2, SSE2i). --- src/MD5_std.h | 2 +- src/dynamic_fmt.c | 50 ++++++++++++++++++++++---------------------- src/mscash2_fmt_plug.c | 2 +- src/rawMD4_fmt_plug.c | 2 +- src/rawSHA1_fmt_plug.c | 6 ++-- src/salted_sha1_fmt_plug.c | 6 ++-- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/MD5_std.h b/src/MD5_std.h index 36c608f..72b0976 100644 --- a/src/MD5_std.h +++ b/src/MD5_std.h @@ -69,7 +69,7 @@ typedef struct { # define MMX_COEF 4 # endif # define MD5_N (MD5_SSE_PARA*MMX_COEF) -# define MD5_ALGORITHM_NAME MD5_N_STR +# define MD5_ALGORITHM_NAME "SSE2i " MD5_N_STR #else # if MD5_X2 # define MD5_N 2 diff --git a/src/dynamic_fmt.c b/src/dynamic_fmt.c index 0630d72..5147e80 100644 --- a/src/dynamic_fmt.c +++ b/src/dynamic_fmt.c @@ -266,28 +266,28 @@ static void __SSE_gen_BenchLowLevelFunctions(); #if (MMX_COEF == 2) #define BLOCK_LOOPS 64 -#define ALGORITHM_NAME "MMX 64x2 (.S)" +#define ALGORITHM_NAME "MMX 64x2" #else // MMX_COEF != 2 #define BLOCK_LOOPS 32 #ifdef MD5_SSE_PARA #include "sse-intrinsics.h" #if (MD5_SSE_PARA==1) -#define ALGORITHM_NAME "SSE2 32x4x1 (intr)" +#define ALGORITHM_NAME "SSE2i 32x4x1" #elif (MD5_SSE_PARA==2) -#define ALGORITHM_NAME "SSE2 16x4x2 (intr)" +#define ALGORITHM_NAME "SSE2i 16x4x2" #elif (MD5_SSE_PARA==3) -#define ALGORITHM_NAME "SSE2 10x4x3 (intr)" +#define ALGORITHM_NAME "SSE2i 10x4x3" #elif (MD5_SSE_PARA==4) -#define ALGORITHM_NAME "SSE2 8x4x4 (intr)" +#define ALGORITHM_NAME "SSE2i 8x4x4" #elif (MD5_SSE_PARA==5) -#define ALGORITHM_NAME "SSE2 6x4x5 (intr)" +#define ALGORITHM_NAME "SSE2i 6x4x5" #elif (MD5_SSE_PARA==6) -#define ALGORITHM_NAME "SSE2 5x4x6 (intr)" +#define ALGORITHM_NAME "SSE2i 5x4x6" #else //if (MD5_SSE_PARA==8) -#define ALGORITHM_NAME "SSE2 4x4x8 (intr)" +#define ALGORITHM_NAME "SSE2i 4x4x8" #endif // MD5_SSE_PARA #else // !MD5_SSE_PARA -#define ALGORITHM_NAME "SSE2 32x4 (.S)" +#define ALGORITHM_NAME "SSE2 32x4" #endif // PARA #endif // MMX_COEF == 4 @@ -6430,28 +6430,28 @@ int dynamic_SETUP(DYNAMIC_Setup *Setup, struct fmt_main *pFmt) { #ifdef MMX_COEF #if (MMX_COEF==2) - pFmt->params.algorithm_name = "MMX 2x1 (.S)"; + pFmt->params.algorithm_name = "MMX 2x1"; pFmt->params.max_keys_per_crypt = 2; #elif (MD5_SSE_PARA==1) - pFmt->params.algorithm_name = "SSE2 4x1 (intr)"; + pFmt->params.algorithm_name = "SSE2i 4x1"; pFmt->params.max_keys_per_crypt = 4; #elif (MD5_SSE_PARA==2) - pFmt->params.algorithm_name = "SSE2 4x2 (intr)"; + pFmt->params.algorithm_name = "SSE2i 4x2"; pFmt->params.max_keys_per_crypt = 8; #elif (MD5_SSE_PARA==3) - pFmt->params.algorithm_name = "SSE2 4x3 (intr)"; + pFmt->params.algorithm_name = "SSE2i 4x3"; pFmt->params.max_keys_per_crypt = 12; #elif (MD5_SSE_PARA==4) - pFmt->params.algorithm_name = "SSE2 4x4 (intr)"; + pFmt->params.algorithm_name = "SSE2i 4x4"; pFmt->params.max_keys_per_crypt = 16; #elif (MD5_SSE_PARA==5) - pFmt->params.algorithm_name = "SSE2 4x5 (intr)"; + pFmt->params.algorithm_name = "SSE2i 4x5"; pFmt->params.max_keys_per_crypt = 20; #elif (MD5_SSE_PARA==6) - pFmt->params.algorithm_name = "SSE2 4x6 (intr)"; + pFmt->params.algorithm_name = "SSE2i 4x6"; pFmt->params.max_keys_per_crypt = 24; #else - pFmt->params.algorithm_name = "SSE2 4x1 (.S)"; + pFmt->params.algorithm_name = "SSE2 4x1"; pFmt->params.max_keys_per_crypt = 4; #endif #else @@ -6480,24 +6480,24 @@ int dynamic_SETUP(DYNAMIC_Setup *Setup, struct fmt_main *pFmt) // by doing more than simple 1 set of MMX_COEF pFmt->params.max_keys_per_crypt = 16; #if (MMX_COEF==2) - pFmt->params.algorithm_name = "MMX 8x2 (.S)"; + pFmt->params.algorithm_name = "MMX 8x2"; #elif (MD5_SSE_PARA==1) - pFmt->params.algorithm_name = "SSE2 4x4x1 (intr)"; + pFmt->params.algorithm_name = "SSE2i 4x4x1"; #elif (MD5_SSE_PARA==2) - pFmt->params.algorithm_name = "SSE2 2x4x2 (intr)"; + pFmt->params.algorithm_name = "SSE2i 2x4x2"; #elif (MD5_SSE_PARA==3) - pFmt->params.algorithm_name = "SSE2 2x4x3 (intr)"; + pFmt->params.algorithm_name = "SSE2i 2x4x3"; pFmt->params.max_keys_per_crypt = 24; #elif (MD5_SSE_PARA==4) - pFmt->params.algorithm_name = "SSE2 1x4x4 (intr)"; + pFmt->params.algorithm_name = "SSE2i 1x4x4"; #elif (MD5_SSE_PARA==5) - pFmt->params.algorithm_name = "SSE2 1x4x5 (intr)"; + pFmt->params.algorithm_name = "SSE2i 1x4x5"; pFmt->params.max_keys_per_crypt = 20; #elif (MD5_SSE_PARA==6) - pFmt->params.algorithm_name = "SSE2 1x4x6 (intr)"; + pFmt->params.algorithm_name = "SSE2i 1x4x6"; pFmt->params.max_keys_per_crypt = 24; #else - pFmt->params.algorithm_name = "SSE2 4x4 (.S)"; + pFmt->params.algorithm_name = "SSE2 4x4"; #endif #else // In non-sse mode, 1 test runs as fast as 128. But validity checking is MUCH faster if diff --git a/src/mscash2_fmt_plug.c b/src/mscash2_fmt_plug.c index 65bbfdf..f8868d6 100644 --- a/src/mscash2_fmt_plug.c +++ b/src/mscash2_fmt_plug.c @@ -136,7 +136,7 @@ static void BESWAP(unsigned int *x, unsigned int *y, int count) #endif # ifdef SHA1_SSE_PARA -# define ALGORITHM_NAME "SSE2-para " SHA1_N_STR +# define ALGORITHM_NAME "SSE2i " SHA1_N_STR # define MS_NUM_KEYS (THREAD_PARA*MMX_COEF*SHA1_SSE_PARA) # else # define MS_NUM_KEYS (THREAD_PARA*MMX_COEF) diff --git a/src/rawMD4_fmt_plug.c b/src/rawMD4_fmt_plug.c index fc5810e..c998f92 100644 --- a/src/rawMD4_fmt_plug.c +++ b/src/rawMD4_fmt_plug.c @@ -20,7 +20,7 @@ #define MMX_COEF 4 #include "sse-intrinsics.h" #define NBKEYS (MMX_COEF * MD4_SSE_PARA) -#define ALGORITHM_NAME MD4_N_STR +#define ALGORITHM_NAME "SSE2i " MD4_N_STR #define PLAINTEXT_LENGTH 54 #define MIN_KEYS_PER_CRYPT NBKEYS #define MAX_KEYS_PER_CRYPT NBKEYS diff --git a/src/rawSHA1_fmt_plug.c b/src/rawSHA1_fmt_plug.c index 8acbc0f..fa4269d 100644 --- a/src/rawSHA1_fmt_plug.c +++ b/src/rawSHA1_fmt_plug.c @@ -24,11 +24,11 @@ #define FORMAT_NAME "Raw SHA-1" #ifdef SHA1_N_STR -#define ALGORITHM_NAME SHA1_N_STR +#define ALGORITHM_NAME "SSE2i " SHA1_N_STR #elif defined(MMX_COEF) && MMX_COEF == 4 -#define ALGORITHM_NAME "4x" +#define ALGORITHM_NAME "SSE2 4x" #elif defined(MMX_COEF) && MMX_COEF == 2 -#define ALGORITHM_NAME "2x" +#define ALGORITHM_NAME "MMX 2x" #elif defined(MMX_COEF) #define ALGORITHM_NAME "?" #else diff --git a/src/salted_sha1_fmt_plug.c b/src/salted_sha1_fmt_plug.c index ffab746..a252f9e 100644 --- a/src/salted_sha1_fmt_plug.c +++ b/src/salted_sha1_fmt_plug.c @@ -34,11 +34,11 @@ #define FORMAT_NAME "Salted SHA-1" #ifdef SHA1_N_STR -#define ALGORITHM_NAME SHA1_N_STR +#define ALGORITHM_NAME "SSE2i " SHA1_N_STR #elif defined(MMX_COEF) && MMX_COEF == 4 -#define ALGORITHM_NAME "4x" +#define ALGORITHM_NAME "SSE2 4x" #elif defined(MMX_COEF) && MMX_COEF == 2 -#define ALGORITHM_NAME "2x" +#define ALGORITHM_NAME "MMX 2x" #elif defined(MMX_COEF) #define ALGORITHM_NAME "?" #else -- 1.7.5.4