From patchwork Thu Aug 22 13:24:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 13773442 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9F9BBC52D7C for ; Thu, 22 Aug 2024 13:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Il04epHFd9BrsJtGAU8mELFSezcE7nnWBSPUsdUkN8I=; b=Q5tmf2sB7GxQxk38Rp2DIxnWDG EAm03NIPO7WBeQoVyRq6mhe+wh7kKTmW/PMLTaMXm7IQXzpNl22FfPINOYEFXXwvoiGiy+dO3Ov5M FUsPe+Gm8rzYfFuMJKQRC7Q1OXeaKDVun0a74s/vFpnbo8PMeVsLNZ4jI+/30PO5ZlZ+PHvoZ9J0S Nc/gho1bv1Ctu1aizSmrDxsXTB4xsM+PX7cP+4GuKyH2GOGcbyhjF3nL/isX1Dom3ZAKzGh6exXxx 5y7bnzYR2fSCkP9iUyDlihPXDpsnvMF5uaOHf7sySqhmJM5FNJTI5uQzSVDpYy2qBku3NW2w/hXbG /HvCbYjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sh7wN-0000000Cxu7-0puc; Thu, 22 Aug 2024 13:33:27 +0000 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sh7qq-0000000Cw9W-3Jdt for linux-arm-kernel@lists.infradead.org; Thu, 22 Aug 2024 13:27:47 +0000 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-5320d8155b4so929465e87.3 for ; Thu, 22 Aug 2024 06:27:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724333262; x=1724938062; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Il04epHFd9BrsJtGAU8mELFSezcE7nnWBSPUsdUkN8I=; b=XYatUTKjVbsD3T1tEiWm4CEwIHr6Ws6GR4XcO3o0yD3SWl8tr+MxGlg4C5KjHePaXL HXNPYFVYtWoWN+CnG4PN8SB31bJFjUeg5pZqQ8LzI+IpBErj5bEWWv8KqMC9Tl4J2OLZ 5Eil+bWThYv/xcKBq9oYHK2dBvIwZyxjdXMEnMDexoZlkLSp3NY5xmmzWRJobrZl8bBV O+nAiJUo7NymGMKD/dBLSheEHw5CbQ/3FlcnQqzRnNjQic4NLAofd2F0u8jBm+u8PQXm BJ7LJqnp7RMV2Kp4Lx0E63rNOoHwZXJE/l/2d1XOnY1GXzYV1Mpo16rXvhQioSaGnDLU 3Xag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724333262; x=1724938062; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Il04epHFd9BrsJtGAU8mELFSezcE7nnWBSPUsdUkN8I=; b=wq+v5avoT8pV2XhJfpwB5+qkJAAMW1jOMiMHyv+7NXbcDPT1xu3wuzHne1jThH3gym VmjoTrbe4mRgSgM+TnBZ0zUC5JB6eU48m9pG2Phm2QujUq1CObaUgEP09a42en4mo1qL odk0dC5jllE444Lpc//f6btoyHRzlnZLKFzoNnmg6m3B9GzKeGNPa2JMGfNyohbvGeRR 4zPsKN4oddn2EFOSjnBmQo2DwcMd9Wp67CpXKl47jS+e/plNqMWZg/JAcFgHqVVnM4/h fya+4tvmRW5f/HDCkB4cwWafj1aQ1ShhIqY+67m47KUQyVg6zV0Jgq3CNTPfjeUc8+Y4 ytug== X-Forwarded-Encrypted: i=1; AJvYcCXZTlA6Pc4lQUIaf/zmGAgtM/b3qcKBvG6JvTxRIt7W6SL3CQUuxZysb80U+ANdYhZ/KLuV8vjFSsbt90h7v4pi@lists.infradead.org X-Gm-Message-State: AOJu0YybG1ybvtfDjlKbHwYE4eQKQuxTaBmKV/ipTriYntcHdQ8yDbBT MXNrIB+KNbUokH+gQ6139q9ydfLfozRYW1lBmDHV6zec2t7WjPWOLFAnfJsLf5Y= X-Google-Smtp-Source: AGHT+IFQvEOEE4/tecvA3hEXgG5+UjX0Fvn05z8om5CzNVnFbMlGxCn50hrf7STgDD8q/iZIYc2A8A== X-Received: by 2002:a05:6512:3daa:b0:52d:6663:5cbe with SMTP id 2adb3069b0e04-5334fae8615mr1200865e87.12.1724333261782; Thu, 22 Aug 2024 06:27:41 -0700 (PDT) Received: from localhost.localdomain ([89.47.253.130]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a868f4365a9sm119497766b.125.2024.08.22.06.27.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2024 06:27:41 -0700 (PDT) From: James Clark To: irogers@google.com, linux-perf-users@vger.kernel.org Cc: James Clark , John Garry , Will Deacon , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , "Liang, Kan" , Weilin Wang , Dominique Martinet , Yang Jihong , Athira Rajeev , Colin Ian King , Ze Gao , Sun Haiyong , Jing Zhang , Yicong Yang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 7/7] perf test: Add a test for default perf stat command Date: Thu, 22 Aug 2024 14:24:51 +0100 Message-Id: <20240822132506.1468090-8-james.clark@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240822132506.1468090-1-james.clark@linaro.org> References: <20240822132506.1468090-1-james.clark@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240822_062745_038660_EDFA03E3 X-CRM114-Status: GOOD ( 14.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Test that one cycles event is opened for each core PMU when "perf stat" is run without arguments. The event line can either be output as "pmu/cycles/" or just "cycles" if there is only one PMU. Include 2 spaces for padding in the one PMU case to avoid matching when the word cycles is included in metric descriptions. Signed-off-by: James Clark --- tools/perf/tests/shell/stat.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools/perf/tests/shell/stat.sh b/tools/perf/tests/shell/stat.sh index 525d0c44fdc6..24ace1de71cc 100755 --- a/tools/perf/tests/shell/stat.sh +++ b/tools/perf/tests/shell/stat.sh @@ -148,6 +148,26 @@ test_cputype() { echo "cputype test [Success]" } +test_hybrid() { + # Test the default stat command on hybrid devices opens one cycles event for + # each CPU type. + echo "hybrid test" + + # Count the number of core PMUs + pmus=$(ls /sys/bus/event_source/devices/*/cpus 2>/dev/null | wc -l) + + # Run default Perf stat + cycles_events=$(perf stat -- true 2>&1 | grep -E "/cycles/| cycles " | wc -l) + + if [ "$pmus" -ne "$cycles_events" ] + then + echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" + err=1 + return + fi + echo "hybrid test [Success]" +} + test_default_stat test_stat_record_report test_stat_record_script @@ -155,4 +175,5 @@ test_stat_repeat_weak_groups test_topdown_groups test_topdown_weak_groups test_cputype +test_hybrid exit $err