From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753092AbeC0NSF (ORCPT ); Tue, 27 Mar 2018 09:18:05 -0400 Received: from mga03.intel.com ([134.134.136.65]:13001 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752683AbeC0NSC (ORCPT ); Tue, 27 Mar 2018 09:18:02 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,367,1517904000"; d="scan'208";a="41628054" Subject: Re: [PATCH v1 2/3] perf version: Print the status of compiled-in libraries To: Jiri Olsa Cc: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com, Linux-kernel@vger.kernel.org, ak@linux.intel.com, kan.liang@intel.com, yao.jin@intel.com References: <1522080424-12912-1-git-send-email-yao.jin@linux.intel.com> <1522080424-12912-3-git-send-email-yao.jin@linux.intel.com> <20180326093925.GI6207@krava> <6496ab3e-47a4-69ac-76da-18f0b228581f@linux.intel.com> <20180327125645.GG3102@krava> From: "Jin, Yao" Message-ID: <4c2cc31c-3701-3c37-6c81-cb226bc71e17@linux.intel.com> Date: Tue, 27 Mar 2018 21:17:57 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180327125645.GG3102@krava> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/27/2018 8:56 PM, Jiri Olsa wrote: > On Tue, Mar 27, 2018 at 09:44:23AM +0800, Jin, Yao wrote: >> >> >> On 3/26/2018 5:39 PM, Jiri Olsa wrote: >>> On Tue, Mar 27, 2018 at 12:07:03AM +0800, Jin Yao wrote: >>>> This patch checks the values passed by CFLAGS (-DXXX) and then >>>> print the status of libraries. >>>> >>>> For example, if HAVE_DWARF_SUPPORT is defined, that means the >>>> library "dwarf" is compiled-in. The patch will print the status >>>> "on" for this library. >>>> >>>> Signed-off-by: Jin Yao >>>> --- >>>> tools/perf/builtin-version.c | 125 +++++++++++++++++++++++++++++++++++++++++++ >>>> tools/perf/builtin.h | 1 + >>>> 2 files changed, 126 insertions(+) >>>> >>>> diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c >>>> index 37019c5..90a0a7f 100644 >>>> --- a/tools/perf/builtin-version.c >>>> +++ b/tools/perf/builtin-version.c >>>> @@ -9,3 +9,128 @@ int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused) >>>> printf("perf version %s\n", perf_version_string); >>>> return 0; >>>> } >>>> + >>>> +static void status_print(const char *name, const char *status) >>>> +{ >>>> + printf("%22s: [ %3s ]\n", name, status); >>>> +} >>>> + >>>> +static void library_status(void) >>>> +{ >>>> +#ifdef HAVE_DWARF_SUPPORT >>>> + status_print("dwarf", "on"); >>>> +#else >>>> + status_print("dwarf", "off"); >>>> +#endif >>> >>> could this and all those below be in some generic macro? >>> >>> #define STATUS(__d, __m) \ >>> #ifdef __d \ >>> status_print(#__m, "on"); \ >>> #else \ >>> status_print(#__m, "OFF"); \ >>> #endif >>> >>> STATUS(HAVE_DWARF_SUPPORT, dwarf) >>> >>> >> >> Hi Jiri, >> >> I have tried this macro definition, but unfortunately the compilation is >> failed. >> >> error: '#' is not followed by a macro parameter >> #define STATUS(__d, __m) \ >> >> I just guess the '#' in #ifdef confuses the gcc. Looks we can't define >> #ifdef/#endif block in a macro. >> > > ah crap.. right ;-) how about we take the IS_BUILTIN thingie > from include/linux/kconfig.h and use it as in attached test > change.. it gives me: > > [jolsa@krava perf]$ ./perf version > perf version 4.16.rc6.g1ee9a60 > dwarf: [ on ] > krava: [ OFF ] > > we could put those macros into tools/include/tools/config.h, Arnaldo? > together with the comments from kconfig.h that I cut out.. > > thanks, > jirka > > > --- > diff --git a/tools/perf/builtin-version.c b/tools/perf/builtin-version.c > index 1fe458792cc1..b392f9e80fd0 100644 > --- a/tools/perf/builtin-version.c > +++ b/tools/perf/builtin-version.c > @@ -6,8 +6,33 @@ > > int version_verbose; > > + > +#define __ARG_PLACEHOLDER_1 0, > +#define __take_second_arg(__ignored, val, ...) val > + > +#define __is_defined(x) ___is_defined(x) > +#define ___is_defined(val) ____is_defined(__ARG_PLACEHOLDER_##val) > +#define ____is_defined(arg1_or_junk) __take_second_arg(arg1_or_junk 1, 0) > + > +#define IS_BUILTIN(option) __is_defined(option) > + > + > +static void status_print(const char *name, const char *status) > +{ > + printf("%22s: [ %3s ]\n", name, status); > +} > + > int cmd_version(int argc __maybe_unused, const char **argv __maybe_unused) > { > printf("perf version %s\n", perf_version_string); > + > +#define STATUS(__d, __m) \ > + if (IS_BUILTIN(__d)) \ > + status_print(#__m, "on"); \ > + else \ > + status_print(#__m, "OFF"); > + > + STATUS(HAVE_DWARF_SUPPORT, dwarf) > + STATUS(HAVE_KRAVA_SUPPORT, krava) > return 0; > } > Hi Jiri, It looks we need to copy the IS_BUILTIN and associated macro definitions to a common header file. I guess you will post this patch if Arnaldo agree with this idea, right? I plan to post v2 of this patch series after this 'IS_BUILTIN' patch gets merged. Thanks Jin Yao