* [PATCH v1] perf test: Add basic perf diff test
@ 2023-11-20 19:04 Ian Rogers
2023-12-04 16:00 ` Ian Rogers
0 siblings, 1 reply; 6+ messages in thread
From: Ian Rogers @ 2023-11-20 19:04 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Adrian Hunter, linux-kernel, linux-perf-users, atrajeev
Cc: Ian Rogers
There are some old bug reports on perf diff crashing:
https://rhaas.blogspot.com/2012/06/perf-good-bad-ugly.html
Happening across them I was prompted to add two very basic tests that
will give some perf diff coverage.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/tests/shell/diff.sh | 101 +++++++++++++++++++++++++++++++++
1 file changed, 101 insertions(+)
create mode 100755 tools/perf/tests/shell/diff.sh
diff --git a/tools/perf/tests/shell/diff.sh b/tools/perf/tests/shell/diff.sh
new file mode 100755
index 000000000000..213185763688
--- /dev/null
+++ b/tools/perf/tests/shell/diff.sh
@@ -0,0 +1,101 @@
+#!/bin/sh
+# perf diff tests
+# SPDX-License-Identifier: GPL-2.0
+
+set -e
+
+err=0
+perfdata1=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+perfdata2=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+perfdata3=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
+testprog="perf test -w thloop"
+testsym="test_loop"
+
+cleanup() {
+ rm -rf "${perfdata1}"
+ rm -rf "${perfdata1}".old
+ rm -rf "${perfdata2}"
+ rm -rf "${perfdata2}".old
+ rm -rf "${perfdata3}"
+ rm -rf "${perfdata3}".old
+
+ trap - EXIT TERM INT
+}
+
+trap_cleanup() {
+ cleanup
+ exit 1
+}
+trap trap_cleanup EXIT TERM INT
+
+make_data() {
+ file="$1"
+ if ! perf record -o "${file}" ${testprog} 2> /dev/null
+ then
+ echo "Workload record [Failed record]"
+ echo 1
+ return
+ fi
+ if ! perf report -i "${file}" -q | grep -q "${testsym}"
+ then
+ echo "Workload record [Failed missing output]"
+ echo 1
+ return
+ fi
+ echo 0
+}
+
+test_two_files() {
+ echo "Basic two file diff test"
+ err=$(make_data "${perfdata1}")
+ if [ $err != 0 ]
+ then
+ return
+ fi
+ err=$(make_data "${perfdata2}")
+ if [ $err != 0 ]
+ then
+ return
+ fi
+
+ if ! perf diff "${perfdata1}" "${perfdata2}" | grep -q "${testsym}"
+ then
+ echo "Basic two file diff test [Failed diff]"
+ err=1
+ return
+ fi
+ echo "Basic two file diff test [Success]"
+}
+
+test_three_files() {
+ echo "Basic three file diff test"
+ err=$(make_data "${perfdata1}")
+ if [ $err != 0 ]
+ then
+ return
+ fi
+ err=$(make_data "${perfdata2}")
+ if [ $err != 0 ]
+ then
+ return
+ fi
+ err=$(make_data "${perfdata3}")
+ if [ $err != 0 ]
+ then
+ return
+ fi
+
+ if ! perf diff "${perfdata1}" "${perfdata2}" "${perfdata3}" | grep -q "${testsym}"
+ then
+ echo "Basic three file diff test [Failed diff]"
+ err=1
+ return
+ fi
+ echo "Basic three file diff test [Success]"
+}
+
+test_two_files
+test_three_files
+
+cleanup
+exit $err
--
2.43.0.rc1.413.gea7ed67945-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v1] perf test: Add basic perf diff test
2023-11-20 19:04 [PATCH v1] perf test: Add basic perf diff test Ian Rogers
@ 2023-12-04 16:00 ` Ian Rogers
2023-12-04 20:24 ` Arnaldo Carvalho de Melo
2023-12-05 5:44 ` Adrian Hunter
0 siblings, 2 replies; 6+ messages in thread
From: Ian Rogers @ 2023-12-04 16:00 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Adrian Hunter, linux-kernel, linux-perf-users, atrajeev
On Mon, Nov 20, 2023 at 11:04 AM Ian Rogers <irogers@google.com> wrote:
>
> There are some old bug reports on perf diff crashing:
> https://rhaas.blogspot.com/2012/06/perf-good-bad-ugly.html
>
> Happening across them I was prompted to add two very basic tests that
> will give some perf diff coverage.
>
> Signed-off-by: Ian Rogers <irogers@google.com>
Ping.
Thanks,
Ian
> ---
> tools/perf/tests/shell/diff.sh | 101 +++++++++++++++++++++++++++++++++
> 1 file changed, 101 insertions(+)
> create mode 100755 tools/perf/tests/shell/diff.sh
>
> diff --git a/tools/perf/tests/shell/diff.sh b/tools/perf/tests/shell/diff.sh
> new file mode 100755
> index 000000000000..213185763688
> --- /dev/null
> +++ b/tools/perf/tests/shell/diff.sh
> @@ -0,0 +1,101 @@
> +#!/bin/sh
> +# perf diff tests
> +# SPDX-License-Identifier: GPL-2.0
> +
> +set -e
> +
> +err=0
> +perfdata1=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> +perfdata2=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> +perfdata3=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> +testprog="perf test -w thloop"
> +testsym="test_loop"
> +
> +cleanup() {
> + rm -rf "${perfdata1}"
> + rm -rf "${perfdata1}".old
> + rm -rf "${perfdata2}"
> + rm -rf "${perfdata2}".old
> + rm -rf "${perfdata3}"
> + rm -rf "${perfdata3}".old
> +
> + trap - EXIT TERM INT
> +}
> +
> +trap_cleanup() {
> + cleanup
> + exit 1
> +}
> +trap trap_cleanup EXIT TERM INT
> +
> +make_data() {
> + file="$1"
> + if ! perf record -o "${file}" ${testprog} 2> /dev/null
> + then
> + echo "Workload record [Failed record]"
> + echo 1
> + return
> + fi
> + if ! perf report -i "${file}" -q | grep -q "${testsym}"
> + then
> + echo "Workload record [Failed missing output]"
> + echo 1
> + return
> + fi
> + echo 0
> +}
> +
> +test_two_files() {
> + echo "Basic two file diff test"
> + err=$(make_data "${perfdata1}")
> + if [ $err != 0 ]
> + then
> + return
> + fi
> + err=$(make_data "${perfdata2}")
> + if [ $err != 0 ]
> + then
> + return
> + fi
> +
> + if ! perf diff "${perfdata1}" "${perfdata2}" | grep -q "${testsym}"
> + then
> + echo "Basic two file diff test [Failed diff]"
> + err=1
> + return
> + fi
> + echo "Basic two file diff test [Success]"
> +}
> +
> +test_three_files() {
> + echo "Basic three file diff test"
> + err=$(make_data "${perfdata1}")
> + if [ $err != 0 ]
> + then
> + return
> + fi
> + err=$(make_data "${perfdata2}")
> + if [ $err != 0 ]
> + then
> + return
> + fi
> + err=$(make_data "${perfdata3}")
> + if [ $err != 0 ]
> + then
> + return
> + fi
> +
> + if ! perf diff "${perfdata1}" "${perfdata2}" "${perfdata3}" | grep -q "${testsym}"
> + then
> + echo "Basic three file diff test [Failed diff]"
> + err=1
> + return
> + fi
> + echo "Basic three file diff test [Success]"
> +}
> +
> +test_two_files
> +test_three_files
> +
> +cleanup
> +exit $err
> --
> 2.43.0.rc1.413.gea7ed67945-goog
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v1] perf test: Add basic perf diff test
2023-12-04 16:00 ` Ian Rogers
@ 2023-12-04 20:24 ` Arnaldo Carvalho de Melo
2023-12-05 5:44 ` Adrian Hunter
1 sibling, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2023-12-04 20:24 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Adrian Hunter, linux-kernel,
linux-perf-users, atrajeev
Em Mon, Dec 04, 2023 at 08:00:35AM -0800, Ian Rogers escreveu:
> On Mon, Nov 20, 2023 at 11:04 AM Ian Rogers <irogers@google.com> wrote:
> >
> > There are some old bug reports on perf diff crashing:
> > https://rhaas.blogspot.com/2012/06/perf-good-bad-ugly.html
> >
> > Happening across them I was prompted to add two very basic tests that
> > will give some perf diff coverage.
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
>
> Ping.
Thanks, applied to perf-tools-next.
- Arnaldo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1] perf test: Add basic perf diff test
2023-12-04 16:00 ` Ian Rogers
2023-12-04 20:24 ` Arnaldo Carvalho de Melo
@ 2023-12-05 5:44 ` Adrian Hunter
2023-12-05 16:52 ` Ian Rogers
1 sibling, 1 reply; 6+ messages in thread
From: Adrian Hunter @ 2023-12-05 5:44 UTC (permalink / raw)
To: Ian Rogers, Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
linux-kernel, linux-perf-users, atrajeev
On 4/12/23 18:00, Ian Rogers wrote:
> On Mon, Nov 20, 2023 at 11:04 AM Ian Rogers <irogers@google.com> wrote:
>>
>> There are some old bug reports on perf diff crashing:
>> https://rhaas.blogspot.com/2012/06/perf-good-bad-ugly.html
>>
>> Happening across them I was prompted to add two very basic tests that
>> will give some perf diff coverage.
>>
>> Signed-off-by: Ian Rogers <irogers@google.com>
>
> Ping.
>
> Thanks,
> Ian
>
>> ---
>> tools/perf/tests/shell/diff.sh | 101 +++++++++++++++++++++++++++++++++
>> 1 file changed, 101 insertions(+)
>> create mode 100755 tools/perf/tests/shell/diff.sh
>>
>> diff --git a/tools/perf/tests/shell/diff.sh b/tools/perf/tests/shell/diff.sh
>> new file mode 100755
>> index 000000000000..213185763688
>> --- /dev/null
>> +++ b/tools/perf/tests/shell/diff.sh
>> @@ -0,0 +1,101 @@
>> +#!/bin/sh
>> +# perf diff tests
>> +# SPDX-License-Identifier: GPL-2.0
>> +
>> +set -e
>> +
>> +err=0
>> +perfdata1=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
>> +perfdata2=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
>> +perfdata3=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
>> +testprog="perf test -w thloop"
>> +testsym="test_loop"
Could it benefit from skip_test_missing_symbol
>> +
>> +cleanup() {
>> + rm -rf "${perfdata1}"
>> + rm -rf "${perfdata1}".old
>> + rm -rf "${perfdata2}"
>> + rm -rf "${perfdata2}".old
>> + rm -rf "${perfdata3}"
>> + rm -rf "${perfdata3}".old
>> +
>> + trap - EXIT TERM INT
>> +}
>> +
>> +trap_cleanup() {
>> + cleanup
>> + exit 1
>> +}
>> +trap trap_cleanup EXIT TERM INT
>> +
>> +make_data() {
>> + file="$1"
>> + if ! perf record -o "${file}" ${testprog} 2> /dev/null
>> + then
>> + echo "Workload record [Failed record]"
>> + echo 1
>> + return
>> + fi
>> + if ! perf report -i "${file}" -q | grep -q "${testsym}"
>> + then
>> + echo "Workload record [Failed missing output]"
>> + echo 1
>> + return
>> + fi
>> + echo 0
>> +}
>> +
>> +test_two_files() {
>> + echo "Basic two file diff test"
>> + err=$(make_data "${perfdata1}")
>> + if [ $err != 0 ]
>> + then
>> + return
>> + fi
>> + err=$(make_data "${perfdata2}")
>> + if [ $err != 0 ]
>> + then
>> + return
>> + fi
>> +
>> + if ! perf diff "${perfdata1}" "${perfdata2}" | grep -q "${testsym}"
>> + then
>> + echo "Basic two file diff test [Failed diff]"
>> + err=1
>> + return
>> + fi
>> + echo "Basic two file diff test [Success]"
>> +}
>> +
>> +test_three_files() {
>> + echo "Basic three file diff test"
>> + err=$(make_data "${perfdata1}")
>> + if [ $err != 0 ]
>> + then
>> + return
>> + fi
>> + err=$(make_data "${perfdata2}")
>> + if [ $err != 0 ]
>> + then
>> + return
>> + fi
>> + err=$(make_data "${perfdata3}")
>> + if [ $err != 0 ]
>> + then
>> + return
>> + fi
>> +
>> + if ! perf diff "${perfdata1}" "${perfdata2}" "${perfdata3}" | grep -q "${testsym}"
>> + then
>> + echo "Basic three file diff test [Failed diff]"
>> + err=1
>> + return
>> + fi
>> + echo "Basic three file diff test [Success]"
>> +}
>> +
>> +test_two_files
>> +test_three_files
>> +
>> +cleanup
>> +exit $err
>> --
>> 2.43.0.rc1.413.gea7ed67945-goog
>>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v1] perf test: Add basic perf diff test
2023-12-05 5:44 ` Adrian Hunter
@ 2023-12-05 16:52 ` Ian Rogers
2023-12-06 13:26 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 6+ messages in thread
From: Ian Rogers @ 2023-12-05 16:52 UTC (permalink / raw)
To: Adrian Hunter
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
linux-kernel, linux-perf-users, atrajeev
On Mon, Dec 4, 2023 at 9:44 PM Adrian Hunter <adrian.hunter@intel.com> wrote:
>
> On 4/12/23 18:00, Ian Rogers wrote:
> > On Mon, Nov 20, 2023 at 11:04 AM Ian Rogers <irogers@google.com> wrote:
> >>
> >> There are some old bug reports on perf diff crashing:
> >> https://rhaas.blogspot.com/2012/06/perf-good-bad-ugly.html
> >>
> >> Happening across them I was prompted to add two very basic tests that
> >> will give some perf diff coverage.
> >>
> >> Signed-off-by: Ian Rogers <irogers@google.com>
> >
> > Ping.
> >
> > Thanks,
> > Ian
> >
> >> ---
> >> tools/perf/tests/shell/diff.sh | 101 +++++++++++++++++++++++++++++++++
> >> 1 file changed, 101 insertions(+)
> >> create mode 100755 tools/perf/tests/shell/diff.sh
> >>
> >> diff --git a/tools/perf/tests/shell/diff.sh b/tools/perf/tests/shell/diff.sh
> >> new file mode 100755
> >> index 000000000000..213185763688
> >> --- /dev/null
> >> +++ b/tools/perf/tests/shell/diff.sh
> >> @@ -0,0 +1,101 @@
> >> +#!/bin/sh
> >> +# perf diff tests
> >> +# SPDX-License-Identifier: GPL-2.0
> >> +
> >> +set -e
> >> +
> >> +err=0
> >> +perfdata1=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> >> +perfdata2=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> >> +perfdata3=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> >> +testprog="perf test -w thloop"
> >> +testsym="test_loop"
>
> Could it benefit from skip_test_missing_symbol
Good idea, sent:
https://lore.kernel.org/lkml/20231205164924.835682-1-irogers@google.com/
Thanks,
Ian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v1] perf test: Add basic perf diff test
2023-12-05 16:52 ` Ian Rogers
@ 2023-12-06 13:26 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 6+ messages in thread
From: Arnaldo Carvalho de Melo @ 2023-12-06 13:26 UTC (permalink / raw)
To: Ian Rogers
Cc: Adrian Hunter, Peter Zijlstra, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, linux-kernel,
linux-perf-users, atrajeev
Em Tue, Dec 05, 2023 at 08:52:04AM -0800, Ian Rogers escreveu:
> On Mon, Dec 4, 2023 at 9:44 PM Adrian Hunter <adrian.hunter@intel.com> wrote:
> >
> > On 4/12/23 18:00, Ian Rogers wrote:
> > > On Mon, Nov 20, 2023 at 11:04 AM Ian Rogers <irogers@google.com> wrote:
> > >>
> > >> There are some old bug reports on perf diff crashing:
> > >> https://rhaas.blogspot.com/2012/06/perf-good-bad-ugly.html
> > >>
> > >> Happening across them I was prompted to add two very basic tests that
> > >> will give some perf diff coverage.
> > >>
> > >> Signed-off-by: Ian Rogers <irogers@google.com>
> > >
> > > Ping.
> > >
> > > Thanks,
> > > Ian
> > >
> > >> ---
> > >> tools/perf/tests/shell/diff.sh | 101 +++++++++++++++++++++++++++++++++
> > >> 1 file changed, 101 insertions(+)
> > >> create mode 100755 tools/perf/tests/shell/diff.sh
> > >>
> > >> diff --git a/tools/perf/tests/shell/diff.sh b/tools/perf/tests/shell/diff.sh
> > >> new file mode 100755
> > >> index 000000000000..213185763688
> > >> --- /dev/null
> > >> +++ b/tools/perf/tests/shell/diff.sh
> > >> @@ -0,0 +1,101 @@
> > >> +#!/bin/sh
> > >> +# perf diff tests
> > >> +# SPDX-License-Identifier: GPL-2.0
> > >> +
> > >> +set -e
> > >> +
> > >> +err=0
> > >> +perfdata1=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> > >> +perfdata2=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> > >> +perfdata3=$(mktemp /tmp/__perf_test.perf.data.XXXXX)
> > >> +testprog="perf test -w thloop"
> > >> +testsym="test_loop"
> >
> > Could it benefit from skip_test_missing_symbol
>
> Good idea, sent:
> https://lore.kernel.org/lkml/20231205164924.835682-1-irogers@google.com/
Applied, and added this:
Suggested-by: Adrian Hunter <adrian.hunter@intel.com>
Thanks,
- Arnaldo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-06 13:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-20 19:04 [PATCH v1] perf test: Add basic perf diff test Ian Rogers
2023-12-04 16:00 ` Ian Rogers
2023-12-04 20:24 ` Arnaldo Carvalho de Melo
2023-12-05 5:44 ` Adrian Hunter
2023-12-05 16:52 ` Ian Rogers
2023-12-06 13:26 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).