From patchwork Mon Mar 22 12:11:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12154655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 905A2C433C1 for ; Mon, 22 Mar 2021 12:12:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5911F6199F for ; Mon, 22 Mar 2021 12:12:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230236AbhCVMMQ (ORCPT ); Mon, 22 Mar 2021 08:12:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230140AbhCVMMJ (ORCPT ); Mon, 22 Mar 2021 08:12:09 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10A84C061756 for ; Mon, 22 Mar 2021 05:12:09 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id v4so16427146wrp.13 for ; Mon, 22 Mar 2021 05:12:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aTDHPW9pwc7PH1eEbY2UkaSZBT3P2v2obZRdFvPqz/Q=; b=b+Bz3+ihpgcpcIDPzkkF6+7C2D2vRTWNXPx/WUFzDmuyyiar9g2ltO7qjo/JIgAO5K Fo6CWWxZTLjdpzheKoxTJmuBJAlEjubEre+SozhFjJc8ld/fmOqPtC5kMSRAfSeGAUYh TNhGQRELHLk14RDLSMEawBtqGl1GACm7Wsxqb2DAAog/W3R5vCu3/FYTOFbPl4X88y8z 025RkKRorw1TH2j9/Xc4H+wRnnaQTIZnfTeY97XChY9ARodeSrEP95Ama9C5WBTiyjQT S1lXECD9H0qPSnGsZ5zTEERN4cZ2gb0qA5rsVbRgtRKN3svaqyXRYCm9XGCdkaDalQ+9 YWyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aTDHPW9pwc7PH1eEbY2UkaSZBT3P2v2obZRdFvPqz/Q=; b=umNARxsV1DYVdJQzKLBfTIbAUBI5B7fYqZjGE/iUWrn1JhhycVB85Lc+gICxjH8TwL fXXo2fQn7Uy+g4tsDZ3/xOUBsbi/4dqc3wguzIWvqUBxr5/Hx/IPAsl0OLuDbJWiJRfx E2HOxV3cK79qcHkBRFNCJgP1BoaB+5V5vHkoZ5ExfZv99jtnZRmqg6t/kaa8ayFTl8D4 JX5JtoBZne27O2cSzJYDL3n9q9jzQmVNf2SkUE9IjdzANFroY/4JQpskZDY6B/KPyl59 L78n4Yook0ljtz3Kl8RNOpGkYe7IcGYHyCEoVQ3YFHJqkVTVvK+c0nIvt3ptUVJFPApo 36GQ== X-Gm-Message-State: AOAM5328TFvLtmzkM55gksk6IYL1ZjnsQfpYTydpqgFRxgrBk1WgsswS u6nfzHCPOnKLPg3jbSYzwc5PLw9XqMsg3A== X-Google-Smtp-Source: ABdhPJw5Bjf85jBU658KmGev472LOWAMLdQcev6F2fj3vZ64I+RpHtaCKS4wkj2QhBYtIUacqylNdQ== X-Received: by 2002:adf:a1ce:: with SMTP id v14mr18244159wrv.228.1616415127502; Mon, 22 Mar 2021 05:12:07 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id j20sm15621142wmp.30.2021.03.22.05.12.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 05:12:06 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?Ren=C3=A9_Scharfe?= , Jeff King , =?utf-8?q?SZEDER_G=C3=A1bor?= , Eric Wong , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v4 1/4] Makefile/coccicheck: add comment heading for all SPATCH flags Date: Mon, 22 Mar 2021 13:11:47 +0100 Message-Id: X-Mailer: git-send-email 2.31.0.285.gb40d23e604f In-Reply-To: References: <20210306192525.15197-1-avarab@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In 960154b9c17 (coccicheck: optionally batch spatch invocations, 2019-05-06) the comment being re-added here was amended and reworded to apply to the SPATCH_BATCH_SIZE variable. If we'd like a separate comment on SPATCH_FLAGS now the diff to introduce it will need to also move the comment. So add this heading back to make subsequent diffs smaller. Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f3dc2178324..eef99b4705d 100644 --- a/Makefile +++ b/Makefile @@ -1198,10 +1198,11 @@ PTHREAD_CFLAGS = SPARSE_FLAGS ?= SP_EXTRA_FLAGS = -Wno-universal-initializer +# For the 'coccicheck' target +SPATCH_FLAGS = --all-includes --patch . # For the 'coccicheck' target; setting SPATCH_BATCH_SIZE higher will # usually result in less CPU usage at the cost of higher peak memory. # Setting it to 0 will feed all files in a single spatch invocation. -SPATCH_FLAGS = --all-includes --patch . SPATCH_BATCH_SIZE = 1 include config.mak.uname From patchwork Sat Mar 6 19:25:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12120191 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 314DDC43381 for ; Sat, 6 Mar 2021 19:26:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0196650DB for ; Sat, 6 Mar 2021 19:26:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231330AbhCFT0P (ORCPT ); Sat, 6 Mar 2021 14:26:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230449AbhCFTZo (ORCPT ); Sat, 6 Mar 2021 14:25:44 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3006C06174A for ; Sat, 6 Mar 2021 11:25:39 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id r15-20020a05600c35cfb029010e639ca09eso1372243wmq.1 for ; Sat, 06 Mar 2021 11:25:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=news7jlUylhCOW6liv51WiyVhWcMnH88sJdKWL+Yiro=; b=uuhLMLDtLBL12b6HUbGfxLHmDmlQD37WO+r8o7hhRJOpqy4KjtV+Grz2lDg/xRlb3E sVtczkJJCqXTu+bjpLofchWR0A6IJ/5JvZ45yLquZ+w2wVakQBlurB0ELm+7IK2N+BQV XASgBPZ753WLZ3JbjRvzMKm6ZwwMATttzZpDdkwZYoICvWE2gjKxfIcFzEDcFbhRNO0Z /u3NPTq2F3+6+1ekNucY2t05QU5RY7vjrZ6v81Rvq9SMdI3/MvzXY4hT4hvLod87wZp1 H75nkKGidomBewCwqb1suswHw2U/CavEM5ue52lSGzqJypSIK9vlnzbkVvwOs6i14RY0 PcfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=news7jlUylhCOW6liv51WiyVhWcMnH88sJdKWL+Yiro=; b=EI4bs0BZdM/622GVTML9GwRLIj3wmPERFcAfeLDKh14e3Sxe1Hab6Q8hwlv6a15c3B adnXDlfjPH1Y9EyTLq2cZRRfH015SNUF+ZDU7H45GkyviIuB4jGu5+rX2endgLhEIXPi 45rNgRuk0L5ZQ+IIutot8miboBe9rTDa9oifKXrbfSpRrfz6yI2JkHjz/FWBXNePR3nT 8lf/rTDW7aeUM3hljDLnvSU2f4nJ8JILTxFePX7orvsiMsbeVOcyaCXzwiM/pCBgxaGU EkMILY+a8rqfCjt+DIjQ2DAj6IGUTjQZ3RH7OBA0BnJlkQ1FkjgNR1WgsLTCT58t+/tn y+JA== X-Gm-Message-State: AOAM533BZOneQNmsJKHXH9noQ/67mSaV2ELO5ZrlfyIRiPGaZlN+syIb ZWUtRZld/iH3DogHlEnyzCkc9OL3bwusOg== X-Google-Smtp-Source: ABdhPJyZbuSf0ytymlsyi8+pUuRVaq5P5ASgUFI4CD7KLy0+sRuF2elYNg+40cufrgFo3khw751axg== X-Received: by 2002:a1c:1bc7:: with SMTP id b190mr14758494wmb.115.1615058738118; Sat, 06 Mar 2021 11:25:38 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id m132sm11489714wmf.45.2021.03.06.11.25.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 11:25:37 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?Ren=C3=A9_Scharfe?= , Jeff King , =?utf-8?q?SZEDER_G=C3=A1bor?= , Eric Wong , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= Subject: [PATCH v2 5/4] Makefile/coccicheck: use --include-headers-for-types Date: Sat, 6 Mar 2021 20:25:25 +0100 Message-Id: <20210306192525.15197-1-avarab@gmail.com> X-Mailer: git-send-email 2.31.0.rc0.126.g04f22c5b82 In-Reply-To: <20210305170724.23859-5-avarab@gmail.com> References: <20210305170724.23859-5-avarab@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Change the recently added --no-includes out for --all-includes --include-headers-for-types. When I moved from --all-includes to --no-includes I missed that rules that use "type T" such as the one added dbc540c7a58 (add QSORT, 2016-09-29) won't work as intended. See [1] for a report of that. So let's move back to --all-includes to potentially scour our includes for definitions, but supply --include-headers-for-types so we won't racily emit duplicate hunks. See [2] for more discussion about that issue. This undoes most of the optimization we gained with --no-includes, using a very basic benchmark script [3] I get these results: * ~1m50s: --all-includes (before my recent patches) 38 files changed, 74 insertions(+), 78 deletions(-) * ~55s: --no-includes 27 files changed, 55 insertions(+), 57 deletions(-) * ~1m35s: --all-includes --include-headers-for-types 38 files changed, 74 insertions(+), 78 deletions(-) * ~1m20s: --local-includes --include-headers-for-types 36 files changed, 70 insertions(+), 72 deletions(-) * ~1m20s: --local-includes --include-headers-for-types --no-loops 36 files changed, 70 insertions(+), 72 deletions(-) And only the "--all-includes --include-headers-for-types" gets the same results as the previous "--all-includes", even with "--local-includes" we miss out on some definitions. 1. https://lore.kernel.org/git/3aac381e-2ce9-e35e-498c-9c26df235aed@web.de/ 2. https://lore.kernel.org/git/YENdUMLTM+cerfqJ@coredump.intra.peff.net/ 3. for flags in \ '--all-includes' \ '--no-includes' \ '--all-includes --include-headers-for-types' \ '--local-includes --include-headers-for-types' \ '--local-includes --include-headers-for-types --no-loops' do git reset --hard && git clean -dxfq contrib/ time make -j8 coccicheck SPATCH_FLAGS="$flags --patch ." SPATCH_XARGS="xargs -P 8 -n 16" 2>&1 | grep -v SPATCH cat contrib/coccinelle/*.patch | git apply git --no-pager diff --shortstat git --no-pager diff | git patch-id done Signed-off-by: Ævar Arnfjörð Bjarmason --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8aca96c6921..93b1009fbb1 100644 --- a/Makefile +++ b/Makefile @@ -1199,7 +1199,7 @@ SPARSE_FLAGS ?= SP_EXTRA_FLAGS = -Wno-universal-initializer # For the 'coccicheck' target -SPATCH_FLAGS = --no-includes --patch . +SPATCH_FLAGS = --all-includes --include-headers-for-types --patch . # For the 'coccicheck' target; setting SPATCH_BATCH_SIZE higher will # usually result in less CPU usage at the cost of higher peak memory.