2020-11-10 06:37:44

by Leo Yan

Subject: [PATCH RESEND 1/2] perf test: Fix a typo in cs-etm testing

Fix a typo: s/devce_name/device_name.

Fixes: fe0aed19b266 ("perf test: Introduce script for Arm CoreSight testing")
Signed-off-by: Leo Yan <[email protected]>
---

Resend patches for adding "Fixes" tags.

tools/perf/tests/shell/test_arm_coresight.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh
index 8d84fdbed6a6..59d847d4981d 100755
--- a/tools/perf/tests/shell/test_arm_coresight.sh
+++ b/tools/perf/tests/shell/test_arm_coresight.sh
@@ -105,7 +105,7 @@ arm_cs_iterate_devices() {
# `> device_name = 'tmc_etf0'
device_name=$(basename $path)

- if is_device_sink $path $devce_name; then
+ if is_device_sink $path $device_name; then

record_touch_file $device_name $2 &&
perf_script_branch_samples touch &&
--
2.17.1

2020-11-10 06:37:51

by Leo Yan

Subject: [PATCH RESEND 2/2] perf test: Update branch sample parttern for cs-etm

Since the commit 943b69ac1884 ("perf parse-events: Set exclude_guest=1
for user-space counting"), 'exclude_guest=1' is set for user-space
counting; and the branch sample's modifier has been altered, the sample
event name has been changed from "branches:u:" to "branches:uH:", which
gives out info for "user-space and host counting".

But the cs-etm testing's regular expression cannot match the updated
branch sample event and leads to test failure.

This patch updates the branch sample parttern by using a more flexible
expression '.*' to match branch sample's modifiers, so that allows the
testing to work as expected.

Fixes: 943b69ac1884 ("perf parse-events: Set exclude_guest=1 for user-space counting")
Signed-off-by: Leo Yan <[email protected]>
---
tools/perf/tests/shell/test_arm_coresight.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh
index 59d847d4981d..18fde2f179cd 100755
--- a/tools/perf/tests/shell/test_arm_coresight.sh
+++ b/tools/perf/tests/shell/test_arm_coresight.sh
@@ -44,7 +44,7 @@ perf_script_branch_samples() {
# touch 6512 1 branches:u: ffffb22082e0 strcmp+0xa0 (/lib/aarch64-linux-gnu/ld-2.27.so)
# touch 6512 1 branches:u: ffffb2208320 strcmp+0xe0 (/lib/aarch64-linux-gnu/ld-2.27.so)
perf script -F,-time -i ${perfdata} | \
- egrep " +$1 +[0-9]+ .* +branches:([u|k]:)? +"
+ egrep " +$1 +[0-9]+ .* +branches:(.*:)? +"
}

perf_report_branch_samples() {
--
2.17.1

2020-11-10 18:08:23

by Mathieu Poirier

Subject: Re: [PATCH RESEND 1/2] perf test: Fix a typo in cs-etm testing

On Tue, Nov 10, 2020 at 02:34:16PM +0800, Leo Yan wrote:
> Fix a typo: s/devce_name/device_name.
>
> Fixes: fe0aed19b266 ("perf test: Introduce script for Arm CoreSight testing")
> Signed-off-by: Leo Yan <[email protected]>
> ---
>

I would CC stable too.

Reviewed-by: Mathieu Poirier <[email protected]>

> Resend patches for adding "Fixes" tags.
>
> tools/perf/tests/shell/test_arm_coresight.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh
> index 8d84fdbed6a6..59d847d4981d 100755
> --- a/tools/perf/tests/shell/test_arm_coresight.sh
> +++ b/tools/perf/tests/shell/test_arm_coresight.sh
> @@ -105,7 +105,7 @@ arm_cs_iterate_devices() {
> # `> device_name = 'tmc_etf0'
> device_name=$(basename $path)
>
> - if is_device_sink $path $devce_name; then
> + if is_device_sink $path $device_name; then
>
> record_touch_file $device_name $2 &&
> perf_script_branch_samples touch &&
> --
> 2.17.1
>

2020-11-10 18:11:18

by Mathieu Poirier

Subject: Re: [PATCH RESEND 2/2] perf test: Update branch sample parttern for cs-etm

On Tue, Nov 10, 2020 at 02:34:17PM +0800, Leo Yan wrote:
> Since the commit 943b69ac1884 ("perf parse-events: Set exclude_guest=1
> for user-space counting"), 'exclude_guest=1' is set for user-space
> counting; and the branch sample's modifier has been altered, the sample
> event name has been changed from "branches:u:" to "branches:uH:", which
> gives out info for "user-space and host counting".
>
> But the cs-etm testing's regular expression cannot match the updated
> branch sample event and leads to test failure.
>
> This patch updates the branch sample parttern by using a more flexible

s/parttern/pattern

> expression '.*' to match branch sample's modifiers, so that allows the
> testing to work as expected.
>
> Fixes: 943b69ac1884 ("perf parse-events: Set exclude_guest=1 for user-space counting")
> Signed-off-by: Leo Yan <[email protected]>
> ---
> tools/perf/tests/shell/test_arm_coresight.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Here too I would CC stable. With the above:

Reviewed-by: Mathieu Poirier <[email protected]>

>
> diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh
> index 59d847d4981d..18fde2f179cd 100755
> --- a/tools/perf/tests/shell/test_arm_coresight.sh
> +++ b/tools/perf/tests/shell/test_arm_coresight.sh
> @@ -44,7 +44,7 @@ perf_script_branch_samples() {
> # touch 6512 1 branches:u: ffffb22082e0 strcmp+0xa0 (/lib/aarch64-linux-gnu/ld-2.27.so)
> # touch 6512 1 branches:u: ffffb2208320 strcmp+0xe0 (/lib/aarch64-linux-gnu/ld-2.27.so)
> perf script -F,-time -i ${perfdata} | \
> - egrep " +$1 +[0-9]+ .* +branches:([u|k]:)? +"
> + egrep " +$1 +[0-9]+ .* +branches:(.*:)? +"
> }
>
> perf_report_branch_samples() {
> --
> 2.17.1
>

2020-11-10 18:22:36

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH RESEND 2/2] perf test: Update branch sample parttern for cs-etm

Em Tue, Nov 10, 2020 at 11:08:29AM -0700, Mathieu Poirier escreveu:
> On Tue, Nov 10, 2020 at 02:34:17PM +0800, Leo Yan wrote:
> > Since the commit 943b69ac1884 ("perf parse-events: Set exclude_guest=1
> > for user-space counting"), 'exclude_guest=1' is set for user-space
> > counting; and the branch sample's modifier has been altered, the sample
> > event name has been changed from "branches:u:" to "branches:uH:", which
> > gives out info for "user-space and host counting".
> >
> > But the cs-etm testing's regular expression cannot match the updated
> > branch sample event and leads to test failure.
> >
> > This patch updates the branch sample parttern by using a more flexible
>
> s/parttern/pattern

I'll fix it and add stable@ to the CC list, thanks

> > expression '.*' to match branch sample's modifiers, so that allows the
> > testing to work as expected.
> >
> > Fixes: 943b69ac1884 ("perf parse-events: Set exclude_guest=1 for user-space counting")
> > Signed-off-by: Leo Yan <[email protected]>
> > ---
> > tools/perf/tests/shell/test_arm_coresight.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Here too I would CC stable. With the above:
>
> Reviewed-by: Mathieu Poirier <[email protected]>
>
> >
> > diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh
> > index 59d847d4981d..18fde2f179cd 100755
> > --- a/tools/perf/tests/shell/test_arm_coresight.sh
> > +++ b/tools/perf/tests/shell/test_arm_coresight.sh
> > @@ -44,7 +44,7 @@ perf_script_branch_samples() {
> > # touch 6512 1 branches:u: ffffb22082e0 strcmp+0xa0 (/lib/aarch64-linux-gnu/ld-2.27.so)
> > # touch 6512 1 branches:u: ffffb2208320 strcmp+0xe0 (/lib/aarch64-linux-gnu/ld-2.27.so)
> > perf script -F,-time -i ${perfdata} | \
> > - egrep " +$1 +[0-9]+ .* +branches:([u|k]:)? +"
> > + egrep " +$1 +[0-9]+ .* +branches:(.*:)? +"
> > }
> >
> > perf_report_branch_samples() {
> > --
> > 2.17.1
> >

--

- Arnaldo

2020-11-11 03:07:07

by Leo Yan

Subject: Re: [PATCH RESEND 2/2] perf test: Update branch sample parttern for cs-etm

On Tue, Nov 10, 2020 at 03:19:29PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Tue, Nov 10, 2020 at 11:08:29AM -0700, Mathieu Poirier escreveu:
> > On Tue, Nov 10, 2020 at 02:34:17PM +0800, Leo Yan wrote:
> > > Since the commit 943b69ac1884 ("perf parse-events: Set exclude_guest=1
> > > for user-space counting"), 'exclude_guest=1' is set for user-space
> > > counting; and the branch sample's modifier has been altered, the sample
> > > event name has been changed from "branches:u:" to "branches:uH:", which
> > > gives out info for "user-space and host counting".
> > >
> > > But the cs-etm testing's regular expression cannot match the updated
> > > branch sample event and leads to test failure.
> > >
> > > This patch updates the branch sample parttern by using a more flexible
> >
> > s/parttern/pattern
>
> I'll fix it and add stable@ to the CC list, thanks

Thanks, Arnaldo and Mathieu.

Will take care for sending stable list in next time.

> > > expression '.*' to match branch sample's modifiers, so that allows the
> > > testing to work as expected.
> > >
> > > Fixes: 943b69ac1884 ("perf parse-events: Set exclude_guest=1 for user-space counting")
> > > Signed-off-by: Leo Yan <[email protected]>
> > > ---
> > > tools/perf/tests/shell/test_arm_coresight.sh | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > Here too I would CC stable. With the above:
> >
> > Reviewed-by: Mathieu Poirier <[email protected]>
> >
> > >
> > > diff --git a/tools/perf/tests/shell/test_arm_coresight.sh b/tools/perf/tests/shell/test_arm_coresight.sh
> > > index 59d847d4981d..18fde2f179cd 100755
> > > --- a/tools/perf/tests/shell/test_arm_coresight.sh
> > > +++ b/tools/perf/tests/shell/test_arm_coresight.sh
> > > @@ -44,7 +44,7 @@ perf_script_branch_samples() {
> > > # touch 6512 1 branches:u: ffffb22082e0 strcmp+0xa0 (/lib/aarch64-linux-gnu/ld-2.27.so)
> > > # touch 6512 1 branches:u: ffffb2208320 strcmp+0xe0 (/lib/aarch64-linux-gnu/ld-2.27.so)
> > > perf script -F,-time -i ${perfdata} | \
> > > - egrep " +$1 +[0-9]+ .* +branches:([u|k]:)? +"
> > > + egrep " +$1 +[0-9]+ .* +branches:(.*:)? +"
> > > }
> > >
> > > perf_report_branch_samples() {
> > > --
> > > 2.17.1
> > >
>
> --
>
> - Arnaldo