From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7852) id DE7883858D28; Mon, 4 Mar 2024 00:14:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE7883858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1709511264; bh=kT271rY3FU6Zl4oBc5Jmyd3ygy6HFop13kjUGP9sLyM=; h=From:To:Subject:Date:From; b=DpzpZsoJ4tbR74Wkh5rSALERhdj0Ep6Sx1dgRDNJRpBDETvoZvFUWsZ2mGHM3T7zU 7DgcbT/w6nB5K8cB/LxwU39dsWAt9iAyUCEbTCRXkHiknABzgj3FEuRyWaS9x8noPd cCe8qS3oivcvD5PgSAS8151dIqZLHGQjiiOXsK6g= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Sunil Pandey To: glibc-cvs@sourceware.org Subject: [glibc] x86-64: Simplify minimum ISA check ifdef conditional with if X-Act-Checkin: glibc X-Git-Author: Sunil K Pandey X-Git-Refname: refs/heads/master X-Git-Oldrev: d370155b9ab73d0c45bf968b7a9c823f4697a505 X-Git-Newrev: b6e3898194bbae78910bbe9cd086937014961e45 Message-Id: <20240304001424.DE7883858D28@sourceware.org> Date: Mon, 4 Mar 2024 00:14:24 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b6e3898194bbae78910bbe9cd086937014961e45 commit b6e3898194bbae78910bbe9cd086937014961e45 Author: Sunil K Pandey Date: Thu Feb 29 17:57:02 2024 -0800 x86-64: Simplify minimum ISA check ifdef conditional with if Replace minimum ISA check ifdef conditional with if. Since MINIMUM_X86_ISA_LEVEL and AVX_X86_ISA_LEVEL are compile time constants, compiler will perform constant folding optimization, getting same results. Reviewed-by: H.J. Lu Diff: --- sysdeps/x86/cpu-features.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index e7c7ece462..4ea373dffa 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -1196,9 +1196,8 @@ no_cpuid: TUNABLE_CALLBACK (set_x86_shstk)); #endif -#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL - if (GLRO(dl_x86_cpu_features).xsave_state_size != 0) -#endif + if (MINIMUM_X86_ISA_LEVEL >= AVX_X86_ISA_LEVEL + || (GLRO(dl_x86_cpu_features).xsave_state_size != 0)) { if (CPU_FEATURE_USABLE_P (cpu_features, XSAVEC)) { @@ -1219,24 +1218,22 @@ no_cpuid: #endif } } -#if MINIMUM_X86_ISA_LEVEL < AVX_X86_ISA_LEVEL else { -# ifdef __x86_64__ +#ifdef __x86_64__ GLRO(dl_x86_64_runtime_resolve) = _dl_runtime_resolve_fxsave; -# ifdef SHARED +# ifdef SHARED GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; -# endif -# else -# ifdef SHARED +# endif +#else +# ifdef SHARED if (CPU_FEATURE_USABLE_P (cpu_features, FXSR)) GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fxsave; else GLRO(dl_x86_tlsdesc_dynamic) = _dl_tlsdesc_dynamic_fnsave; -# endif # endif - } #endif + } #ifdef SHARED # ifdef __x86_64__