Received: by 2002:a19:771d:0:0:0:0:0 with SMTP id s29csp1244175lfc; Wed, 1 Jun 2022 12:54:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5gjSwY8IyI4SjfA/Ub/4e3MAF8SW/sCI6VvpAWtBTqpjNb9gQUyu/W+rlzWgPxp//cKRl X-Received: by 2002:a17:903:11d1:b0:151:9fb2:9858 with SMTP id q17-20020a17090311d100b001519fb29858mr1067674plh.136.1654113265405; Wed, 01 Jun 2022 12:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654113265; cv=none; d=google.com; s=arc-20160816; b=sluOiHM0PTqoct6J2wwSDsDPgdTEWQYA8hocP3o9jZEqzhfkr70Y2eI4NEAl9u1Far VCdyWDhCg8UKfG6hS+C/PgG8lBL64heVCmiJR5QHoOwYG65NWID5E3fE9ZGJMEt7rcIl YCDMd1l6D6w6rHy0RZGlSnhbkYqU5792ukt9LkQA0+eggvbNJ1UrKmOySQsPjWxvebde xHrjwIwIo4cPxExQhdtgl+ziPi7bbAM/plFCW/EAz6X+A4OW8dVZNOtmc1nqanqMc5l7 D/sBO6UcBIzL/3x0sbhHBxyXqesFKEd2+Stn63keMEzOpqhS3XBOxTTmu1787j9vSAXZ Gfog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=gv2yk0YhaxCXOY6yaTmfiWPgDiPnXK3WoeyO+XL7S6Q=; b=GIdy6AasXNc//1L78FMPxhEI5n4XvSJ+P4FbyEJdkyYr1qIp8E/fwDvQ2WS0hnblGy bt3GqSFIDH593UKyRGx6zRh0w2CTUHoQsSMCRWmrS8ZDioUqTPnRT6yk3lYhke5kBcYZ KiWN+qq/GAlG7cr08B3V/vDQbz+xYfOx9E6U8L8tVRAELHHMKj7egiF16Cl/EZ+saLmQ ZfxflLFOF3F82y2gK8bNLsHBPlDpB0vWWMacNSzrrS0xACtGfI02fA2OsKJLsZ4LZfdJ UPLg2//Ndcv5x37ckbjBJrqYr5cfIvOl7xdDm/4dt7dHTYTQ9HBltLIhDUJiClvMkhtP 7zrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XoHDllrI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id bg2-20020a17090b0d8200b001df1faf6ee8si3001045pjb.58.2022.06.01.12.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 12:54:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=XoHDllrI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AC30420C6CC; Wed, 1 Jun 2022 12:15:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353267AbiFANgI (ORCPT + 99 others); Wed, 1 Jun 2022 09:36:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232808AbiFANgH (ORCPT ); Wed, 1 Jun 2022 09:36:07 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DBC96FD30; Wed, 1 Jun 2022 06:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654090566; x=1685626566; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=xoloNpkXjfX9GAfyDDZ6xvm9A+pcOjqX5sndCvY8+RM=; b=XoHDllrIKVgiRZbWyQJvkaBceDagf25p2Xi0dfEgq5H75sgEhkBEY+6B t7rBk579YWKV7QKhmdKdfVxUFJDuxnJvHhWfOeCohHFNmAHshL7JGVTIM /8ED7shQRSrx6ujYxsjfPm6yj+oOssSBvz+Y1yiMNEWYiK6HQc+Mniqb8 tATVZFKPLWYoUcsvJrfcjPXm9xBoPkOW9pUf+zn0+WFZZ2UR56Y4MIqTV IM5TlEIDyKAfQvtcXxWCJUiN1586svoCtR/b8HSO0Fcf2rEVm63e93qms 3vUHjU/TMFaGc3j8Bfy6n2imwH6L3e42mE161ivQ1ngTxivnbYnKIGs+1 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10365"; a="256069574" X-IronPort-AV: E=Sophos;i="5.91,268,1647327600"; d="scan'208";a="256069574" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2022 06:35:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,268,1647327600"; d="scan'208";a="581584608" Received: from linux.intel.com ([10.54.29.200]) by fmsmga007.fm.intel.com with ESMTP; 01 Jun 2022 06:35:57 -0700 Received: from [10.252.214.178] (kliang2-MOBL.ccr.corp.intel.com [10.252.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id AA346580514; Wed, 1 Jun 2022 06:35:54 -0700 (PDT) Message-ID: <2adf5485-db22-8dde-9d32-6615e6346c6f@linux.intel.com> Date: Wed, 1 Jun 2022 09:35:53 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH v5 3/8] perf headers: Pass "cpu" pmu name while printing caps Content-Language: en-US To: Ravi Bangoria , acme@kernel.org Cc: jolsa@kernel.org, irogers@google.com, peterz@infradead.org, rrichter@amd.com, mingo@redhat.com, mark.rutland@arm.com, namhyung@kernel.org, tglx@linutronix.de, bp@alien8.de, james.clark@arm.com, leo.yan@linaro.org, ak@linux.intel.com, eranian@google.com, like.xu.linux@gmail.com, x86@kernel.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, sandipan.das@amd.com, ananth.narayan@amd.com, kim.phillips@amd.com, santosh.shukla@amd.com References: <20220601032608.1034-1-ravi.bangoria@amd.com> <20220601032608.1034-4-ravi.bangoria@amd.com> From: "Liang, Kan" In-Reply-To: <20220601032608.1034-4-ravi.bangoria@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5/31/2022 11:26 PM, Ravi Bangoria wrote: > Avoid unnecessary conditional code to check if pmu name is NULL > or not by passing "cpu" pmu name to the printing function. > > Signed-off-by: Ravi Bangoria Reviewed-by: Kan Liang Thanks, Kan > --- > tools/perf/util/header.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c > index 53332da100e8..ee7ccd94e272 100644 > --- a/tools/perf/util/header.c > +++ b/tools/perf/util/header.c > @@ -2058,17 +2058,11 @@ static void print_per_cpu_pmu_caps(FILE *fp, int nr_caps, char *cpu_pmu_caps, > char *str, buf[128]; > > if (!nr_caps) { > - if (!pmu_name) > - fprintf(fp, "# cpu pmu capabilities: not available\n"); > - else > - fprintf(fp, "# %s pmu capabilities: not available\n", pmu_name); > + fprintf(fp, "# %s pmu capabilities: not available\n", pmu_name); > return; > } > > - if (!pmu_name) > - scnprintf(buf, sizeof(buf), "# cpu pmu capabilities: "); > - else > - scnprintf(buf, sizeof(buf), "# %s pmu capabilities: ", pmu_name); > + scnprintf(buf, sizeof(buf), "# %s pmu capabilities: ", pmu_name); > > delimiter = buf; > > @@ -2085,7 +2079,7 @@ static void print_per_cpu_pmu_caps(FILE *fp, int nr_caps, char *cpu_pmu_caps, > static void print_cpu_pmu_caps(struct feat_fd *ff, FILE *fp) > { > print_per_cpu_pmu_caps(fp, ff->ph->env.nr_cpu_pmu_caps, > - ff->ph->env.cpu_pmu_caps, NULL); > + ff->ph->env.cpu_pmu_caps, (char *)"cpu"); > } > > static void print_hybrid_cpu_pmu_caps(struct feat_fd *ff, FILE *fp)