From nobody Fri Sep 5 20:10:01 2025 Received: from mail-pf1-f202.google.com (mail-pf1-f202.google.com [209.85.210.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 141241FB3 for ; Wed, 30 Apr 2025 00:41:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745973711; cv=none; b=Cc2JzwK9ukQT8nncV5e0o+fvsLMTDZ3HM/OcYOu1felLsaOYXsF1I+Y82jUw5tYJuBVOfyrz4N7izEloJ/VPOV2jrHk8X14oK0AH6M6ds6/dIX5KApkWJM4F3EMypy/OwqF8MoNlJ7KnU9ffKTfI13bvRmgX98X+f4A0J8zLfl8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745973711; c=relaxed/simple; bh=YsSJK+JBgrMChothMITffQgSKnUI35D9iUSvUi32+oo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=o6vug3AfG8JKNUwEE2czgG00eEhZmcIDVapTNnNKnZD+Ta1a9AF9bY6hUcwNR5fMSPfB6TejQVR+KFXMztw1zPJQo7fpBnD77vz4ESMzWnX2HgVI+ZWbmmvZoEsnVixdxF1Ic669ecAWQlhIsKKsco8O1qooaSDtGn+ADD2Ffzk= 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=wgwPOYu/; arc=none smtp.client-ip=209.85.210.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="wgwPOYu/" Received: by mail-pf1-f202.google.com with SMTP id d2e1a72fcca58-739515de999so5108551b3a.1 for ; Tue, 29 Apr 2025 17:41:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745973708; x=1746578508; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=9cYhstsrbro2bvVLigEn3Nm+qEHX+oY+qpb1akXLGPE=; b=wgwPOYu/3MCy4dUbuFwXITtgYdI4a2TuJ3lAVd7tiGEyf6CQr9WFUkktb30NiNLulW u9Jn84uOIuLSsyhdwdg5TKu0BG/0pKsNvfuCR31deHlWmq6MpgYT52wOs2cop3GZwRNE NbMLn/RqntV4VcOmbAapbDda5QwezI2nTjoYhTSeZTrfsB0pnLCwVPqYro7W2AUmNpCp rHDle2ZM6gSN1zI/QdgiWfdd+qCc+aZO9yFV0s+OSSEURrVYU89sI7mx1Vlv3xv2hmc1 EzHrOVB7G9XUKnhaZBhUH2j2F+1eBQCScS8NGjRvfqZzeljFvRbMTVYckJchUYcXFuWX iIIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745973708; x=1746578508; h=cc: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=9cYhstsrbro2bvVLigEn3Nm+qEHX+oY+qpb1akXLGPE=; b=GGhI2uOvH218uCapL/YkFnTGR+Zmbj+H3j/sdrez73l6cCqeHLQNwwpWKV88yUZkUh 1+znT+tzjr3np5eJCJJifmsxg0G3hZTe0Oa4kgpOwvUBWtZwdP2oDj1YU+vXiTI0oiVf Q1t6KJyT/tnahbwxszaAOFN3HyC7JeVN1fwCNDVzikEdgxdLRWo7nOM3LXiykwHLfOCa oZoZjAT8oERhLz7sWqABv4d347C4mOuUCDT7wmUb1cuq5RbcYSAt1JH4vOZeU179/o/v RBq/TbUmxPEcHQlJdNsVGO5vM5UWj2vq8DSzQj7QKT2nzS7Pq1lDhwSJQCltRQEp68UC w/pA== X-Forwarded-Encrypted: i=1; AJvYcCWD1YLxD/aRByN6Y1U/grrZ80tNwjV6xxYRWxvYtqIPLIrtk3TyfUyVj/BMwxm4K8EPKQxjYf3v3L1HWSQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyHqgPiecVYf75Uzei7InIxgL0fEAfaP1QnbouSv41bjOMeSi3T HT8bDd8r+lpRRnc3q8DFWC3snHSSND6Wc7w+oPk+UnpHgsoT42GuCF5vOpeZ6N43QC/SUPd+Znq GYNEdKA== X-Google-Smtp-Source: AGHT+IEJsy1CiwSbTZ772fe8tVZ0+2GytQHzJ43kqO3OP7rBH78lCFDM5KKDrcvzIsMB/uaQe+1R5/yWGIpM X-Received: from pfbhw20.prod.google.com ([2002:a05:6a00:8914:b0:736:a70b:53c7]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a00:4b46:b0:736:6151:c6ca with SMTP id d2e1a72fcca58-74038939bc9mr1750119b3a.4.1745973708332; Tue, 29 Apr 2025 17:41:48 -0700 (PDT) Date: Tue, 29 Apr 2025 17:41:27 -0700 In-Reply-To: <20250430004128.474388-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250430004128.474388-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.901.g37484f566f-goog Message-ID: <20250430004128.474388-6-irogers@google.com> Subject: [PATCH v2 5/6] perf test demangle-java: Switch to using dso__demangle_sym From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , Kan Liang , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , "=?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?=" , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , James Clark , Howard Chu , Jiapeng Chong , Ravi Bangoria , "Masami Hiramatsu (Google)" , Stephen Brennan , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, rust-for-linux@vger.kernel.org, llvm@lists.linux.dev, Daniel Xu , Ariel Ben-Yehuda Cc: Ian Rogers Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The use of the demangle-java APIs means we don't detect if a different demangler is used before the Java one for the case that matters to perf. Remove the return types from the demangled names as dso__demangle_sym removes those. Signed-off-by: Ian Rogers --- tools/perf/tests/demangle-java-test.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/perf/tests/demangle-java-test.c b/tools/perf/tests/deman= gle-java-test.c index 93c94408bdc8..ebaf60cdfa99 100644 --- a/tools/perf/tests/demangle-java-test.c +++ b/tools/perf/tests/demangle-java-test.c @@ -3,10 +3,9 @@ #include #include #include -#include "tests.h" -#include "session.h" #include "debug.h" -#include "demangle-java.h" +#include "symbol.h" +#include "tests.h" =20 static int test__demangle_java(struct test_suite *test __maybe_unused, int= subtest __maybe_unused) { @@ -18,19 +17,19 @@ static int test__demangle_java(struct test_suite *test = __maybe_unused, int subte const char *mangled, *demangled; } test_cases[] =3D { { "Ljava/lang/StringLatin1;equals([B[B)Z", - "boolean java.lang.StringLatin1.equals(byte[], byte[])" }, + "java.lang.StringLatin1.equals(byte[], byte[])" }, { "Ljava/util/zip/ZipUtils;CENSIZ([BI)J", - "long java.util.zip.ZipUtils.CENSIZ(byte[], int)" }, + "java.util.zip.ZipUtils.CENSIZ(byte[], int)" }, { "Ljava/util/regex/Pattern$BmpCharProperty;match(Ljava/util/regex/Match= er;ILjava/lang/CharSequence;)Z", - "boolean java.util.regex.Pattern$BmpCharProperty.match(java.util.regex= .Matcher, int, java.lang.CharSequence)" }, + "java.util.regex.Pattern$BmpCharProperty.match(java.util.regex.Matcher= , int, java.lang.CharSequence)" }, { "Ljava/lang/AbstractStringBuilder;appendChars(Ljava/lang/String;II)V", - "void java.lang.AbstractStringBuilder.appendChars(java.lang.String, in= t, int)" }, + "java.lang.AbstractStringBuilder.appendChars(java.lang.String, int, in= t)" }, { "Ljava/lang/Object;()V", - "void java.lang.Object()" }, + "java.lang.Object()" }, }; =20 for (i =3D 0; i < ARRAY_SIZE(test_cases); i++) { - buf =3D java_demangle_sym(test_cases[i].mangled, 0); + buf =3D dso__demangle_sym(/*dso=3D*/NULL, /*kmodule=3D*/0, test_cases[i]= .mangled); if (strcmp(buf, test_cases[i].demangled)) { pr_debug("FAILED: %s: %s !=3D %s\n", test_cases[i].mangled, buf, test_cases[i].demangled); --=20 2.49.0.901.g37484f566f-goog