Messages in this thread | | | Date | Tue, 10 Nov 2020 15:19:29 -0300 | From | 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 <leo.yan@linaro.org> > > --- > > 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 <mathieu.poirier@linaro.org> > > > > > 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
| |