From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 0FD053858417; Sat, 13 Apr 2024 18:59:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FD053858417 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1713034778; bh=SsLRnRzngECcMlNTKl/Z+dPUHIWCKxrDLtI9sDh1ymQ=; h=From:To:Subject:Date:From; b=FoTrc7leA8NMX140hBujeFTB05qb+WkUSDQmOC9INhI+fsUvO7Cf5uJngk4u5XbX7 ckpTrLwzvSubsiuvJtqzcD346X2v4BinFcqJrBbu0A2vMbUqsuL4GiEqWbqVkaIGlv hsrtzY8ne1kFDxGzixaoCX8idC2Vot805kGRGYkA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/release/2.39/master] 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/release/2.39/master X-Git-Oldrev: 9883f4304cfb1558d0f1e6d9f48c4ab0a35355fe X-Git-Newrev: 7b92f46f04c6cbce19d19ae1099628431858996c Message-Id: <20240413185938.0FD053858417@sourceware.org> Date: Sat, 13 Apr 2024 18:59:38 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7b92f46f04c6cbce19d19ae1099628431858996c commit 7b92f46f04c6cbce19d19ae1099628431858996c 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 (cherry picked from commit b6e3898194bbae78910bbe9cd086937014961e45) 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 b8abe733ab..3d7c2819d7 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -1199,9 +1199,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)) { @@ -1222,24 +1221,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__