Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 1C6CB1AAE33 for ; Wed, 11 Dec 2024 06:10:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733897417; cv=none; b=c0jrM0gnJf1Apnv0Rig+P8aEq5c/8EXrXfyduehKTnKpmR3ST318DvOF3gSvUFpkCUyU8gTFLZ0jTu5kRMtTapO0DtpZyTayLpS/B4wtZHLq+52+ep5C+dNPHMZVleGyBVg4ORZjfQpoT1iFi7fmVALyzkmR1E95JFz+nBTnxQc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733897417; c=relaxed/simple; bh=siB3POHAJhPhtOCnGjqwdvgxAy76GqJ8cKANN3vULWQ=; h=Date:Message-Id:Mime-Version:Subject:From:To:Content-Type; b=fQPxE+KzHlQADCPpmXGmotWiJG+67cvtpEWyW0+lIrKizmVshPs/klMXd+G9EC2p3xV6kDaJ5Ge+P6aN7c9WFWT63eefGfaSfq6Ofr5VTqAqOKs2qCnyeWhdunZ9HNPESFV6Z/G2IT3h/tGQ/LKtSrBLmG5w8nQoQl2GymOdsWU= 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=QVrTkFho; arc=none smtp.client-ip=209.85.128.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="QVrTkFho" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6eff377fdc1so61726837b3.2 for ; Tue, 10 Dec 2024 22:10:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733897415; x=1734502215; darn=vger.kernel.org; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=wicU6seNwvDcjZ41ouZnUov6zgQAVi5FudB1RU4tYYA=; b=QVrTkFhoZycyD2umTXBe6RZfF5FskldbvYw7ZD4i5wTC+2zpMHfWTTM0J6r6ZAUCsu QNxIvOaxd1TsW6w/F30pmbWA5Ry75pxDRtsNlVrENoxSnwfDbdWulSsoYZkXx9M/AZEI nkbvH5gfI/I7Af9o7uY7w29OVZzKushzYZmdWHg/29WNSsXT//1ZHB1M1oL9z2t3tbde v30WeW3XqGpGk3XjH106CMlm0VIgfuoX7HGB00j8CSK813+UWM8Jp+QT3wIMK1VHizpV fsBZM90/W2Mjk7le0uqBjmtb+bEod6tLXIzPtRhNeG5KFgMH6w997I6fpIdDJ7QZei4u U5Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733897415; x=1734502215; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wicU6seNwvDcjZ41ouZnUov6zgQAVi5FudB1RU4tYYA=; b=jf1jO4KH2bQmvMeq3jWtuUM+emc0Yjc7s8m3sgNyCWbVbOGyXz5DKJ29oI/InQr2Pf ugRbKMMzFsIX3CzcLgnRBMeKze1dculKDA/lJWy8ik96TT//1vf79iAgCbHf7a08m0Oz Tk56IMp8hly8PTwfQGjvuYp2J89nvtmT2y4KQCHimIs0Wf4wAXFYUenVP2gTQXqks5Y+ 4mTeZ2/ZuxLKpAGtkw/BIqlyDt+IaZd+0kAMatk7lXExj4nBFpKPpWQD29fbZ2qSgmCo kobQAf0Q1GACa5oEkYL9d/emGEfr1bXbGKGqptYRfrqsJTp2ZlSzADQaqPW1i9pmS2Pw aqqg== X-Forwarded-Encrypted: i=1; AJvYcCXC/3ruxVNBN2F6xkO8Hil5eiOkVj/d4qJLbJo524GSqF8FCFZJM78yxu0H+oDoB0JZNXpK2FvVMrHJ8kvAWqL4@vger.kernel.org X-Gm-Message-State: AOJu0YyUo4EIauE7+1OXQQGvZKTDyKxwNBsFCYkGHw6j9moEIDSffT3o 1lyV+MKOz8IoKiP2jA/gb/fsXnoGdUf+GQ4EuX9Wq4syKWVGLS1L1iyP2+ra3/4GbX4qwuZC7NT QEnNofQ== X-Google-Smtp-Source: AGHT+IHvfM85i3MUlGtDrNiEWrC9LTxIGDdad30vwdTb3uWTqyTehgqfaWUncQPRrSdhWBXVu6QEto8fhrCR X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:bbed:4ddc:59bf:36b8]) (user=irogers job=sendgmr) by 2002:a81:c748:0:b0:6e3:d670:f603 with SMTP id 00721157ae682-6f1480362c2mr62147b3.3.1733897415035; Tue, 10 Dec 2024 22:10:15 -0800 (PST) Date: Tue, 10 Dec 2024 22:10:10 -0800 Message-Id: <20241211061010.806868-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Subject: [PATCH v1] perf test stat: Avoid hybrid assumption when virtualized 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 , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" The cycles event will fallback to task-clock in the hybrid test when running virtualized. Change the test to not fail for this. Fixes: a6b8bb2addd0 ("perf test: Add a test for default perf stat command") Signed-off-by: Ian Rogers --- tools/perf/tests/shell/stat.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/shell/stat.sh b/tools/perf/tests/shell/stat.sh index 5a2ca2bcf94d..60cea07350e1 100755 --- a/tools/perf/tests/shell/stat.sh +++ b/tools/perf/tests/shell/stat.sh @@ -165,9 +165,13 @@ test_hybrid() { if [ "$pmus" -ne "$cycles_events" ] then - echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" - err=1 - return + # If virtualized the software task-clock event will be used. + if ! perf stat -- true 2>&1 | grep -q "task-clock" + then + echo "hybrid test [Found $pmus PMUs but $cycles_events cycles events. Failed]" + err=1 + return + fi fi echo "hybrid test [Success]" } -- 2.47.1.613.gc27f4b7a9f-goog