From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 91725213E7B for ; Tue, 1 Apr 2025 18:25:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531925; cv=none; b=UUAVxWxVbzxY9oGgj1O/0cyLqYStZ9u3DJ+v3J4Ve0RpqonSQltyNSMOqNPfeyacw9NNRTQrLuTB1TEjjFtndmrbHS22glf9EqEeUjuGnrY38DYRNNXkXg1qPgfBfxz8GlSvcjgzFeSrPrRy2x7Ur/1OK5v+pmpq6KkQiT1ZhuE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743531925; c=relaxed/simple; bh=t4HpEKSieHMVUwdEDlATrqBNHL+SdNbdZvpQJmyECXc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=R/baiCA4AISL9Kkn2Fn751QSfBRzl5/fmhyJb5IOVsAZcttHIBYgoobsiD59LOq6gexEZp+Z40ZpGim5ZKZ8t4Bnc4AuPa81KRA0FXUwnE2s+ttG/WGRKbOEYNp4Lwut1T3IXk3D3w9tPOBqHLC9ZcLlLOPQUrIQkzG56K02fG4= 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=LMLx+iM3; arc=none smtp.client-ip=209.85.214.201 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="LMLx+iM3" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2254bdd4982so149526295ad.1 for ; Tue, 01 Apr 2025 11:25:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1743531923; x=1744136723; 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=823XinDHeG+XrMmCNIY0vqG2lfpNgcB8RbHYxnOFvTw=; b=LMLx+iM3U3B0lhcEpNs1QEgE3lmuFwI9iDYJ3SslVOPBJzM3idYbvoW4su4PKHxehw 6yL4C5r/WJODloJv6vA9loBni9CQN0RLmB/MnWBmyvlz8RrnEslOIbpHWpkePYRM8h3E qTY8toNuwwB/up3g+PBU2Gz7rSJAJu4IcucgX8SzqXuMgNA97r3nYY9dFBraiTy3i6Q9 VQrPrIUKa9DEiA0r6JxI27v2ScArxCMnCHge5nO2ogxuagCLzVmyRmJHlx5pSgRaSNUR IEp+LxIAgcBVMqv8X7TsOGnLo+14zn027rV5VCEh5MzgetefUE0a4MHJZ3QTEcfa/Fsk zjLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743531923; x=1744136723; 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=823XinDHeG+XrMmCNIY0vqG2lfpNgcB8RbHYxnOFvTw=; b=ib6f/K4ngB1vV/jqYbum0G5u0h9Se6HGSVSC4ZUK5uE2iPvubaQm0hK0cY+9RW1Zap uK0OJj9cCTgpaH6mfFxfH4XBUYKawN8LWAsB+cPUkelN6dL3P3J83O64uRieeNwgYcUM VLU50ZizZ7LW36BZzZKaOXBsX3xy42K+xgvlkg2aBGDQeWu5NRFNB6m9mSXerOKamsl5 LzfemhpSUVd9CY8G8mtyIhs/codc32cKRcmENY8WRt7cdmYIGn1W+bpdV2snkkpw9LUX Ms9s2KHUa7ZYAnso86pIxrU8GSB9GwQ0pfPh08Io6mm+wqZzaQmblFNhJOpFikNowYDw u/gw== X-Forwarded-Encrypted: i=1; AJvYcCXW6XTk9cTEzaqyfs63WG8LIrhwPGnvM+n3w9l1ksaa+YS6GrXTagCno2yXNdchftbhfBf3@lists.linux.dev X-Gm-Message-State: AOJu0Yw1IAqEVreTKUiYQuMlx6Hmizn9mhEcaeW7JScFvS+41t8y/8I/ vjRZRFXlZProMJviq3aCfNDHQB3zMKA5Yz60BSgTZiar5gqRbYIEY9bEXC6q+BqjaGPU6i7WNWg FM0DCSA== X-Google-Smtp-Source: AGHT+IHEy9LXSmI9P8wsEmOpH7R+FJ1KOlnv6WssH2meAhH8o5gBcQQpgs70KPc3GeKjqcWiFTxuiUNmdeE4 X-Received: from plgb17.prod.google.com ([2002:a17:902:d511:b0:223:faee:f527]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:da91:b0:220:f795:5f14 with SMTP id d9443c01a7336-2292f974a45mr190872445ad.27.1743531922818; Tue, 01 Apr 2025 11:25:22 -0700 (PDT) Date: Tue, 1 Apr 2025 11:23:21 -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-24-irogers@google.com> Subject: [PATCH v1 23/48] perf annotate: 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-annotate.c | 4 ++-- tools/perf/util/annotate.c | 22 +++++++++++----------- tools/perf/util/disasm.c | 11 ++++++----- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c index 9833c2c82a2f..97943a12b6c9 100644 --- a/tools/perf/builtin-annotate.c +++ b/tools/perf/builtin-annotate.c @@ -157,7 +157,7 @@ static void process_branch_stack(struct branch_stack *bs, struct addr_location * if (!bi) return; - for (i = bs->nr - 1; i >= 0; i--) { + for (i = (int)bs->nr - 1; i >= 0; i--) { /* * XXX filter against symbol */ @@ -880,7 +880,7 @@ int cmd_annotate(int argc, const char **argv) annotate.session = perf_session__new(&data, &annotate.tool); if (IS_ERR(annotate.session)) - return PTR_ERR(annotate.session); + return (int)PTR_ERR(annotate.session); annotate.session->itrace_synth_opts = &itrace_synth_opts; diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 1e59b9e5339d..c582e0ecb86f 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -337,7 +337,8 @@ static int symbol__account_br_cntr(struct annotated_branch *branch, unsigned int base = evsel__leader(evsel)->br_cntr_idx; unsigned int off = offset * evsel->evlist->nr_br_cntr; u64 *branch_br_cntr = branch->br_cntr; - unsigned int i, mask, width; + unsigned int i, width; + u64 mask; if (!br_cntr || !branch_br_cntr) return 0; @@ -360,7 +361,7 @@ static int symbol__account_cycles(u64 addr, u64 start, struct symbol *sym, u64 br_cntr) { struct annotated_branch *branch; - unsigned offset; + unsigned int offset; int ret; if (sym == NULL) @@ -377,7 +378,7 @@ static int symbol__account_cycles(u64 addr, u64 start, struct symbol *sym, if (start >= addr) start = 0; } - offset = addr - sym->start; + offset = (unsigned int)(addr - sym->start); ret = __symbol__account_cycles(branch->cycles_hist, start ? start - sym->start : 0, offset, cycles, @@ -1563,7 +1564,7 @@ static int annotation__max_ins_name(struct annotation *notes) if (al->offset == -1) continue; - len = strlen(disasm_line(al)->ins.name); + len = (int)strlen(disasm_line(al)->ins.name); if (max_name < len) max_name = len; } @@ -2183,20 +2184,20 @@ static int annotation_options__add_disassemblers_str(struct annotation_options * { while (str && *str != '\0') { const char *comma = strchr(str, ','); - int len = comma ? comma - str : (int)strlen(str); + size_t len = comma ? comma - str : strlen(str); bool match = false; for (u8 i = 0; i < ARRAY_SIZE(perf_disassembler__strs); i++) { const char *dis_str = perf_disassembler__strs[i]; - if (len == (int)strlen(dis_str) && !strncmp(str, dis_str, len)) { + if (len == strlen(dis_str) && !strncmp(str, dis_str, len)) { annotation_options__add_disassembler(options, i); match = true; break; } } if (!match) { - pr_err("Invalid disassembler '%.*s'\n", len, str); + pr_err("Invalid disassembler '%.*s'\n", (int)len, str); return -1; } str = comma ? comma + 1 : NULL; @@ -2405,7 +2406,7 @@ static int extract_reg_offset(struct arch *arch, const char *str, str++; } - op_loc->offset = strtol(str, &p, 0); + op_loc->offset = (int)strtol(str, &p, 0); p = strchr(p, arch->objdump.register_char); if (p == NULL) @@ -2515,8 +2516,7 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl, /* FIXME: Handle other segment registers */ if (!strncmp(insn_str, "%gs:", 4)) { op_loc->segment = INSN_SEG_X86_GS; - op_loc->offset = strtol(insn_str + 4, - &p, 0); + op_loc->offset = (int)strtol(insn_str + 4, &p, 0); if (p && p != insn_str + 4) op_loc->imm = true; continue; @@ -2530,7 +2530,7 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl, if (*s == arch->objdump.register_char) op_loc->reg1 = get_dwarf_regnum(s, arch->e_machine, arch->e_flags); else if (*s == arch->objdump.imm_char) { - op_loc->offset = strtol(s + 1, &p, 0); + op_loc->offset = (int)strtol(s + 1, &p, 0); if (p && p != s + 1) op_loc->imm = true; } diff --git a/tools/perf/util/disasm.c b/tools/perf/util/disasm.c index 8f0eb56c6fc6..7e24851a3934 100644 --- a/tools/perf/util/disasm.c +++ b/tools/perf/util/disasm.c @@ -856,7 +856,7 @@ static int ins__cmp(const void *a, const void *b) static void ins__sort(struct arch *arch) { - const int nmemb = arch->nr_instructions; + const size_t nmemb = arch->nr_instructions; qsort(arch->instructions, nmemb, sizeof(struct ins), ins__cmp); } @@ -864,7 +864,7 @@ static void ins__sort(struct arch *arch) static struct ins_ops *__ins__find(struct arch *arch, const char *name, struct disasm_line *dl) { struct ins *ins; - const int nmemb = arch->nr_instructions; + const size_t nmemb = arch->nr_instructions; if (arch__is(arch, "powerpc")) { /* @@ -1263,7 +1263,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil char *build_id_filename; char *build_id_path = NULL; char *pos; - int len; + size_t len; if (dso__symtab_type(dso) == DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore(dso)) @@ -1754,7 +1754,8 @@ static int symbol__disassemble_raw(char *filename, struct symbol *sym, u64 end = map__rip_2objdump(map, sym->end); u64 len = end - start; u64 offset; - int i, count; + int i; + ssize_t count; u8 *buf = NULL; char disasm_buf[512]; struct disasm_line *dl; @@ -1823,7 +1824,7 @@ static int symbol__disassemble_raw(char *filename, struct symbol *sym, out: free(buf); - return count < 0 ? count : 0; + return count < 0 ? (int)count : 0; err: count = -1; -- 2.49.0.504.g3bcea36a83-goog