From patchwork Sat Mar 2 00:38:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Pandey X-Patchwork-Id: 86688 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0F49E3858439 for ; Sat, 2 Mar 2024 00:40:34 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by sourceware.org (Postfix) with ESMTPS id 918AD3858D39 for ; Sat, 2 Mar 2024 00:38:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 918AD3858D39 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 918AD3858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.198.163.9 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709339926; cv=none; b=mmnRTW5FLBx7/zMe3d/txzl+YpBOQTemFplMR6MUpDGG06JFsBC+BcuNzFsSQQOoXLxdru5qIX5euPHihy/qr/nBDCMYL94t7P/Fz16WeNsIuy5BFUEDeKdp/KvMrmezmHsLDruLVhYpQ7d8qo73vD/9T4ezmHR4CA02yvE8DTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709339926; c=relaxed/simple; bh=Ifp/vpBFfujvk1akkqpMUTx1g6U7Pl/KrxhnZSS9sFc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=NXoGi60smgEppL5LVX5GJTxcx0clOaovIqu9DJjX1KDk0s1I5wWWoQs2CFsIDWEUP0d8DjYxk9gCG9+CqCmgJIlIqDEedfjdiaPkITQdPmDn+oKu2idBFhjRlKfhscJdhpZvHZZLuvAoaFippUVq0H4jPwq18U8XeoofI8Gfn9o= ARC-Authentication-Results: i=1; server2.sourceware.org X-IronPort-AV: E=McAfee;i="6600,9927,11000"; a="14606496" X-IronPort-AV: E=Sophos;i="6.06,197,1705392000"; d="scan'208";a="14606496" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2024 16:38:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,197,1705392000"; d="scan'208";a="39369060" Received: from scymds04.sc.intel.com ([10.82.73.238]) by fmviesa001.fm.intel.com with ESMTP; 01 Mar 2024 16:38:43 -0800 Received: from gskx-1.sc.intel.com (gskx-1.sc.intel.com [172.25.149.211]) by scymds04.sc.intel.com (Postfix) with ESMTP id 71B26200428D for ; Fri, 1 Mar 2024 16:38:43 -0800 (PST) From: Sunil K Pandey To: libc-alpha@sourceware.org Subject: [PATCH] x86-64: Simplify minimum ISA check ifdef conditional with if Date: Fri, 1 Mar 2024 16:38:43 -0800 Message-ID: <20240302003843.3333713-1-skpgkp2@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-6.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FORGED_GMAIL_RCVD, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, KAM_DMARC_NONE, KAM_DMARC_STATUS, NML_ADSP_CUSTOM_MED, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org 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 result. Reviewed-by: H.J. Lu --- 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__