From cb3a749a22a55645dc6a52659eea765300623f98 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 28 Oct 2020 15:53:26 +0100 Subject: [PATCH] x86: Restore processing of cache size tunables in init_cacheinfo Fixes and partially reverts commit 59803e81f96b479c17f583b31eac44b5 ("x86: Optimizing memcpy for AMD Zen architecture."). --- sysdeps/x86/cacheinfo.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sysdeps/x86/cacheinfo.h b/sysdeps/x86/cacheinfo.h index 1296c93..0aec0e2 100644 --- a/sysdeps/x86/cacheinfo.h +++ b/sysdeps/x86/cacheinfo.h @@ -354,11 +354,9 @@ init_cacheinfo (void) } } + /* Prefer cache size configure via tuning. */ if (cpu_features->data_cache_size != 0) - { - if (data == 0 || cpu_features->basic.kind != arch_kind_amd) - data = cpu_features->data_cache_size; - } + data = cpu_features->data_cache_size; if (data > 0) { @@ -370,11 +368,9 @@ init_cacheinfo (void) __x86_data_cache_size = data; } + /* Prefer cache size configure via tuning. */ if (cpu_features->shared_cache_size != 0) - { - if (shared == 0 || cpu_features->basic.kind != arch_kind_amd) - shared = cpu_features->shared_cache_size; - } + shared = cpu_features->shared_cache_size; if (shared > 0) { -- 2.7.4