From patchwork Thu May 18 17:39:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 69625 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 1CDE33846453 for ; Thu, 18 May 2023 17:40:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1CDE33846453 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684431637; bh=6oy7w7zBuycnP2U7KaurDRejUMxJsHWpF+QkyWpMXUQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=uG5fI64URrBLG/cKDy3OztXTpVD1no2SZx8AVP7J7AcALZU3thcjJNH51I7Zz/Slu LGZoamu5fWDV+4ouC78XMlvlbjdIO+MFwx3snxyOGVHaV0/+ht9U47MznzeK+wqyFd UgSm4q/ax1FrXr0PUdsyUK/tmxC/IiNLdc8Ae3c4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 9677238555AE for ; Thu, 18 May 2023 17:39:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9677238555AE Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-640-oKvQ3U4uNaaYrwRgeNVB2Q-1; Thu, 18 May 2023 13:39:51 -0400 X-MC-Unique: oKvQ3U4uNaaYrwRgeNVB2Q-1 Received: by mail-yb1-f199.google.com with SMTP id 3f1490d57ef6-ba83fed51b0so2750202276.3 for ; Thu, 18 May 2023 10:39:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684431590; x=1687023590; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6oy7w7zBuycnP2U7KaurDRejUMxJsHWpF+QkyWpMXUQ=; b=L32wzg/ltlkQVJovKtPA/FGN8dTdKZfHfwhmh2d9FLl+ec9SkOwMiNSa0h0ilDhzsi /JdB0U8yuXsVgePOXKmRxIryNCBSLUjKTrZ/6M50aGV+E2qhhQ46FpcsR9lNJZCLDqC+ FGC6RReNdL5WPvO8YUsMbIgNgm7TVMqd2lsYw4Yjp4N/FA6wS979xl3E4OTTJS9maV+s 1irRL/z+an/e9FFZuKoZ9bPHsMdLiT14MREjCcmQHLbReBAZz4L46EJZHSnfPM7IjvID KZdhM0e08S/jTSoTRWXr5PmjxD/ls85EdMnayEohzGN+b0RUMEMM6zrc8MvHRvAKGSS8 gWPg== X-Gm-Message-State: AC+VfDzqIKpDoWURbFQ/cbW5iPjb/oNhHvPwTq1pt27QzjbYAxVLKRr+ Dvg0ny3Kthf0ZcKDKkq5kKDiPg3XB0KXXQiv93rYKlTi+DNaWgd548jFjkmROV/63LvsicKAdIM V65KJXlXFIIuHO0rvXBIp4mK8i/MvKu6xIVebbHZfxLshtO99fqArQGujgS3Jbricx6p4fVwW+L X/6w== X-Received: by 2002:a25:d0f:0:b0:ba8:6967:725 with SMTP id 15-20020a250d0f000000b00ba869670725mr2031184ybn.20.1684431590472; Thu, 18 May 2023 10:39:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4XW80IzsspTEuG97TbUq7QOLGuKG3E6UvNbAX5zKrDra+gFWimROMbPACm3u3Oz9mpQ02X9w== X-Received: by 2002:a25:d0f:0:b0:ba8:6967:725 with SMTP id 15-20020a250d0f000000b00ba869670725mr2031168ybn.20.1684431590100; Thu, 18 May 2023 10:39:50 -0700 (PDT) Received: from DESKTOP-1DH6NSL.localdomain ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id a7-20020a818a07000000b0055a72f6a462sm577533ywg.19.2023.05.18.10.39.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 10:39:49 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Carlos O'Donell Subject: [COMMITTED] benchtests: Reformat Makefile. Date: Thu, 18 May 2023 13:39:47 -0400 Message-Id: <20230518173947.511863-1-carlos@redhat.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Carlos O'Donell via Libc-alpha From: Carlos O'Donell Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Reflow all long lines adding comment terminators. Sort all reflowed text using scripts/sort-makefile-lines.py. No regressions running microbenchmarks. No code generation changes observed in binary artifacts. No regressions on x86_64 and i686. --- benchtests/Makefile | 47 ++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/benchtests/Makefile b/benchtests/Makefile index 5bd763a19d..e1346bbda1 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -87,11 +87,12 @@ bench-math := \ truncf \ y0 \ y1 \ + # bench-math ifneq (,$(filter yes,$(float96-fcts))) bench-math += \ cbrtl \ -# bench-math + # bench-math endif ifneq (,$(filter yes,$(float128-fcts) $(float128-alias-fcts))) @@ -100,7 +101,7 @@ bench-math += \ ilogbf128 \ powf128 \ sinf128 \ -# bench-math + # bench-math endif bench-pthread := \ @@ -111,7 +112,7 @@ bench-pthread := \ pthread-spin-trylock \ pthread_once \ thread_create \ -# bench-pthread + # bench-pthread LDLIBS-bench-pthread-mutex-lock += -lm LDLIBS-bench-pthread-mutex-trylock += -lm @@ -121,7 +122,7 @@ LDLIBS-bench-pthread-spin-trylock += -lm bench-string := \ ffs \ ffsll \ -# bench-string + # bench-string # String function benchmarks. string-benchset := \ @@ -174,7 +175,7 @@ string-benchset := \ strspn \ strstr \ strtok \ -# string-benchset + # string-benchset # Build and run locale-dependent benchmarks only if we're building natively. ifeq (no,$(cross-compiling)) @@ -199,7 +200,7 @@ wcsmbs-benchset := \ wmemchr \ wmemcmp \ wmemset \ -# wcsmbs-benchset + # wcsmbs-benchset else wcsmbs-benchset := endif @@ -233,7 +234,7 @@ LOCALES := \ tr_TR.UTF-8 \ vi_VN.UTF-8 \ zh_CN.UTF-8 \ -# LOCALES + # LOCALES include ../gen-locales.mk endif @@ -241,7 +242,7 @@ hash-benchset := \ dl-elf-hash \ dl-new-hash \ nss-hash \ -# hash-benchset + # hash-benchset stdlib-benchset := \ arc4random \ @@ -253,8 +254,13 @@ stdio-common-benchset := sprintf math-benchset := math-inlines ifeq (${BENCHSET},) -benchset := $(string-benchset-all) $(stdlib-benchset) $(stdio-common-benchset) \ - $(math-benchset) $(hash-benchset) +benchset := \ + $(hash-benchset) \ + $(math-benchset) \ + $(stdio-common-benchset) \ + $(stdlib-benchset) \ + $(string-benchset-all) \ + # benchset else benchset := $(foreach B,$(filter %-benchset,${BENCHSET}), ${${B}}) endif @@ -275,7 +281,10 @@ CFLAGS-bench-isinf.c += $(config-cflags-signaling-nans) CFLAGS-bench-isfinite.c += $(config-cflags-signaling-nans) ifeq (${BENCHSET},) -bench-malloc := malloc-thread malloc-simple +bench-malloc := \ + malloc-simple \ + malloc-thread \ + # bench-malloc else bench-malloc := $(filter malloc-%,${BENCHSET}) endif @@ -352,7 +361,11 @@ include ../Rules bench-math += $(bench-libmvec) ifeq (${BENCHSET},) -bench := $(bench-math) $(bench-pthread) $(bench-string) +bench := \ + $(bench-math) \ + $(bench-pthread) \ + $(bench-string) \ + # bench else bench := $(foreach B,$(filter bench-%,${BENCHSET}), ${${B}}) endif @@ -368,8 +381,12 @@ extra-objs += $(addsuffix .o,$(addprefix bench-,$(bench-malloc))) # This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed # for all these modules. -cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \ - $(binaries-bench-malloc:=.c) $(timing-type:=.c) +cpp-srcs-left := \ + $(binaries-bench-malloc:=.c) \ + $(binaries-bench:=.c) \ + $(binaries-benchset:=.c) \ + $(timing-type:=.c) \ + # cpp-srcs-left lib := nonlib include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) @@ -394,7 +411,7 @@ VALIDBENCHSETNAMES := \ stdlib-benchset \ string-benchset \ wcsmbs-benchset \ -# VALIDBENCHSETNAMES + # VALIDBENCHSETNAMES INVALIDBENCHSETNAMES := $(filter-out ${VALIDBENCHSETNAMES},${BENCHSET}) ifneq (${INVALIDBENCHSETNAMES},)