diff --git a/performance.c b/performance.c
index f6984787d7..461ab12d79 100644
--- a/performance.c
+++ b/performance.c
@@ -147,34 +147,31 @@ void rarch_get_cpu_features(struct rarch_cpu_features *cpu)
 
    x86_cpuid(1, flags);
 
-   if(flags[3] & (1 << 25))
+   if (flags[3] & (1 << 25))
       cpu->simd |= RARCH_SIMD_SSE;
 
-   if(flags[3] & (1 << 26))
+   if (flags[3] & (1 << 26))
       cpu->simd |= RARCH_SIMD_SSE2;
 
-   int avx_flags = (1 << 27) | (1 << 28);
-
-   if((flags[2] & avx_flags) == avx_flags)
+   const int avx_flags = (1 << 27) | (1 << 28);
+   if ((flags[2] & avx_flags) == avx_flags)
       cpu->simd |= RARCH_SIMD_AVX;
 
-   RARCH_LOG("[CPUID]: SSE:  %d\n", (cpu->simd & RARCH_SIMD_SSE) == RARCH_SIMD_SSE);
-   RARCH_LOG("[CPUID]: SSE2: %d\n", (cpu->simd & RARCH_SIMD_SSE2) == RARCH_SIMD_SSE2);
-   RARCH_LOG("[CPUID]: AVX:  %d\n", (cpu->simd & RARCH_SIMD_AVX) == RARCH_SIMD_AVX);
+   RARCH_LOG("[CPUID]: SSE:  %u\n", cpu->simd & RARCH_SIMD_SSE);
+   RARCH_LOG("[CPUID]: SSE2: %u\n", cpu->simd & RARCH_SIMD_SSE2);
+   RARCH_LOG("[CPUID]: AVX:  %u\n", cpu->simd & RARCH_SIMD_AVX);
 #elif defined(ANDROID) && defined(ANDROID_ARM)
    uint64_t cpu_flags = android_getCpuFeatures();
 
-   if(cpu_flags & ANDROID_CPU_ARM_FEATURE_NEON)
+   if (cpu_flags & ANDROID_CPU_ARM_FEATURE_NEON)
       cpu->simd |= RARCH_SIMD_NEON;
 
-   RARCH_LOG("[CPUID]: NEON: %d\n", (cpu->simd & RARCH_SIMD_NEON) == RARCH_SIMD_NEON);
+   RARCH_LOG("[CPUID]: NEON: %u\n", cpu->simd & RARCH_SIMD_NEON);
 #elif defined(__CELLOS_LV2__)
    cpu->simd |= RARCH_SIMD_VMX;
-
-   RARCH_LOG("[CPUID]: VMX: %d\n", (cpu->simd & RARCH_SIMD_VMX) == RARCH_SIMD_VMX);
+   RARCH_LOG("[CPUID]: VMX: %u\n", cpu->simd & RARCH_SIMD_VMX);
 #elif defined(XBOX360)
    cpu->simd |= RARCH_SIMD_VMX128;
-
-   RARCH_LOG("[CPUID]: VMX128: %d\n", (cpu->simd & RARCH_SIMD_VMX128) == RARCH_SIMD_VMX128);
+   RARCH_LOG("[CPUID]: VMX128: %u\n", cpu->simd & RARCH_SIMD_VMX128);
 #endif
 }
diff --git a/performance.h b/performance.h
index cdc3487e30..a85d0807ef 100644
--- a/performance.h
+++ b/performance.h
@@ -42,7 +42,7 @@ void rarch_perf_log(void);
 
 struct rarch_cpu_features
 {
-   uint32_t simd;
+   unsigned simd;
 };
 
 // Id values for SIMD CPU features
diff --git a/retroarch.c b/retroarch.c
index 70d61d9530..bc9aa342f5 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2594,15 +2594,15 @@ static void validate_cpu_features(void)
 } while(0)
 
 #ifdef __SSE__
-   if ((cpu.simd & RARCH_SIMD_SSE) != RARCH_SIMD_SSE)
+   if (!(cpu.simd & RARCH_SIMD_SSE))
       FAIL_CPU("SSE");
 #endif
 #ifdef __SSE2__
-   if ((cpu.simd & RARCH_SIMD_SSE2) != RARCH_SIMD_SSE2)
+   if (!(cpu.simd & RARCH_SIMD_SSE2))
       FAIL_CPU("SSE2");
 #endif
 #ifdef __AVX__
-   if ((cpu.simd & RARCH_SIMD_AVX) != RARCH_SIMD_AVX)
+   if (!(cpu.simd & RARCH_SIMD_AVX))
       FAIL_CPU("AVX");
 #endif
 }