Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\))
Subject: Re: [PATCH] perf test: Fix skipping branch stack sampling test
From:   Athira Rajeev <atrajeev@linux.vnet.ibm.com>
In-Reply-To: <2265e166-da9c-f540-a108-0d0b133f7da9@arm.com>
Date:   Wed, 2 Nov 2022 12:21:11 +0530
Cc:     LKML <linux-kernel@vger.kernel.org>, Anshuman.Khandual@arm.com,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Namhyung Kim <namhyung@kernel.org>,
        Kajol Jain <kjain@linux.ibm.com>,
        linux-perf-users@vger.kernel.org, acme@kernel.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <F79AE69A-4D87-4F4E-A3FD-EF06A6E12839@linux.vnet.ibm.com>
References: <20221028121913.745307-1-james.clark@arm.com>
 <2265e166-da9c-f540-a108-0d0b133f7da9@arm.com>
To:     James Clark <james.clark@arm.com>
Precedence: bulk


> On 28-Oct-2022, at 5:52 PM, James Clark <james.clark@arm.com> wrote:
>=20
>=20
>=20
> On 28/10/2022 13:19, James Clark wrote:
>> Commit f4a2aade6809 ("perf tests powerpc: Fix branch stack sampling =
test
>> to include sanity check for branch filter") added a skip if certain
>> branch options aren't available. But the change added both -b
>> (--branch-any) and --branch-filter options at the same time, which =
will
>> always result in a failure on any platform because the arguments =
can't
>> be used together.
>>=20
>> Fix this by removing -b (--branch-any) and leaving --branch-filter =
which
>> already specifies 'any'. Also add warning messages to the test and =
perf
>> tool.
>>=20
>=20
> Hi Athira,
>=20
> Are you able to check if this still skips for you on PowerPC with this
> new change?
>=20

Hi James,

Sorry for the late response. I was out on vacation couple of days.

I tested with the new change and verified it skips on powerpc.

Tested-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>

Thanks
Athira
> Thanks
> James
>=20
>> Output on x86 before this fix:
>>=20
>>   $ sudo ./perf test branch
>>   108: Check branch stack sampling         : Skip
>>=20
>> After:
>>=20
>>   $ sudo ./perf test branch
>>   108: Check branch stack sampling         : Ok
>>=20
>> Fixes: f4a2aade6809 ("perf tests powerpc: Fix branch stack sampling =
test to include sanity check for branch filter")
>> Signed-off-by: James Clark <james.clark@arm.com>
>> ---
>> tools/perf/tests/shell/test_brstack.sh | 5 ++++-
>> tools/perf/util/parse-branch-options.c | 4 +++-
>> 2 files changed, 7 insertions(+), 2 deletions(-)
>>=20
>> diff --git a/tools/perf/tests/shell/test_brstack.sh =
b/tools/perf/tests/shell/test_brstack.sh
>> index ec801cffae6b..d7ff5c4b4da4 100755
>> --- a/tools/perf/tests/shell/test_brstack.sh
>> +++ b/tools/perf/tests/shell/test_brstack.sh
>> @@ -13,7 +13,10 @@ fi
>>=20
>> # skip the test if the hardware doesn't support branch stack sampling
>> # and if the architecture doesn't support filter types: =
any,save_type,u
>> -perf record -b -o- -B --branch-filter any,save_type,u true > =
/dev/null 2>&1 || exit 2
>> +if ! perf record -o- --no-buildid --branch-filter any,save_type,u -- =
true > /dev/null 2>&1 ; then
>> +	echo "skip: system doesn't support filter types: =
any,save_type,u"
>> +	exit 2
>> +fi
>>=20
>> TMPDIR=3D$(mktemp -d /tmp/__perf_test.program.XXXXX)
>>=20
>> diff --git a/tools/perf/util/parse-branch-options.c =
b/tools/perf/util/parse-branch-options.c
>> index 00588b9db474..31faf2bb49ff 100644
>> --- a/tools/perf/util/parse-branch-options.c
>> +++ b/tools/perf/util/parse-branch-options.c
>> @@ -102,8 +102,10 @@ parse_branch_stack(const struct option *opt, =
const char *str, int unset)
>> 	/*
>> 	 * cannot set it twice, -b + --branch-filter for instance
>> 	 */
>> -	if (*mode)
>> +	if (*mode) {
>> +		pr_err("Error: Can't use --branch-any (-b) with =
--branch-filter (-j).\n");
>> 		return -1;
>> +	}
>>=20
>> 	return parse_branch_str(str, mode);
>> }