[PATCH v1 19/48] perf stat: Silence -Wshorten-64-to-32 warnings

Ian Rogers
2025-04-01T18:25:16Z

tools/perf/builtin-stat.c | 6 +++---
tools/perf/util/metricgroup.c | 15 +++++++--------
tools/perf/util/stat-display.c | 10 +++++-----
3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 68ea7589c143..3d1171d03d32 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -833,7 +833,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)

l = strlen(counter->unit);
if (l > stat_config.unit_width)
- stat_config.unit_width = l;
+ stat_config.unit_width = (unsigned int)l;

if (evsel__should_store_id(counter) &&
evsel__store_ids(counter, evsel_list)) {
@@ -2101,7 +2101,7 @@ static int __cmd_record(const struct option stat_options[], struct opt_aggr_mode
session = perf_session__new(data, NULL);
if (IS_ERR(session)) {
pr_err("Perf session creation failed\n");
- return PTR_ERR(session);
+ return (int)PTR_ERR(session);
}

init_features(session);
@@ -2283,7 +2283,7 @@ static int __cmd_report(int argc, const char **argv)

session = perf_session__new(&perf_stat.data, &perf_stat.tool);
if (IS_ERR(session))
- return PTR_ERR(session);
+ return (int)PTR_ERR(session);

perf_stat.session = session;
stat_config.output = stderr;
diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index 46920ebadfd1..1e07dcaed3d7 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -256,12 +256,10 @@ static struct metric *metric__new(const struct pmu_metric *pm,
return NULL;
}

-static bool contains_metric_id(struct evsel **metric_events, int num_events,
+static bool contains_metric_id(struct evsel **metric_events, size_t num_events,
const char *metric_id)
{
- int i;
-
- for (i = 0; i < num_events; i++) {
+ for (size_t i = 0; i < num_events; i++) {
if (!strcmp(evsel__metric_id(metric_events[i]), metric_id))
return true;
}
@@ -355,7 +353,7 @@ static int setup_metric_events(const char *pmu, struct hashmap *ids,

static bool match_metric(const char *metric_or_groups, const char *sought)
{
- int len;
+ size_t len;
char *m;

if (!sought)
@@ -570,7 +568,7 @@ static int encode_metric_id(struct strbuf *sb, const char *x)
if (ret)
break;

- ret = strbuf_addch(sb, '0' + (c - code_characters));
+ ret = strbuf_addch(sb, '0' + (int)(c - code_characters));
if (ret)
break;
} else {
@@ -1145,7 +1143,8 @@ static int metric_list_cmp(void *priv __maybe_unused, const struct list_head *l,
const struct metric *left = container_of(l, struct metric, nd);
const struct metric *right = container_of(r, struct metric, nd);
struct expr_id_data *data;
- int i, left_count, right_count;
+ int i;
+ size_t left_count, right_count;

left_count = hashmap__size(left->pctx->ids);
tool_pmu__for_each_event(i) {
@@ -1159,7 +1158,7 @@ static int metric_list_cmp(void *priv __maybe_unused, const struct list_head *l,
right_count--;
}

- return right_count - left_count;
+ return (int)right_count - (int)left_count;
}

/**
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index e852ac0d9847..0aa172cf5e39 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -622,7 +622,7 @@ static void print_metric_only(struct perf_stat_config *config,
struct outstate *os = ctx;
FILE *out = os->fh;
char buf[1024], str[1024];
- unsigned mlen = config->metric_only_len;
+ size_t mlen = config->metric_only_len;
const char *color = metric_threshold_classify__color(thresh);

if (!valid_only_metric(unit))
@@ -635,7 +635,7 @@ static void print_metric_only(struct perf_stat_config *config,
mlen += strlen(color) + sizeof(PERF_COLOR_RESET) - 1;

color_snprintf(str, sizeof(str), color ?: "", fmt ?: "", val);
- fprintf(out, "%*s ", mlen, str);
+ fprintf(out, "%*s ", (int)mlen, str);
os->first = false;
}

@@ -954,7 +954,7 @@ static void evsel__uniquify_counter(struct evsel *counter)

config = strchr(name, '/');
if (config) {
- int len = config - name;
+ int len = (int)(config - name);

if (config[1] == '/') {
/* case: event// */
@@ -967,7 +967,7 @@ static void evsel__uniquify_counter(struct evsel *counter)
config = strchr(name, ':');
if (config) {
/* case: event:.. */
- int len = config - name;
+ int len = (int)(config - name);

ret = asprintf(&new_name, "%s/%.*s/%s", pmu_name, len, name, config + 1);
} else {
@@ -1493,7 +1493,7 @@ static int get_precision(double num)
if (num > 1)
return 0;

- return lround(ceil(-log10(num)));
+ return (int)lround(ceil(-log10(num)));
}

static void print_table(struct perf_stat_config *config,
--
2.49.0.504.g3bcea36a83-goog