From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 0238222A4C9 for ; Thu, 17 Apr 2025 23:08:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744931299; cv=none; b=gt56XgcnHGdEmzeQFZqShUX5/0JpP2r+ISRAQVLeyanG+3cGISCscD+Cz4bVmaknPP3CZRL1rM05E7pa45kLzGstVSeiGO5G3bBLD22sylrVZ+nKREwHPMgHozUR91HwV1LdFy+sn7pwP5Ce8NHui47NyM8RpS5D0/fY7FOWf8Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744931299; c=relaxed/simple; bh=Erynk8+/uixEXt7BeOJQFcm6Q561j11l35I5blMdZvo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=Hf+2dkfpufTCoBnZF942PCBJ8S9DdddY694MwTUueHXXio+NWsVVpxgcvMopMOSzXNX6ybfmMd5EzHWAEfXn3nmdPaUmNxDygu6Sx+2MS8wjJ2Z0n8dlRmKnst2MIRTnugatQGlFkyUGAemraEa9IJxt/miB0wNjoocIkKjIyVw= 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=bf8vRXlF; arc=none smtp.client-ip=209.85.216.74 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="bf8vRXlF" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3032f4eca83so1145158a91.3 for ; Thu, 17 Apr 2025 16:08:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744931297; x=1745536097; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=IB6ehE4CIrRVO0upk/cDtkYMX2P2CRQHtVQu5oompks=; b=bf8vRXlFL73TDTj5aSdIV6q6yBtWW/K7VosyXCUI/tmOkZB8cOw+MNdpJ9ig0/NPRg uB61rd58BSOdrkLwVNnP+4LlhK1wra8PLzPN0rPTAQ3zMEGzgI5/qUodvPeuqKELHJvk J2cfRrOkxyp0VbXia5tvQGa7ewRTSLROg3Pkm1UVTuA+JfMsYTn0TZ8pQJSTjWMEixGC csI4tQJxzP75rEaoZydrLUsdMB4+0GvpALUPZdHlx6eA4xJb7cuk0by/QBSVgE9/hRoH R/Xzoa7I39jtyBCS2hTWr5D4iO6pd/jiulJt2iDuru4o7uX3u30NXJ8xXJDmuARY0zOZ saNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744931297; x=1745536097; 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=IB6ehE4CIrRVO0upk/cDtkYMX2P2CRQHtVQu5oompks=; b=NZrGzryiCYSgbdBPJS2Uf9hHUfm0ay1SmsvMGORnnRHyD+SokPk9iHXymWZr+bUD4I Y2RIq4T4ldjlCZgZ6iJqXdbkaWnwX1ZcfKCuaEgmh/HD/e4ijcFDYXwCDSp7iUe3NjAz hwlg1CaCxbZApf85afVlj4mj81JXA4jVGM1A5OCJ/IpCEZS3KmaZZmnTM6hd83pyxC97 wAdMjrPSs+gt9J7MslwQXY1gaPi320auEc3jp+uDocezZ6HpChgSlXlVsiX9BxyEEpPy +AIjkbuyRoKakCB6aDqxaZMMcNr5AQiBEmruwYRsvVZanAXjkmT9PdRvoFs+IIwNEs6A aeew== X-Forwarded-Encrypted: i=1; AJvYcCXl9brkhVaoILxvYMDdxeIYcQEpdZlOWE0xsY4w8enGP+1IZ2paUj2XcYd7Wu6t6y9aS5Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7JIjWIfq6SzyXOQrAswZZHA3EFSFntv3smaGs+xebcweEMHTm pUYpbd+K1bKsNjGNIxYYqLr5wQ4wXRzca6EWXUJzbzQTwz3ACz6H34RPu7JlJqxouiv1nTMGgYZ Ao4BhyA== X-Google-Smtp-Source: AGHT+IFSvMMY0LC4wHuomXbZ/DawwgteI1xq56I/oeBQmnsf6EEf9nYOa/akkIXnOi8k2ogjeqQdR6Ooifxj X-Received: from pjbee3.prod.google.com ([2002:a17:90a:fc43:b0:308:6685:55e6]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:380b:b0:2f6:d266:f45e with SMTP id 98e67ed59e1d1-3087bb3e794mr1100495a91.2.1744931297373; Thu, 17 Apr 2025 16:08:17 -0700 (PDT) Date: Thu, 17 Apr 2025 16:07:32 -0700 In-Reply-To: <20250417230740.86048-1-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250417230740.86048-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog Message-ID: <20250417230740.86048-12-irogers@google.com> Subject: [PATCH v4 11/19] perf llvm: Disassemble cleanup From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Aditya Gupta , "Steinar H. Gunderson" , Charlie Jenkins , Changbin Du , "Masami Hiramatsu (Google)" , James Clark , Kajol Jain , Athira Rajeev , Li Huafei , Dmitry Vyukov , Andi Kleen , Chaitanya S Prakash , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, llvm@lists.linux.dev, Song Liu , bpf@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Move the 3 LLVM initialization routines to be called in a single init_llvm function that has its own bool to avoid repeated initialization. Reduce the scope of triplet and avoid copying strings for x86. Signed-off-by: Ian Rogers --- tools/perf/util/llvm.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/llvm.c b/tools/perf/util/llvm.c index a0774373f0d6..a28f130c8951 100644 --- a/tools/perf/util/llvm.c +++ b/tools/perf/util/llvm.c @@ -244,6 +244,17 @@ static void perf_LLVMDisasmDispose(LLVMDisasmContextRef context) #endif } +static void init_llvm(void) +{ + static bool init; + + if (!init) { + perf_LLVMInitializeAllTargetInfos(); + perf_LLVMInitializeAllTargetMCs(); + perf_LLVMInitializeAllDisassemblers(); + init = true; + } +} static void free_llvm_inline_frames(struct llvm_a2l_frame *inline_frames, int num_frames) @@ -339,7 +350,6 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym, u64 buf_len; u64 pc; bool is_64bit; - char triplet[64]; char disasm_buf[2048]; size_t disasm_len; struct disasm_line *dl; @@ -352,27 +362,25 @@ int symbol__disassemble_llvm(const char *filename, struct symbol *sym, if (args->options->objdump_path) return -1; - perf_LLVMInitializeAllTargetInfos(); - perf_LLVMInitializeAllTargetMCs(); - perf_LLVMInitializeAllDisassemblers(); - buf = dso__read_symbol(dso, filename, map, sym, &code_buf, &buf_len, &is_64bit); if (buf == NULL) return -1; + init_llvm(); if (arch__is(args->arch, "x86")) { - if (is_64bit) - scnprintf(triplet, sizeof(triplet), "x86_64-pc-linux"); - else - scnprintf(triplet, sizeof(triplet), "i686-pc-linux"); + const char *triplet = is_64bit ? "x86_64-pc-linux" : "i686-pc-linux"; + + disasm = perf_LLVMCreateDisasm(triplet, &storage, /*tag_type=*/0, + /*get_op_info=*/NULL, symbol_lookup_callback); } else { + char triplet[64]; + scnprintf(triplet, sizeof(triplet), "%s-linux-gnu", args->arch->name); + disasm = perf_LLVMCreateDisasm(triplet, &storage, /*tag_type=*/0, + /*get_op_info=*/NULL, symbol_lookup_callback); } - - disasm = perf_LLVMCreateDisasm(triplet, &storage, 0, NULL, - symbol_lookup_callback); if (disasm == NULL) goto err; -- 2.49.0.805.g082f7c87e0-goog