From patchwork Sun Feb 18 20:47:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 10226951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A56D6602CB for ; Sun, 18 Feb 2018 20:48:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93FEF28893 for ; Sun, 18 Feb 2018 20:48:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88C9828898; Sun, 18 Feb 2018 20:48:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D94F528893 for ; Sun, 18 Feb 2018 20:48:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751756AbeBRUsQ (ORCPT ); Sun, 18 Feb 2018 15:48:16 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35024 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751741AbeBRUsP (ORCPT ); Sun, 18 Feb 2018 15:48:15 -0500 Received: by mail-wm0-f68.google.com with SMTP id x21so11650599wmh.0 for ; Sun, 18 Feb 2018 12:48:15 -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 :in-reply-to:references; bh=55WbmxVj34uitcT5EYNOudBTY17E1oXAyl/3sPzNgNA=; b=KIULEN574bt/Y55HsyocMtDEjreAETLiCQZOocf3R+GFpWN9JiOr2cVTuKQzbLCvr9 XrzPOt1hwCwwbuS2Xbweeg9EZSTLkcOR6Ea1vv6owHlS9kY+yyT3svs0ESwFtCr1YSik MX1Cjt5mBBsJowZRQ3r+buGV0sG0aO52mlNxSty7dOsUbyQUdW8c/hMPzfJsf/Q5+g9D RTQnr90kLoSZbilf283mt+wJq5wBHQyBLDn99mmTVsA9koTWK52djOe2Qozx7ZJ/lXbA nLTpvjywn5jqQJjnbuoJ5OVEXsVvS3T2FzxLzJO4zMAhm0LJoVkd2srx+pcSnBKupJmF zNUA== 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:in-reply-to:references; bh=55WbmxVj34uitcT5EYNOudBTY17E1oXAyl/3sPzNgNA=; b=tFqiNdrdMW41nfD7CIHoiiW08GruZBgdLy1YjHHYEeqKH2ZusMge54/DnW/hT87fcA tNAoZIN8X7EK3cZNkj6rJqkOvP/FxHIpL5pzrQVOh+qRWKS0dg80EH2hOrVEZHrBI+BI rPEbMj1tdmkC66b5KhcbaStlPoAFm3NRGokFYMMMm+7Y63sStDgnIC++fWu5QVYVnG0F GTT+rOGAgu1ZeeUg+24l+Zzd730C16b/rTqcXcWF6DLL705XhiEXzFi4hJjMUZ3QHBoy feKd+VUQTyfSTnJs4A87POS1LIwQPFyDbpTYsg0JOfH82aEpNc19TcC+64Tl7BMGUEyE SlZA== X-Gm-Message-State: APf1xPDRtVDylpu4CAvcCz9mhaddaTCmpKWCIf+M1vRdVNycl02a3xcR BwZtLu0U0F7cQoLHE+qpjjepEDKH X-Google-Smtp-Source: AH8x224m7hmWn45Z4wvB0Oay7xYPisL+BwtBszdstv6h84I+7YGY78PdglZcDTZAxj9JCOqwGJMy8Q== X-Received: by 10.80.137.213 with SMTP id h21mr10226375edh.39.1518986894314; Sun, 18 Feb 2018 12:48:14 -0800 (PST) Received: from erosca.home ([2a02:8108:91c0:4bcc:98e2:b49f:4e58:283e]) by smtp.gmail.com with ESMTPSA id l9sm3786381edi.96.2018.02.18.12.48.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Feb 2018 12:48:13 -0800 (PST) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Masahiro Yamada , Ulf Magnusson , Petr Vorel , Nicolas Pitre , Randy Dunlap , Paul Bolle Cc: Eugeniu Rosca , Eugeniu Rosca , linux-kbuild@vger.kernel.org Subject: [PATCH v4 1/3] kconfig: Print reverse dependencies on new line consistently Date: Sun, 18 Feb 2018 21:47:13 +0100 Message-Id: <1b98a85a5b65a13eb0367d072250775434a3a8fc.1518985888.git.erosca@de.adit-jv.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eugeniu Rosca Commit 1ccb27143360 ("kconfig: make "Selected by:" and "Implied by:" readable") made an incredible improvement in how reverse dependencies are perceived by the user, by breaking down the single (often interminable) expression string into small readable chunks, each of them displayed on a separate line: Selected by: - A && B - C && (D || E) Unfortunately, what happens with the non-OR (either E_SYMBOL or E_AND) expressions is that they don't get a dedicated line: Selected by: F && G That's arguably a bug/misbehavior, but it puts some amount of burden in implementing new ways of printing reverse dependencies to the user. As example, if we prefix every reverse dependency top level "||" token by its tristate value, then subjectively [2] looks more readable than [1]. [1] Selected by: [m] F && G [2] Selected by: - [m] F && G Also, if we print the reverse dependency sub-expressions in groups (clustered by the tristate value they evaluate to), then subjectively [4] looks more readable than [3]. [3] Selected by [m]: F && G [4] Selected by [m]: - F && G Based on the above, print all the reverse dependency sub-expressions on a separate line _consistently_. An example of change contributed by this commit is seen below. | Symbol: NEED_SG_DMA_LENGTH [=y] | ... | Selected by: IOMMU_DMA [=y] && IOMMU_SUPPORT [=y] becomes: | Symbol: NEED_SG_DMA_LENGTH [=y] | ... | Selected by: | - IOMMU_DMA [=y] && IOMMU_SUPPORT [=y] This patch has been tested using a tuned variant of zconfdump which prints the reverse dependencies for each config symbol. Suggested-by: Masahiro Yamada Suggested-by: Ulf Magnusson Signed-off-by: Eugeniu Rosca Reviewed-by: Ulf Magnusson --- scripts/kconfig/expr.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index d45381986ac7..b89baed7f15c 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -1179,6 +1179,16 @@ struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2) return expr_get_leftmost_symbol(ret); } +static void +expr_print_newline(struct expr *e, + void (*fn)(void *, struct symbol *, const char *), + void *data, + int prevtoken) +{ + fn(data, NULL, "\n - "); + expr_print(e, fn, data, prevtoken); +} + static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken, bool revdep) { if (!e) { @@ -1191,7 +1201,10 @@ static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, con switch (e->type) { case E_SYMBOL: if (e->left.sym->name) - fn(data, e->left.sym, e->left.sym->name); + if (!revdep) + fn(data, e->left.sym, e->left.sym->name); + else + expr_print_newline(e, fn, data, E_OR); else fn(data, NULL, ""); break; @@ -1234,19 +1247,19 @@ static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, con fn(data, e->right.sym, e->right.sym->name); break; case E_OR: - if (revdep && e->left.expr->type != E_OR) - fn(data, NULL, "\n - "); __expr_print(e->left.expr, fn, data, E_OR, revdep); - if (revdep) - fn(data, NULL, "\n - "); - else + if (!revdep) fn(data, NULL, " || "); __expr_print(e->right.expr, fn, data, E_OR, revdep); break; case E_AND: - expr_print(e->left.expr, fn, data, E_AND); - fn(data, NULL, " && "); - expr_print(e->right.expr, fn, data, E_AND); + if (!revdep) { + expr_print(e->left.expr, fn, data, E_AND); + fn(data, NULL, " && "); + expr_print(e->right.expr, fn, data, E_AND); + } else { + expr_print_newline(e, fn, data, E_OR); + } break; case E_LIST: fn(data, e->right.sym, e->right.sym->name);