From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f73.google.com (mail-oa1-f73.google.com [209.85.160.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7AC5F222596 for ; Tue, 1 Apr 2025 18:25:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531929; cv=none; b=XYM2zVvvK7pctFFfUiXAuTVZZvdDQxfKsK7vizDeVPrVv7WgI9W3osgw1jDJfA/cZcMv0nfS6ZblOU8RULMRrK6EcX3tv+UTnExpF8R2RIZ4m5AdJqi/WVRIc6UwA09wwZjcyemCrOH9uJeVmmdJatzt7scBCT+zsGtMGJENlLE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531929; c=relaxed/simple; bh=sjYPBHk2RL4AjpW6aV3agLcV+PsNHpxvrXhMbpH8T90=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=r6C0sbOm23Hriby/2dOSNAswBldfiAPEyheRQla1byvLwL1MailnQDYmT/KayoM/mIEA0uMJaw46cLQxl083Q2eFpioIzp4ibWihLFZr/eua2q6fTSnApgxWQBWy5Kf7BfAYhMd+oIp87WBXScSAsHwrIAaw+zald5WmoBhky00= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=gNKj9grV; arc=none smtp.client-ip=209.85.160.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gNKj9grV" Received: by mail-oa1-f73.google.com with SMTP id 586e51a60fabf-2c2a9abc5b2so1826795fac.1 for ; Tue, 01 Apr 2025 11:25:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743531927; x=1744136727; darn=lists.linux.dev; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=XWBe4FBRBVRgr9j7LcjV776a5KxBaguCaqx3R+ckSTU=; b=gNKj9grVFIMEI552KOXq3xssy9hBhiZ5Mxhr+YUr0DQMcCQVQntoPkRW6DAFpt7uOS SeCbNK6irAy7R9Qb3xkgXFtfs4aYtbXoLCMUMze/qz/pRHXXlv+J+Cj5J86Ilhn7H209 PTY0N3+M/lMXZLwNJaCYdbO3KEKLJtCCJH9lUKlbEC+ysSKQovcXph1ye5x6JajK0U4j NsgbEM6ElGcI3g5H83ChS5uPOUWHMBVQSQ+az6VWKv/VEMadZyF8vvRfsUZeC9XlQhi9 psoAHRwNSUwEQgbJ9BDMEwV00j5G0tSM8aCw5AUUlpjTHf37eb6Z584xSGQ0GF/qUx89 7tlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743531927; x=1744136727; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XWBe4FBRBVRgr9j7LcjV776a5KxBaguCaqx3R+ckSTU=; b=KmsX5Yj9GEGtNTFZ0BuFf6NcCRc+iFuOmR5/J9R41BqrvjAwiwrJrgM7SYg5EtDxRW QKVBADgXXc43V6F8ITiKLoq6+fSeE697+k00aOPwUKbfX43X68S5GGM6x5uBzihRHZT4 PLqNFi5TtxVVNgRl+f5YTbK44/f7ZDmpsbIbWh3e6nt6ZeJ7j90p2H0LITrjNBtVmp1r Vq2xjKys+Nq6wxNKRNn25Q7LcffEof6Ur3AYMYl3dWbfipKcZ9wvrd3LvEpztDI6Ymcw sf6kN+xKCnUPkPX1fXHXypjtD/+fowyATs3Yryk2JyllFsLMLAGMJKzIqLId0fe0QIoK 3Oqw== X-Forwarded-Encrypted: i=1; AJvYcCXsTY1BUYrBbvk6PP79mKbaWapv6XfmEhl4CZePn4A0dCDdR93+oNRq2BjAHB7Ezm0VSV6B@lists.linux.dev X-Gm-Message-State: AOJu0YxFY+lqbnh1oI38+9Ef/tw7UnxN1rGjfDiCQpM5kSiZjv+znf4v Qmp6c0S2DvsB0z66NLI1baik4XmeNpcg/VMcvxiWYlKz8JKJR47eUOOMtKfT/bkFQwtsBIt7cnw WPK/97g== X-Google-Smtp-Source: AGHT+IEJ2D69UYPiouVutAbkRbHVsxjAhnNCDOYzCLqniaLRZ6J5FNujGK2lT5LaK02WEQghfdvYk/R5HGWC X-Received: from oablk13.prod.google.com ([2002:a05:6870:3e0d:b0:29d:f69c:1743]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6871:293:b0:29e:40f8:ad9b with SMTP id 586e51a60fabf-2cbcf513e8dmr8987528fac.14.1743531926639; Tue, 01 Apr 2025 11:25:26 -0700 (PDT) Date: Tue, 1 Apr 2025 11:23:23 -0700 In-Reply-To: <20250401182347.3422199-1-irogers@google.com> Precedence: bulk X-Mailing-List: llvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250401182347.3422199-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog Message-ID: <20250401182347.3422199-26-irogers@google.com> Subject: [PATCH v1 25/48] perf help: Silence -Wshorten-64-to-32 warnings From: Ian Rogers To: Yury Norov , Rasmus Villemoes , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Thomas Gleixner , Darren Hart , Davidlohr Bueso , "=?UTF-8?q?Andr=C3=A9=20Almeida?=" , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Yicong Yang , Jonathan Cameron , Nathan Chancellor , Bill Wendling , Justin Stitt , Josh Poimboeuf , Al Viro , Kyle Meyer , Ben Gainey , Athira Rajeev , Kajol Jain , Aditya Gupta , Eder Zulian , Dapeng Mi , Kuan-Wei Chiu , He Zhe , Dirk Gouders , Brian Geffon , Ravi Bangoria , Howard Chu , Charlie Jenkins , Colin Ian King , Dominique Martinet , Jann Horn , Masahiro Yamada , Arnd Bergmann , Yang Jihong , Dmitry Vyukov , Andi Kleen , Graham Woodward , Ilkka Koskinen , Anshuman Khandual , Zhongqiu Han , Hao Ge , Tengda Wu , Gabriele Monaco , Chun-Tse Shao , Casey Chen , "Dr. David Alan Gilbert" , Li Huafei , "Steinar H. Gunderson" , Levi Yun , Weilin Wang , Thomas Falcon , Thomas Richter , Andrew Kreimer , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Christophe Leroy , Jean-Philippe Romain , Junhao He , "Masami Hiramatsu (Google)" , Xu Yang , Steve Clevenger , Zixian Cai , Stephen Brennan , Yujie Liu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" The clang warning -Wshorten-64-to-32 can be useful to catch inadvertent truncation. In some instances this truncation can lead to changing the sign of a result, for example, truncation to return an int to fit a sort routine. Silence the warning by making the implicit truncation explicit. Signed-off-by: Ian Rogers --- tools/perf/builtin-help.c | 4 ++-- tools/perf/util/help-unknown-cmd.c | 14 ++++++++------ tools/perf/util/levenshtein.c | 18 +++++++++--------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/tools/perf/builtin-help.c b/tools/perf/builtin-help.c index 7be6fb6df595..05151c68191f 100644 --- a/tools/perf/builtin-help.c +++ b/tools/perf/builtin-help.c @@ -301,7 +301,7 @@ static struct cmdnames main_cmds, other_cmds; void list_common_cmds_help(void) { - unsigned int i, longest = 0; + size_t i, longest = 0; for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { if (longest < strlen(common_cmds[i].name)) @@ -310,7 +310,7 @@ void list_common_cmds_help(void) puts(" The most commonly used perf commands are:"); for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { - printf(" %-*s ", longest, common_cmds[i].name); + printf(" %-*s ", (int)longest, common_cmds[i].name); puts(common_cmds[i].help); } } diff --git a/tools/perf/util/help-unknown-cmd.c b/tools/perf/util/help-unknown-cmd.c index a0a46e34f8d1..f0a0b8c13a92 100644 --- a/tools/perf/util/help-unknown-cmd.c +++ b/tools/perf/util/help-unknown-cmd.c @@ -24,14 +24,15 @@ static int levenshtein_compare(const void *p1, const void *p2) { const struct cmdname *const *c1 = p1, *const *c2 = p2; const char *s1 = (*c1)->name, *s2 = (*c2)->name; - int l1 = (*c1)->len; - int l2 = (*c2)->len; - return l1 != l2 ? l1 - l2 : strcmp(s1, s2); + ssize_t l1 = (*c1)->len; + ssize_t l2 = (*c2)->len; + + return l1 != l2 ? (int)(l1 - l2) : (int)strcmp(s1, s2); } static int add_cmd_list(struct cmdnames *cmds, struct cmdnames *old) { - unsigned int i, nr = cmds->cnt + old->cnt; + size_t nr = cmds->cnt + old->cnt; void *tmp; if (nr > cmds->alloc) { @@ -45,7 +46,7 @@ static int add_cmd_list(struct cmdnames *cmds, struct cmdnames *old) return -1; cmds->names = tmp; } - for (i = 0; i < old->cnt; i++) + for (size_t i = 0; i < old->cnt; i++) cmds->names[cmds->cnt++] = old->names[i]; zfree(&old->names); old->cnt = 0; @@ -54,7 +55,8 @@ static int add_cmd_list(struct cmdnames *cmds, struct cmdnames *old) const char *help_unknown_cmd(const char *cmd, struct cmdnames *main_cmds) { - unsigned int i, n = 0, best_similarity = 0; + unsigned int i, n = 0; + size_t best_similarity = 0; struct cmdnames other_cmds; memset(&other_cmds, 0, sizeof(other_cmds)); diff --git a/tools/perf/util/levenshtein.c b/tools/perf/util/levenshtein.c index 6a6712635aa4..f6912b848c4a 100644 --- a/tools/perf/util/levenshtein.c +++ b/tools/perf/util/levenshtein.c @@ -44,19 +44,19 @@ int levenshtein(const char *string1, const char *string2, int w, int s, int a, int d) { - int len1 = strlen(string1), len2 = strlen(string2); + size_t len1 = strlen(string1), len2 = strlen(string2); int *row0 = malloc(sizeof(int) * (len2 + 1)); int *row1 = malloc(sizeof(int) * (len2 + 1)); int *row2 = malloc(sizeof(int) * (len2 + 1)); - int i, j; + int ret; - for (j = 0; j <= len2; j++) - row1[j] = j * a; - for (i = 0; i < len1; i++) { + for (size_t j = 0; j <= len2; j++) + row1[j] = (int)j * a; + for (size_t i = 0; i < len1; i++) { int *dummy; - row2[0] = (i + 1) * d; - for (j = 0; j < len2; j++) { + row2[0] = ((int)i + 1) * d; + for (size_t j = 0; j < len2; j++) { /* substitution */ row2[j + 1] = row1[j] + s * (string1[i] != string2[j]); /* swap */ @@ -78,10 +78,10 @@ int levenshtein(const char *string1, const char *string2, row2 = dummy; } - i = row1[len2]; + ret = row1[len2]; free(row0); free(row1); free(row2); - return i; + return ret; } -- 2.49.0.504.g3bcea36a83-goog