From 7c27c0eee03e469080c05d62975b7f6fd9d5ff9f Mon Sep 17 00:00:00 2001 From: Marat Dukhan Date: Sat, 8 Dec 2018 22:06:47 -0800 Subject: Conditionally exclude cache detection code for irrelevant microarchitectures --- src/arm/cache.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src') diff --git a/src/arm/cache.c b/src/arm/cache.c index b026cec..fc1914c 100644 --- a/src/arm/cache.c +++ b/src/arm/cache.c @@ -18,6 +18,7 @@ void cpuinfo_arm_decode_cache( struct cpuinfo_cache l3[restrict static 1]) { switch (uarch) { +#if CPUINFO_ARCH_ARM && !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_8A__) case cpuinfo_uarch_xscale: switch (midr_get_part(midr) >> 8) { case 2: @@ -87,6 +88,8 @@ void cpuinfo_arm_decode_cache( .line_size = 32 }; break; +#endif /* CPUINFO_ARCH_ARM && !defined(__ARM_ARCH_7A__) && !defined(__ARM_ARCH_8A__) */ +#if CPUINFO_ARCH_ARM && !defined(__ARM_ARCH_8A__) case cpuinfo_uarch_cortex_a5: /* * Cortex-A5 Technical Reference Manual: @@ -410,6 +413,7 @@ void cpuinfo_arm_decode_cache( .line_size = 64 }; break; +#endif /* CPUINFO_ARCH_ARM && !defined(__ARM_ARCH_8A__) */ case cpuinfo_uarch_cortex_a35: /* * ARM Cortex‑A35 Processor Technical Reference Manual: @@ -1014,6 +1018,7 @@ void cpuinfo_arm_decode_cache( }; break; } +#if CPUINFO_ARCH_ARM && !defined(__ARM_ARCH_8A__) case cpuinfo_uarch_scorpion: /* * - "The CPU includes 32KB instruction and data caches as @@ -1076,6 +1081,7 @@ void cpuinfo_arm_decode_cache( .line_size = 128 }; break; +#endif /* CPUINFO_ARCH_ARM && !defined(__ARM_ARCH_8A__) */ case cpuinfo_uarch_kryo: /* * +-----------------+-------+-----------+-----------+-----------+-----------+ @@ -1207,6 +1213,7 @@ void cpuinfo_arm_decode_cache( .line_size = 64 /* assume DynamIQ cache */, }; break; +#if CPUINFO_ARCH_ARM64 && !defined(__ANDROID__) case cpuinfo_uarch_thunderx: /* * "78K-Icache and 32K-D cache per core, 16 MB shared L2 cache" [1] @@ -1229,6 +1236,7 @@ void cpuinfo_arm_decode_cache( .line_size = 64 /* assumption */ }; break; +#endif case cpuinfo_uarch_cortex_a12: case cpuinfo_uarch_cortex_a32: default: -- cgit v1.2.3