Commit 545a96c9 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Constify a few arrays 



Remove public definition of evsel__tool_names(). Not used outside
util/evsel.c.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20220507053410.3798748-3-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 17b3867d

tools/perf/tests/evsel-roundtrip-name.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) 
	return ret;

}



static int __perf_evsel__name_array_test(const char *names[], int nr_names,

static int __perf_evsel__name_array_test(const char *const names[], int nr_names,

					 int distance)

{

	int i, err;

tools/perf/util/evsel.c

+7 −7
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx) 
	return ERR_PTR(err);

}



const char *evsel__hw_names[PERF_COUNT_HW_MAX] = {

const char *const evsel__hw_names[PERF_COUNT_HW_MAX] = {

	"cycles",

	"instructions",

	"cache-references",
@@ -571,7 +571,7 @@ static int evsel__hw_name(struct evsel *evsel, char *bf, size_t size) 
	return r + evsel__add_modifiers(evsel, bf + r, size - r);

}



const char *evsel__sw_names[PERF_COUNT_SW_MAX] = {

const char *const evsel__sw_names[PERF_COUNT_SW_MAX] = {

	"cpu-clock",

	"task-clock",

	"page-faults",
@@ -597,7 +597,7 @@ static int evsel__sw_name(struct evsel *evsel, char *bf, size_t size) 
	return r + evsel__add_modifiers(evsel, bf + r, size - r);

}



const char *evsel__tool_names[PERF_TOOL_MAX] = {

static const char *const evsel__tool_names[PERF_TOOL_MAX] = {

	"duration_time",

	"user_time",

	"system_time",
@@ -633,7 +633,7 @@ static int evsel__bp_name(struct evsel *evsel, char *bf, size_t size) 
	return r + evsel__add_modifiers(evsel, bf + r, size - r);

}



const char *evsel__hw_cache[PERF_COUNT_HW_CACHE_MAX][EVSEL__MAX_ALIASES] = {

const char *const evsel__hw_cache[PERF_COUNT_HW_CACHE_MAX][EVSEL__MAX_ALIASES] = {

 { "L1-dcache",	"l1-d",		"l1d",		"L1-data",		},

 { "L1-icache",	"l1-i",		"l1i",		"L1-instruction",	},

 { "LLC",	"L2",							},
@@ -643,13 +643,13 @@ const char *evsel__hw_cache[PERF_COUNT_HW_CACHE_MAX][EVSEL__MAX_ALIASES] = { 
 { "node",								},

};



const char *evsel__hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX][EVSEL__MAX_ALIASES] = {

const char *const evsel__hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX][EVSEL__MAX_ALIASES] = {

 { "load",	"loads",	"read",					},

 { "store",	"stores",	"write",				},

 { "prefetch",	"prefetches",	"speculative-read", "speculative-load",	},

};



const char *evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX][EVSEL__MAX_ALIASES] = {

const char *const evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX][EVSEL__MAX_ALIASES] = {

 { "refs",	"Reference",	"ops",		"access",		},

 { "misses",	"miss",							},

};
@@ -665,7 +665,7 @@ const char *evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX][EVSEL__MAX_AL 
 * L1I : Read and prefetch only

 * ITLB and BPU : Read-only

 */

static unsigned long evsel__hw_cache_stat[C(MAX)] = {

static const unsigned long evsel__hw_cache_stat[C(MAX)] = {

 [C(L1D)]	= (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH),

 [C(L1I)]	= (CACHE_READ | CACHE_PREFETCH),

 [C(LL)]	= (CACHE_READ | CACHE_WRITE | CACHE_PREFETCH),

tools/perf/util/evsel.h

+5 −6
Original line number Diff line number Diff line
@@ -257,12 +257,11 @@ static inline bool evsel__is_bpf(struct evsel *evsel) 


#define EVSEL__MAX_ALIASES 8



extern const char *evsel__hw_cache[PERF_COUNT_HW_CACHE_MAX][EVSEL__MAX_ALIASES];

extern const char *evsel__hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX][EVSEL__MAX_ALIASES];

extern const char *evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX][EVSEL__MAX_ALIASES];

extern const char *evsel__hw_names[PERF_COUNT_HW_MAX];

extern const char *evsel__sw_names[PERF_COUNT_SW_MAX];

extern const char *evsel__tool_names[PERF_TOOL_MAX];

extern const char *const evsel__hw_cache[PERF_COUNT_HW_CACHE_MAX][EVSEL__MAX_ALIASES];

extern const char *const evsel__hw_cache_op[PERF_COUNT_HW_CACHE_OP_MAX][EVSEL__MAX_ALIASES];

extern const char *const evsel__hw_cache_result[PERF_COUNT_HW_CACHE_RESULT_MAX][EVSEL__MAX_ALIASES];

extern const char *const evsel__hw_names[PERF_COUNT_HW_MAX];

extern const char *const evsel__sw_names[PERF_COUNT_SW_MAX];

extern char *evsel__bpf_counter_events;

bool evsel__match_bpf_counter_events(const char *name);

tools/perf/util/parse-events.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static int add_event_tool(struct list_head *list, int *idx, 
	return 0;

}



static int parse_aliases(char *str, const char *names[][EVSEL__MAX_ALIASES], int size)

static int parse_aliases(char *str, const char *const names[][EVSEL__MAX_ALIASES], int size)

{

	int i, j;

	int n, longest = -1;