From patchwork Wed Aug 9 18:08:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1819504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=aVH3FHLb; dkim-atps=neutral Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RLdNn3wSfz1yYl for ; Thu, 10 Aug 2023 04:09:13 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DBBFD3858298 for ; Wed, 9 Aug 2023 18:09:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DBBFD3858298 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1691604550; bh=GX1sA/hcV32ebsVxVTvcIVh+dbrJ/gvMcWOvvxc8dLc=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=aVH3FHLbRxuruXouNhbYgj6Lkk3PRc34xbk68VfRi3VVLLko9dMpfH7u46CxBl9EL i2aQHxR+0+4ANHgVf0JwChYEg2y+h8p7Cds51jbashzq4FJ+7II7E7KNkyV+9vQVDW aR1kvmDS9c6U1ZbFM5cXShbp7/toddnF+GEeapn8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id BE8143858404 for ; Wed, 9 Aug 2023 18:08:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BE8143858404 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-686ea67195dso31825b3a.2 for ; Wed, 09 Aug 2023 11:08:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691604534; x=1692209334; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GX1sA/hcV32ebsVxVTvcIVh+dbrJ/gvMcWOvvxc8dLc=; b=g4BXFq8siU6O9J0FhT1Q8u4ANPXeZfhAoxvju1MB1NHbFiHlPwb7/3s/xqZKoMZpfO /f+jc+WZG99pvCJnMLHHgc6NsXPjaOTq/TSStFVbPAG5mvCnNcVIUKGBKUiXIG4jvGA2 Ux+FLIQ8H1TeusccwnDQz3dwbMuK7Ifo4kzEhoELDdtLpZaP8JGXSvHo2NmO+D+/UXK9 PStR3ZB6i+hm8/cziXCDstNcyBvl7NPkhdTdOJgzsI/Ha3pAcSNjBSNZK55i52U5Jnd/ pNkrvJELj9MJQIVz4j4ghdw0ym4cBqfTRfxakJWUZLfqh30hk9zk8Nblyvf6Vr+e+4ec EpFQ== X-Gm-Message-State: AOJu0YwupvOFBBLE/DpHALCRCUpClsacZ9cpsui4hm6d2JRLYphaKYBQ 7cHFXK7FeUpumBFk5nUwaNKIT8X2FgA= X-Google-Smtp-Source: AGHT+IHGWc/qgNWlogtoZnHU3TxaQvAKrrvwzUrg/jXZr61JSkzhPJbqZM0CV+od+QmqM9LjGphA1Q== X-Received: by 2002:a05:6a20:2587:b0:134:2e3c:9845 with SMTP id k7-20020a056a20258700b001342e3c9845mr3503500pzd.22.1691604534488; Wed, 09 Aug 2023 11:08:54 -0700 (PDT) Received: from gnu-cfl-3.localdomain ([172.59.161.42]) by smtp.gmail.com with ESMTPSA id p26-20020a62ab1a000000b006871fdde2c7sm10227123pff.110.2023.08.09.11.08.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 11:08:54 -0700 (PDT) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id C0806740152 for ; Wed, 9 Aug 2023 11:08:52 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH] x86_64: Sort fpu/multiarch/Makefile Date: Wed, 9 Aug 2023 11:08:52 -0700 Message-ID: <20230809180852.3042338-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3025.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Sort Makefile variables using scripts/sort-makefile-lines.py. No code generation changes observed in libm. No regressions on x86_64. --- sysdeps/x86_64/fpu/multiarch/Makefile | 94 +++++++++++++++++++++------ 1 file changed, 74 insertions(+), 20 deletions(-) diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile index 248162525b..e37e488c37 100644 --- a/sysdeps/x86_64/fpu/multiarch/Makefile +++ b/sysdeps/x86_64/fpu/multiarch/Makefile @@ -1,17 +1,45 @@ ifeq ($(subdir),math) -libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \ - s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c \ - s_roundeven-c s_roundevenf-c s_trunc-c s_truncf-c +libm-sysdep_routines += \ + s_ceil-c \ + s_ceilf-c \ + s_floor-c \ + s_floorf-c \ + s_rint-c \ + s_rintf-c \ + s_nearbyint-c \ + s_nearbyintf-c \ + s_roundeven-c \ + s_roundevenf-c \ + s_trunc-c \ + s_truncf-c \ +# libm-sysdep_routines -libm-sysdep_routines += s_ceil-sse4_1 s_ceilf-sse4_1 s_floor-sse4_1 \ - s_floorf-sse4_1 s_nearbyint-sse4_1 \ - s_nearbyintf-sse4_1 s_roundeven-sse4_1 \ - s_roundevenf-sse4_1 s_rint-sse4_1 s_rintf-sse4_1 \ - s_trunc-sse4_1 s_truncf-sse4_1 +libm-sysdep_routines += \ + s_ceil-sse4_1 \ + s_ceilf-sse4_1 \ + s_floor-sse4_1 \ + s_floorf-sse4_1 \ + s_nearbyint-sse4_1 \ + s_nearbyintf-sse4_1 \ + s_roundeven-sse4_1 \ + s_roundevenf-sse4_1 \ + s_rint-sse4_1 \ + s_rintf-sse4_1 \ + s_trunc-sse4_1 \ + s_truncf-sse4_1 \ +# libm-sysdep_routines -libm-sysdep_routines += e_exp-fma e_log-fma e_pow-fma s_atan-fma \ - e_asin-fma e_atan2-fma s_sin-fma s_tan-fma \ - s_sincos-fma +libm-sysdep_routines += \ + e_asin-fma \ + e_atan2-fma \ + e_exp-fma \ + e_log-fma \ + e_pow-fma \ + s_atan-fma \ + s_sin-fma \ + s_sincos-fma \ + s_tan-fma \ +# libm-sysdep_routines CFLAGS-e_asin-fma.c = -mfma -mavx2 CFLAGS-e_atan2-fma.c = -mfma -mavx2 @@ -23,10 +51,22 @@ CFLAGS-s_sin-fma.c = -mfma -mavx2 CFLAGS-s_tan-fma.c = -mfma -mavx2 CFLAGS-s_sincos-fma.c = -mfma -mavx2 -libm-sysdep_routines += s_sinf-sse2 s_cosf-sse2 s_sincosf-sse2 +libm-sysdep_routines += \ + s_cosf-sse2 \ + s_sincosf-sse2 \ + s_sinf-sse2 \ +# libm-sysdep_routines -libm-sysdep_routines += e_exp2f-fma e_expf-fma e_log2f-fma e_logf-fma \ - e_powf-fma s_sinf-fma s_cosf-fma s_sincosf-fma +libm-sysdep_routines += \ + e_exp2f-fma \ + e_expf-fma \ + e_log2f-fma \ + e_logf-fma \ + e_powf-fma \ + s_cosf-fma \ + s_sincosf-fma \ + s_sinf-fma \ +# libm-sysdep_routines CFLAGS-e_exp2f-fma.c = -mfma -mavx2 CFLAGS-e_expf-fma.c = -mfma -mavx2 @@ -37,9 +77,17 @@ CFLAGS-s_sinf-fma.c = -mfma -mavx2 CFLAGS-s_cosf-fma.c = -mfma -mavx2 CFLAGS-s_sincosf-fma.c = -mfma -mavx2 -libm-sysdep_routines += e_exp-fma4 e_log-fma4 e_pow-fma4 s_atan-fma4 \ - e_asin-fma4 e_atan2-fma4 s_sin-fma4 s_tan-fma4 \ - s_sincos-fma4 +libm-sysdep_routines += \ + e_exp-fma4 \ + e_log-fma4 \ + e_pow-fma4 \ + e_asin-fma4 \ + s_atan-fma4 \ + e_atan2-fma4 \ + s_sin-fma4 \ + s_sincos-fma4 \ + s_tan-fma4 \ +# libm-sysdep_routines CFLAGS-e_asin-fma4.c = -mfma4 CFLAGS-e_atan2-fma4.c = -mfma4 @@ -51,9 +99,15 @@ CFLAGS-s_sin-fma4.c = -mfma4 CFLAGS-s_tan-fma4.c = -mfma4 CFLAGS-s_sincos-fma4.c = -mfma4 -libm-sysdep_routines += e_exp-avx e_log-avx s_atan-avx \ - e_atan2-avx s_sin-avx s_tan-avx \ - s_sincos-avx +libm-sysdep_routines += \ + e_exp-avx \ + e_log-avx \ + s_atan-avx \ + e_atan2-avx \ + s_sin-avx \ + s_sincos-avx \ + s_tan-avx \ +# libm-sysdep_routines CFLAGS-e_atan2-avx.c = -msse2avx -DSSE2AVX CFLAGS-e_exp-avx.c = -msse2avx -DSSE2AVX