From nobody Sat Oct 25 16:57:14 2025 Received: from mail-pg1-f201.google.com (mail-pg1-f201.google.com [209.85.215.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 4236B255251 for ; Tue, 29 Apr 2025 18:59:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745953161; cv=none; b=aTsHTlW6gP3oYFa1dYfZUdPD+xh7f50qNvUyqvULODQeO7Tfz2ajPsolHf9up9Uv97GzwW1OW05eRzzzIZTDNsIE6BwZD7rQ38KSRIMFd3Om/VqyzXXy3iQ1iDF3HhBMJsndroyEPgemGLWHmhXZbEuNtbhc5lg+lr/hon+rqXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745953161; c=relaxed/simple; bh=YsSJK+JBgrMChothMITffQgSKnUI35D9iUSvUi32+oo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=EVLEhoTO60uMRSY/oxLnKNtTkhYLQCmfPsPNLXuoiK3yDo7zp8qIUadPJlHBXZIpd6yUiimRrdI3gssOsYuRSwmO5SBVB+Hmn/X0zqEjznrfxEJpdZIzmZWnGr7QjBE3bg5omnruTAjV1p+ecuXmf4o4RMUZcfhPy984fHKEtYY= 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=zqOFKBB3; arc=none smtp.client-ip=209.85.215.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="zqOFKBB3" Received: by mail-pg1-f201.google.com with SMTP id 41be03b00d2f7-b16b35ea4aaso3343980a12.1 for ; Tue, 29 Apr 2025 11:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1745953158; x=1746557958; 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=9cYhstsrbro2bvVLigEn3Nm+qEHX+oY+qpb1akXLGPE=; b=zqOFKBB31doJ2mqyVNcp2B53kL/uMma/BsIzglHEylFgkHtGK09mbWyai9I4UwwXlg 36srNy9b0Ap1BDp31wTcLcbfWW0I4d+lNVscJKYsDVOeOBuyaNBPBF+GSGF91GqHfUYo XGFTr/4IqW6qCF9v2bzYDnJSnET2FA3QclgIxn5lV6nJDCmsPBIo3/nK7tBdkCd89Hg8 BbhDNCx7zW3Zr87tTL0VEOsqp8Zyq4dNkridDaFEUuiS4WKJoccMMLPgDsOzOeDdyv+X dRdfUVtcqpO/PtWhVisB8WqfxeszgiEC5T9IqbWlXipFfgFfnYwFQPILvCh1o0NQGJ+q u0Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745953158; x=1746557958; 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=9cYhstsrbro2bvVLigEn3Nm+qEHX+oY+qpb1akXLGPE=; b=gEZt63iSZF9zdnpzmf9b6Nk6UsP7JnvU7J2tiiYRcuuf7AWu14InOIZ+wwodxLl//6 TZE31mGGfL/AlXKHZxqhj7wfAdrtODPiPf0l+/1e2Mf1gTRQfBpmJpa9+JcWbMg+Eu3O Z6tYhKHXmZi3uirwD07rJ27KTbjwNSPOfOUNcn9zAhYtI7YZGLXaKpkZruvt6Bo//nFq 4Cq0WjNBCUVJjSPFjFDAzVfcferYo687fI7o61P4Cqgjnji1BFtXjGigUhGjl/MgddEk iGaK9/N5EsSdGf2LiZuzS2scoD6E7bGDP0qFpIsIxBmrpV9BlDBV/XwxkwdHUyvcV3n6 iO1g== X-Forwarded-Encrypted: i=1; AJvYcCXGOkRZ9kGUbRWYzSy+nJ9bG/XaKjdOv1SNtkR3e1cs/N3liomRRKkfzl1DabAcAR124kAipXN4UyejS5M=@vger.kernel.org X-Gm-Message-State: AOJu0Yy5bTwd6jOJjHojY55rG1EwTi04389E7+QITqNF8VuG5g5+zUDO sJI5GQ57WlD2MpSQ9X5mG7iw4d75SmeaIf+NLX0NYhcF1OUBUzhApRo8wCoPB9Wdk5UuNCc8Vk/ KRJNSmw== X-Google-Smtp-Source: AGHT+IHLURQcORFZUyCUqj8vJLBwbANzxkfzIIQ8cSeqkoyYPkmTVhIgayBTFK2Pn7ZLE0MZ25TyzB0tZWfm X-Received: from pgac2.prod.google.com ([2002:a05:6a02:2942:b0:af3:30b9:99a4]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:2d07:b0:1f5:6c94:2cd7 with SMTP id adf61e73a8af0-20a899fc1ddmr96977637.42.1745953158400; Tue, 29 Apr 2025 11:59:18 -0700 (PDT) Date: Tue, 29 Apr 2025 11:58:37 -0700 In-Reply-To: <20250429185839.1807005-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: <20250429185839.1807005-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.901.g37484f566f-goog Message-ID: <20250429185839.1807005-6-irogers@google.com> Subject: [PATCH v1 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 , Ian Rogers , 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 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