-#if defined (__i386__) || defined (__x86_64__)
- #if !defined(__APPLE__) || (defined(__APPLE__) && (__clang_major__ > 8))
- #if (__GNUC__ >= 5) && (__GNUC__ > 5 || __GNUC_MINOR__ > 2)
- if (__builtin_cpu_supports("avx512f")) strcpy(instruction_set, "AVX512F");
- else if (__builtin_cpu_supports("avx2")) strcpy(instruction_set, "AVX2");
- #else
- if (__builtin_cpu_supports("avx2")) strcpy(instruction_set, "AVX2");
- #endif
- else if (__builtin_cpu_supports("avx")) strcpy(instruction_set, "AVX");
- else if (__builtin_cpu_supports("sse2")) strcpy(instruction_set, "SSE2");
- else if (__builtin_cpu_supports("mmx")) strcpy(instruction_set, "MMX");
- else
- #endif
-#endif
- strcpy(instruction_set, "no");
+ switch(GetSIMDInstrAuto()) {
+ case SIMD_AVX512:
+ strcpy(instruction_set, "AVX512F");
+ break;
+ case SIMD_AVX2:
+ strcpy(instruction_set, "AVX2");
+ break;
+ case SIMD_AVX:
+ strcpy(instruction_set, "AVX");
+ break;
+ case SIMD_SSE2:
+ strcpy(instruction_set, "SSE2");
+ break;
+ case SIMD_MMX:
+ strcpy(instruction_set, "MMX");
+ break;
+ default:
+ strcpy(instruction_set, "no");
+ break;
+ }