Commit b3e048ad authored by Ravi Bangoria's avatar Ravi Bangoria Committed by PvsNarasimha
Browse files

perf header: Pass "cpu" pmu name while printing caps 

mainline inclusion
from mainline-v6.0-rc1
commit 2a12bef4
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU6ZD

Reference: https://github.com/torvalds/linux/commit/2a12bef413bb278db202ecb6adbd9c18dec4b260



--------------------------------

commit 2a12bef4 upstream

Avoid unnecessary conditional code to check if pmu name is NULL
or not by passing "cpu" pmu name to the printing function.

Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@amd.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Ananth Narayan <ananth.narayan@amd.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <rrichter@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Santosh Shukla <santosh.shukla@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: like.xu.linux@gmail.com
Cc: x86@kernel.org
Link: https://lore.kernel.org/r/20220604044519.594-4-ravi.bangoria@amd.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarMalathi A <arunagiri.malathi@amd.com>
Signed-off-by: default avatarPvsNarasimha <PVS.NarasimhaRao@amd.com>
parent 6b68f1a2

tools/perf/util/header.c

+3 −9
Original line number Diff line number Diff line
@@ -2006,16 +2006,10 @@ 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);

		return;

	}



	if (!pmu_name)

		scnprintf(buf, sizeof(buf), "# cpu pmu capabilities: ");

	else

	scnprintf(buf, sizeof(buf), "# %s pmu capabilities: ", pmu_name);



	delimiter = buf;
@@ -2033,7 +2027,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)