Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1085956pxb; Wed, 29 Sep 2021 16:54:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzctKCxhKQ5+VpsDerB2S/cQgJQQdmuf0DGpeDDv9rxymmQmfO0Rkpl+lgkncIJmKcHtanE X-Received: by 2002:a50:9d0e:: with SMTP id v14mr3557284ede.230.1632959657388; Wed, 29 Sep 2021 16:54:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632959657; cv=none; d=google.com; s=arc-20160816; b=ZJKK3nLCtsvI1meYlVCJz1zM10UFlipwwLwqcsB2x2Yj4tIqE/2xtrnqngZ97GB2S8 a9UYRuouCopLFUrw0EzHz6snWYlkso8GmGpJrxdy4thJOcSLeqSZu+k+LNldN2Zd1veG Qr9vNCQq3vgU/dNkraLQMcmHF2MWUcKEC6EqI6L+OILu0cc2oF3B3ASjnMPAvwObPnEn IPlmLjzPW7LbM7aiwdSuQX70oFuhMCsVHsbtgUWR4xbUruEiuM5hGtC0SWtISArCWbhC fHpi++FQ4A9Uk0T+0+/tUqMFhRVg+qCxNdR7SX66Gv7JadXX3UsRPr+nbBEhF+4Yttiv PtDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=aLB4DMEY6kiiN+4nC3+vCNlwYiIsLidZxpplS9O3/DE=; b=0OdPiC8FSqC8KQ/v1iR3onHlY9tam2gOxzV/de6eDKIUXazZl2dUchpYzpsoyYhhee jdTkNnrigMD1ZrfDBXhxOJCdUn4wtlqES0/CUvCV+G8V7wMcSpVsCL+xdUq5C+3AlImJ sY7qpe3BlhZVu0vVp4M8OcGSbTWC6z9EMJjPoGaG8P359rqGwUyrZAU/6Xi5KYstA3/e KypVDb41WcsEX8L/u4npzX3swMhBB5Db8RDHGx4/AcBjWRk/Mdlfd86BfSuWLaBU84c5 wz8vDdEmP+v5L2n7TKWwOl5dcPw3quVqKWXjBJ5+6PyGx3laKYHgDXpEBgk5j4qxWNpr 8Sog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v13si1555809edr.596.2021.09.29.16.53.53; Wed, 29 Sep 2021 16:54:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346939AbhI2W4S (ORCPT + 99 others); Wed, 29 Sep 2021 18:56:18 -0400 Received: from mga17.intel.com ([192.55.52.151]:64658 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346922AbhI2W4R (ORCPT ); Wed, 29 Sep 2021 18:56:17 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="205204359" X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="205204359" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 15:54:34 -0700 X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="707502845" Received: from ojefferi-mobl.ger.corp.intel.com (HELO ldmartin-desk2) ([10.212.173.172]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 15:54:34 -0700 Date: Wed, 29 Sep 2021 15:54:33 -0700 From: Lucas De Marchi To: Andrzej Hajda Cc: intel-gfx@lists.freedesktop.org, Daniel Vetter , dri-devel@lists.freedesktop.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 2/3] drm/i915/utils: do not depend on config being defined Message-ID: <20210929225433.7z76swcouyas7upd@ldmartin-desk2> X-Patchwork-Hint: comment References: <20210929183357.1490204-1-lucas.demarchi@intel.com> <20210929183357.1490204-3-lucas.demarchi@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 29, 2021 at 11:08:18PM +0200, Andrzej Hajda wrote: > >W dniu 29.09.2021 o?20:33, Lucas De Marchi pisze: >> Like the IS_ENABLED() counterpart, we can make IS_CONFIG_NONZERO() to >> return the right thing when the config is not defined rather than a >> build error, with the limitation that it can't be used on preprocessor >> context. >> >> The trick here is that macro names can't start with a number or dash, so >> we stringify the argument and check that the first char is a number != 0 >> (or starting with a dash to cover negative numbers). Except for -O0 >> builds the strings are all eliminated. >> >> Taking CONFIG_DRM_I915_REQUEST_TIMEOUT in >> drivers/gpu/drm/i915/gem/i915_gem_context.c as example, we have the >> following output of the preprocessor: >> >> old: >> if (((20000) != 0) && >> new: >> if (( ("20000"[0] > '0' && "20000"[0] < '9') || "20000"[0] == '-' ) && >> >> New one looks worse, but is also eliminated from the object: >> >> $ size drivers/gpu/drm/i915/gem/i915_gem_context.o.* >> text data bss dec hex filename >> 52021 1070 232 53323 d04b drivers/gpu/drm/i915/gem/i915_gem_context.o.new >> 52021 1070 232 53323 d04b drivers/gpu/drm/i915/gem/i915_gem_context.o.old >> >> Signed-off-by: Lucas De Marchi >> --- >> drivers/gpu/drm/i915/i915_utils.h | 6 +++++- >> 1 file changed, 5 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils.h >> index 02bbfa4d68d3..436ce612c46a 100644 >> --- a/drivers/gpu/drm/i915/i915_utils.h >> +++ b/drivers/gpu/drm/i915/i915_utils.h >> @@ -28,6 +28,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> >> @@ -469,6 +470,9 @@ static inline bool timer_expired(const struct timer_list *t) >> * >> * Returns 0 if @config is 0, 1 if set to any value. >> */ >> -#define IS_CONFIG_NONZERO(config) ((config) != 0) >> +#define IS_CONFIG_NONZERO(config) ( \ >> + (__stringify_1(config)[0] > '0' && __stringify_1(config)[0] < '9') || \ >> + __stringify_1(config)[0] == '-' \ >> +) > > >Quite clever trick, but I see two issues: > >- gcc < 8.1 treats expressions with string indices (ex. "abc"[0]) as >non-constant expressions, so they cannot be used everywhere, for example >in global variable initializations, ugh, that would kill the idea - having the strings and additional runtime checks would not be good. Maybe if we check with __builtin_constant_p() and do the simpler expansion if it's not constant? > >- it does not work with hex (0x1) or octal values (01) indeed, but I guess that would be fixable by checking (s[0] == '0' && s[1] == '\0')? However, it seems kconfig doesn't support setting int options to hex or octal. If I try an hex value in menuconfig it says "You have made an invalid entry." If I try editing .config or setting via scripts/config --set-val, it just gets reset when trying to generate include/generated/autoconf.h Lucas De Marchi > >It is probably OK for private macro, but it can hurt in kconfig.h, >especially the 2nd issue > > >Regards > >Andrzej > >> >> #endif /* !__I915_UTILS_H */