From 436bfff41e8f4c6ca0c6c1a6218045ae4cbac81c Mon Sep 17 00:00:00 2001 From: Mark Dietzer Date: Tue, 29 Mar 2022 07:32:11 -0700 Subject: [PATCH] rename COMPILER_HAS_SIMD to COMPILER_HAS_SIMD_X86 --- client/deps/hardnested/hardnested_bf_core.c | 8 +++--- client/deps/hardnested/hardnested_bf_core.h | 6 ++--- .../hardnested/hardnested_bitarray_core.c | 26 +++++++++---------- client/src/cmdhfmf.c | 12 ++++----- client/src/cmdhfmfhard.c | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/client/deps/hardnested/hardnested_bf_core.c b/client/deps/hardnested/hardnested_bf_core.c index 65d77adf6..17f296a27 100644 --- a/client/deps/hardnested/hardnested_bf_core.c +++ b/client/deps/hardnested/hardnested_bf_core.c @@ -568,7 +568,7 @@ void SetSIMDInstr(SIMDExecInstr instr) { static SIMDExecInstr GetSIMDInstr(void) { SIMDExecInstr instr; -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) __builtin_cpu_init(); #endif @@ -577,7 +577,7 @@ static SIMDExecInstr GetSIMDInstr(void) { instr = SIMD_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) instr = SIMD_AVX2; else if (__builtin_cpu_supports("avx")) @@ -617,7 +617,7 @@ uint64_t crack_states_bitsliced_dispatch(uint32_t cuid, uint8_t *best_first_byte crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX512; break; #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) case SIMD_AVX2: crack_states_bitsliced_function_p = &crack_states_bitsliced_AVX2; break; @@ -653,7 +653,7 @@ void bitslice_test_nonces_dispatch(uint32_t nonces_to_bruteforce, const uint32_t bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX512; break; #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) case SIMD_AVX2: bitslice_test_nonces_function_p = &bitslice_test_nonces_AVX2; break; diff --git a/client/deps/hardnested/hardnested_bf_core.h b/client/deps/hardnested/hardnested_bf_core.h index 4693462e3..006b85da2 100644 --- a/client/deps/hardnested/hardnested_bf_core.h +++ b/client/deps/hardnested/hardnested_bf_core.h @@ -55,8 +55,8 @@ THE SOFTWARE. #if ( defined (__i386__) || defined (__x86_64__) ) && \ ( !defined(__APPLE__) || \ (defined(__APPLE__) && (__clang_major__ > 8 || __clang_major__ == 8 && __clang_minor__ >= 1)) ) -# define COMPILER_HAS_SIMD -# if defined(COMPILER_HAS_SIMD) && ((__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)) +# define COMPILER_HAS_SIMD_X86 +# if defined(COMPILER_HAS_SIMD_X86) && ((__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)) # define COMPILER_HAS_SIMD_AVX512 # endif #endif @@ -76,7 +76,7 @@ typedef enum { #if defined(COMPILER_HAS_SIMD_AVX512) SIMD_AVX512, #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) SIMD_AVX2, SIMD_AVX, SIMD_SSE2, diff --git a/client/deps/hardnested/hardnested_bitarray_core.c b/client/deps/hardnested/hardnested_bitarray_core.c index 68a885be9..2031a9ec5 100644 --- a/client/deps/hardnested/hardnested_bitarray_core.c +++ b/client/deps/hardnested/hardnested_bitarray_core.c @@ -329,7 +329,7 @@ uint32_t *malloc_bitarray_dispatch(uint32_t x) { if (__builtin_cpu_supports("avx512f")) malloc_bitarray_function_p = &malloc_bitarray_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) malloc_bitarray_function_p = &malloc_bitarray_AVX2; else if (__builtin_cpu_supports("avx")) malloc_bitarray_function_p = &malloc_bitarray_AVX; else if (__builtin_cpu_supports("sse2")) malloc_bitarray_function_p = &malloc_bitarray_SSE2; @@ -352,7 +352,7 @@ void free_bitarray_dispatch(uint32_t *x) { if (__builtin_cpu_supports("avx512f")) free_bitarray_function_p = &free_bitarray_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) free_bitarray_function_p = &free_bitarray_AVX2; else if (__builtin_cpu_supports("avx")) free_bitarray_function_p = &free_bitarray_AVX; else if (__builtin_cpu_supports("sse2")) free_bitarray_function_p = &free_bitarray_SSE2; @@ -375,7 +375,7 @@ uint32_t bitcount_dispatch(uint32_t a) { if (__builtin_cpu_supports("avx512f")) bitcount_function_p = &bitcount_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) bitcount_function_p = &bitcount_AVX2; else if (__builtin_cpu_supports("avx")) bitcount_function_p = &bitcount_AVX; else if (__builtin_cpu_supports("sse2")) bitcount_function_p = &bitcount_SSE2; @@ -398,7 +398,7 @@ uint32_t count_states_dispatch(uint32_t *bitarray) { if (__builtin_cpu_supports("avx512f")) count_states_function_p = &count_states_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) count_states_function_p = &count_states_AVX2; else if (__builtin_cpu_supports("avx")) count_states_function_p = &count_states_AVX; else if (__builtin_cpu_supports("sse2")) count_states_function_p = &count_states_SSE2; @@ -421,7 +421,7 @@ void bitarray_AND_dispatch(uint32_t *A, uint32_t *B) { if (__builtin_cpu_supports("avx512f")) bitarray_AND_function_p = &bitarray_AND_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) bitarray_AND_function_p = &bitarray_AND_AVX2; else if (__builtin_cpu_supports("avx")) bitarray_AND_function_p = &bitarray_AND_AVX; else if (__builtin_cpu_supports("sse2")) bitarray_AND_function_p = &bitarray_AND_SSE2; @@ -444,7 +444,7 @@ void bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) { if (__builtin_cpu_supports("avx512f")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX2; else if (__builtin_cpu_supports("avx")) bitarray_low20_AND_function_p = &bitarray_low20_AND_AVX; else if (__builtin_cpu_supports("sse2")) bitarray_low20_AND_function_p = &bitarray_low20_AND_SSE2; @@ -467,7 +467,7 @@ uint32_t count_bitarray_AND_dispatch(uint32_t *A, uint32_t *B) { if (__builtin_cpu_supports("avx512f")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX2; else if (__builtin_cpu_supports("avx")) count_bitarray_AND_function_p = &count_bitarray_AND_AVX; else if (__builtin_cpu_supports("sse2")) count_bitarray_AND_function_p = &count_bitarray_AND_SSE2; @@ -490,7 +490,7 @@ uint32_t count_bitarray_low20_AND_dispatch(uint32_t *A, uint32_t *B) { if (__builtin_cpu_supports("avx512f")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX2; else if (__builtin_cpu_supports("avx")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_AVX; else if (__builtin_cpu_supports("sse2")) count_bitarray_low20_AND_function_p = &count_bitarray_low20_AND_SSE2; @@ -513,7 +513,7 @@ void bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uint32_t *D) if (__builtin_cpu_supports("avx512f")) bitarray_AND4_function_p = &bitarray_AND4_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) bitarray_AND4_function_p = &bitarray_AND4_AVX2; else if (__builtin_cpu_supports("avx")) bitarray_AND4_function_p = &bitarray_AND4_AVX; else if (__builtin_cpu_supports("sse2")) bitarray_AND4_function_p = &bitarray_AND4_SSE2; @@ -536,7 +536,7 @@ void bitarray_OR_dispatch(uint32_t *A, uint32_t *B) { if (__builtin_cpu_supports("avx512f")) bitarray_OR_function_p = &bitarray_OR_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) bitarray_OR_function_p = &bitarray_OR_AVX2; else if (__builtin_cpu_supports("avx")) bitarray_OR_function_p = &bitarray_OR_AVX; else if (__builtin_cpu_supports("sse2")) bitarray_OR_function_p = &bitarray_OR_SSE2; @@ -559,7 +559,7 @@ uint32_t count_bitarray_AND2_dispatch(uint32_t *A, uint32_t *B) { if (__builtin_cpu_supports("avx512f")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX2; else if (__builtin_cpu_supports("avx")) count_bitarray_AND2_function_p = &count_bitarray_AND2_AVX; else if (__builtin_cpu_supports("sse2")) count_bitarray_AND2_function_p = &count_bitarray_AND2_SSE2; @@ -582,7 +582,7 @@ uint32_t count_bitarray_AND3_dispatch(uint32_t *A, uint32_t *B, uint32_t *C) { if (__builtin_cpu_supports("avx512f")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX2; else if (__builtin_cpu_supports("avx")) count_bitarray_AND3_function_p = &count_bitarray_AND3_AVX; else if (__builtin_cpu_supports("sse2")) count_bitarray_AND3_function_p = &count_bitarray_AND3_SSE2; @@ -605,7 +605,7 @@ uint32_t count_bitarray_AND4_dispatch(uint32_t *A, uint32_t *B, uint32_t *C, uin if (__builtin_cpu_supports("avx512f")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX512; else #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (__builtin_cpu_supports("avx2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX2; else if (__builtin_cpu_supports("avx")) count_bitarray_AND4_function_p = &count_bitarray_AND4_AVX; else if (__builtin_cpu_supports("sse2")) count_bitarray_AND4_function_p = &count_bitarray_AND4_SSE2; diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index 5d1f34dd5..ab11f3415 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -1865,7 +1865,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) { arg_lit0("w", "wr", "Acquire nonces and UID, and write them to file `hf-mf--nonces.bin`"), arg_lit0(NULL, "in", "None (use CPU regular instruction set)"), -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) arg_lit0(NULL, "im", "MMX"), arg_lit0(NULL, "is", "SSE2"), arg_lit0(NULL, "ia", "AVX"), @@ -1925,7 +1925,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) { bool nonce_file_write = arg_get_lit(ctx, 14); bool in = arg_get_lit(ctx, 15); -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) bool im = arg_get_lit(ctx, 16); bool is = arg_get_lit(ctx, 17); bool ia = arg_get_lit(ctx, 18); @@ -1947,7 +1947,7 @@ static int CmdHF14AMfNestedHard(const char *Cmd) { SetSIMDInstr(SIMD_AVX512); #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (i2) SetSIMDInstr(SIMD_AVX2); if (ia) @@ -2071,7 +2071,7 @@ static int CmdHF14AMfAutoPWN(const char *Cmd) { arg_lit0(NULL, "4k", "MIFARE Classic 4k / S70"), arg_lit0(NULL, "in", "None (use CPU regular instruction set)"), -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) arg_lit0(NULL, "im", "MMX"), arg_lit0(NULL, "is", "SSE2"), arg_lit0(NULL, "ia", "AVX"), @@ -2124,7 +2124,7 @@ static int CmdHF14AMfAutoPWN(const char *Cmd) { bool m4 = arg_get_lit(ctx, 12); bool in = arg_get_lit(ctx, 13); -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) bool im = arg_get_lit(ctx, 14); bool is = arg_get_lit(ctx, 15); bool ia = arg_get_lit(ctx, 16); @@ -2176,7 +2176,7 @@ static int CmdHF14AMfAutoPWN(const char *Cmd) { SetSIMDInstr(SIMD_AVX512); #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) if (i2) SetSIMDInstr(SIMD_AVX2); if (ia) diff --git a/client/src/cmdhfmfhard.c b/client/src/cmdhfmfhard.c index 0ed615bd1..f4ba72cbc 100644 --- a/client/src/cmdhfmfhard.c +++ b/client/src/cmdhfmfhard.c @@ -88,7 +88,7 @@ static void get_SIMD_instruction_set(char *instruction_set) { strcpy(instruction_set, "AVX512F"); break; #endif -#if defined(COMPILER_HAS_SIMD) +#if defined(COMPILER_HAS_SIMD_X86) case SIMD_AVX2: strcpy(instruction_set, "AVX2"); break;