From nobody Fri Dec 19 20:53:35 2025 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.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 5572F3FBB3 for ; Wed, 8 Jan 2025 06:36:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736318196; cv=none; b=YVLn/lNlcL9S6c83mldN+5+M6pqpyfDIFol04+LgBS0YGGMGNH6GTofNyVhjTYHcwKEpUzK4UsDvSsSu/y/I2eX9DRLAfuu57+bz1OTZ3yIhov9h1rYgA05jrT8E+1A5HxCF8a2wh3XCTo+p+MRxVhFTdIDz5pasl/rftPmSkMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736318196; c=relaxed/simple; bh=joR2bfCkiFkIR/cQ3pkhDlcOI5PKPk0dukww3i43dvM=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=LMvDdZBslAecGNKbQzRb6mqe43IbEVs0dq0PxaJiXS6BbL5EmRIOqqba8QAYMEEJq5FPt+cQKsWQzIO/xdiKJyQDh+oSxqhPg2tsKikwKXHjmPHQak6V7ePWj5ozoXbLKaCMCSw4vyby7iG0wCBOeEPhmGmsw6w+eiRohrBDdvw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--dvyukov.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=eZMS0qvp; arc=none smtp.client-ip=209.85.218.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--dvyukov.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="eZMS0qvp" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-aa689b88293so881417666b.3 for ; Tue, 07 Jan 2025 22:36:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736318193; x=1736922993; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=FCJ2UMjBJDouTDQGxmyKJvRG0RSKjsidIHUiDgSX0gw=; b=eZMS0qvpVzUWsqfYkI7OCMIE8++Os7CFlaMyTJXO2QaFmuOEArvOBjAxlIWCSJGTLV TRdhCgsx5m9VCvlixJMYSsuQDnVMJ/jiUZ7e754zOvkx6RYLm6anOQAIZ3SMCvDerO5D /D0QxjPrEvA5UHDvV3pu1wjtzqbskI240omkI1A455bTZ+4XBPDw5IKI5wmxtHIbUnz+ zcsjFxBO5237Ggg4Ulf1CAVPDSEHqcEjMt1a7BbdmU3THX4qiX4/2PCd/OsC8aFGRd5G UNxMylgmIjZtByHiq0qlLTBUCK+t1JKfefMBrxLLo2odwwlHZu3vjL+h5dzks5Ua0NUj Co4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736318193; x=1736922993; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=FCJ2UMjBJDouTDQGxmyKJvRG0RSKjsidIHUiDgSX0gw=; b=iTQvPg+Z8Lul40/+6Qlslq1dNme154oDYDzY+NdCtnUTswSp0xn545WxRHjbcTx0/p 6NlQFau8WGGKVLdqZdSS6D/+qOChnb5Gs22x+AeBHwn1GzIT1ztZgGJwaDGhMfTtkpcj OuYEVy1ueOuXEa+r7o9pmS/lDZewpK+1soQVZmCm8WMaKdgfGlstfv0lfEgpJEFRyubf b58H1vnJZT0tAiE67gY7YfDhfefD7uIJGsXMMa55xm39beQtFKOgEgaB0ptlx/7uqBN/ JBcwaSP6/qzLJVe7zbu1ELuMOdMGpI9nlSuC4IRKSRrvPPwd6Jm0fbwBwHMgiRD9xyPG BOZw== X-Forwarded-Encrypted: i=1; AJvYcCW3RNwjHb3+gnY5elIkts/9Nk0BeUhsGKusasd8K4jy4HuffRjsKPxUhewaJGpWm7vQCFUq6ivs5VVm/a4=@vger.kernel.org X-Gm-Message-State: AOJu0YzIiVCt1AdTd6iGrI0MTtjs6BJFrL+LLuv7ZiOuX7cW7Pu43EPo SXRaW3CqxA+px3PK/f+v2hl9NZv5wzkTHtu8Mdaz9RKkn1gUyQj15jtJwDH4kZfAaDTKOIcdvUH YTnObtw== X-Google-Smtp-Source: AGHT+IHRwT7vWAR92zilxKJgVwsV/pdHibuzlyvajEZ8eXKrrZwzVdST1OFEj7QWovZrgADh1g06bC36o107 X-Received: from ejcvx5.prod.google.com ([2002:a17:907:a785:b0:aa6:5be3:c0cf]) (user=dvyukov job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:d87:b0:aa6:519c:ef9a with SMTP id a640c23a62f3a-ab2ab70ac8bmr146023066b.53.1736318192899; Tue, 07 Jan 2025 22:36:32 -0800 (PST) Date: Wed, 8 Jan 2025 07:36:23 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20250108063628.215577-1-dvyukov@google.com> Subject: [PATCH] perf report: Fix input reload/switch functionality From: Dmitry Vyukov To: namhyung@kernel.org, irogers@google.com Cc: Dmitry Vyukov , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently the code checks that there is no "ipc" in the sort order and add an ipc string. This will always error out on the second pass after input reload/switch, since the sort order already contains "ipc". Do the ipc check/fixup only on the first pass. Signed-off-by: Dmitry Vyukov Fixes: ec6ae74fe8f0 ("perf report: Display average IPC and IPC coverage per= symbol") Cc: Namhyung Kim Cc: Ian Rogers Cc: linux-perf-users@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- tools/perf/builtin-report.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 048c91960ba91..42d7dfdf07d9b 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -1721,22 +1721,24 @@ int cmd_report(int argc, const char **argv) symbol_conf.annotate_data_sample =3D true; } =20 - if (sort_order && strstr(sort_order, "ipc")) { - parse_options_usage(report_usage, options, "s", 1); - goto error; - } - - if (sort_order && strstr(sort_order, "symbol")) { - if (sort__mode =3D=3D SORT_MODE__BRANCH) { - snprintf(sort_tmp, sizeof(sort_tmp), "%s,%s", - sort_order, "ipc_lbr"); - report.symbol_ipc =3D true; - } else { - snprintf(sort_tmp, sizeof(sort_tmp), "%s,%s", - sort_order, "ipc_null"); + if (last_key !=3D K_SWITCH_INPUT_DATA) { + if (sort_order && strstr(sort_order, "ipc")) { + parse_options_usage(report_usage, options, "s", 1); + goto error; } =20 - sort_order =3D sort_tmp; + if (sort_order && strstr(sort_order, "symbol")) { + if (sort__mode =3D=3D SORT_MODE__BRANCH) { + snprintf(sort_tmp, sizeof(sort_tmp), "%s,%s", + sort_order, "ipc_lbr"); + report.symbol_ipc =3D true; + } else { + snprintf(sort_tmp, sizeof(sort_tmp), "%s,%s", + sort_order, "ipc_null"); + } + + sort_order =3D sort_tmp; + } } =20 if ((last_key !=3D K_SWITCH_INPUT_DATA && last_key !=3D K_RELOAD) && base-commit: 09a0fa92e5b45e99cf435b2fbf5ebcf889cf8780 --=20 2.47.1.613.gc27f4b7a9f-goog