From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (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 8EC0C1F428F for ; Sat, 23 Aug 2025 00:32:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755909175; cv=none; b=nQ013YZ4fivL8Y9BM3swkzWkLk6zw/wdOjDYvRb9Q8ndIcy/8gD7lcW7mXElf9xLWVytklf/pTtWGyz6/tUi2CQsSJTXNfwElnYi2vJ1Y7nGIAChM+olqmVt0tCa0odnff+74ISnGThV1SAG5uxSZaKfOH50XWWf5o6zeHPTfmA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755909175; c=relaxed/simple; bh=Fd29IYX/xpHAqMQkc8EyODPN9XEe5UxH0NFcKN/ROns=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=YJ0Q9+6lm2lciYZWzd8OPobz5gp4/ezUeSrc2xMaPpuAGT33JtUvzcDd6kqgPfQ9F8WmHYwz7xZh0jy6US4jdl4rw10PjvS+1q14wb4zTTSanquNo7KP2OOboa9IdizJPEztWjRboCb80RcrQ/ssW+wrKfs8vLu/XMsdy5yetpE= 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=H7J1V0/B; arc=none smtp.client-ip=209.85.214.202 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="H7J1V0/B" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-24458027f67so58169235ad.1 for ; Fri, 22 Aug 2025 17:32:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1755909173; x=1756513973; 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=yrnABPnhnjLPpde8R8ZKcXd7aM+wSVwyXCweNa59YQ0=; b=H7J1V0/Bp12ff7OSD+bmvjEZQmhx5i7dN11ZlPldtnznuAVfhfNo6Ga2mJB1hwW3PA nTyiH8BGRtSga+niQoM3c998YG531EoNnrGmVpRUA3901rBH0ns/OuQKi4iX8GRTJeuk xZQBnm1QqE9R0f2cTugLVRmthEWKFD2vNX9LC0t1Pbod1dCGAJnSTd1SXv1ZP7kt1qzD iV5GqQlv73tZCohzsdZoY6+uqE2FMb431i3/ZGiQvNSG/61HYlkEXk327JnFgwqntaPu rSm6owa+veH2t0JUlLHw6Iu6uMtGT0J15SgXy+qTrBRH/hy7xHM+i/N7OwhFARXCQ0/y FXXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755909173; x=1756513973; 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=yrnABPnhnjLPpde8R8ZKcXd7aM+wSVwyXCweNa59YQ0=; b=sZw4wQCaqXFj4YIT1DgLb2++aF2z06EJyWQjikBagz7FOwWBK6OTdH5v47nUGIuAiH HfuNoefUCpOQD6f9RQddAp8AMAX+uiMFymHZ90HcMK4iRlyEVs/Z8wPW7u6yQbQsQh3l fuTnQbkCme5Qwe3Uj2vxCc0yFZtYZIxVIQuD4d/ysocvnsJQUmyOL7IkpMMjwyZ+GZrD ugUVFyDx8Z2fMFVLsGwquFn1MxPk8ycVz20TTXtFPD6F+8w/cck7o1ZgQU4h0xbbYEaJ PHErKExoBIOJSxGq9Y9kAaXxMRJdo0Z65EhYRA5QRoobP5v8Ujd5Vth7T1Me3uh7r3M9 AZjg== X-Forwarded-Encrypted: i=1; AJvYcCVT/PXEV7G0/uyUzM4iijpeTF7glC6/HeKMoxp6vBPYqSd9GRXWtdCm78DblY3uto4t07c=@vger.kernel.org X-Gm-Message-State: AOJu0YyMwk1eDjuNDSS8DypTSRyyGNGKevAxnOG0APf5PWqeqS1D4VTP 1iRgYvlGBZtcQRFhOgTqeDowBdxIE1DFHTF1NmiZz+9TW+buKlmPaxfHA6xJlwnoWv7eUUAw5/b FVRVl1yasIA== X-Google-Smtp-Source: AGHT+IGAPuABV5wfdKDsaJ74CXJ2o+DPzp2QEHBI9R/mhtkFS1teUu4D5SJTofX9u3uOZBKi8+3TSgReDnK6 X-Received: from pljc15.prod.google.com ([2002:a17:903:3b8f:b0:243:31a:f8e2]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:ecc6:b0:243:485:26a5 with SMTP id d9443c01a7336-2462eeb70abmr66268945ad.34.1755909172541; Fri, 22 Aug 2025 17:32:52 -0700 (PDT) Date: Fri, 22 Aug 2025 17:32:07 -0700 In-Reply-To: <20250823003216.733941-1-irogers@google.com> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250823003216.733941-1-irogers@google.com> X-Mailer: git-send-email 2.51.0.rc2.233.g662b1ed5c5-goog Message-ID: <20250823003216.733941-12-irogers@google.com> Subject: [PATCH v5 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.51.0.rc2.233.g662b1ed5c5-goog