Re: [lttng-dev] [PATCH lttng-tools v3 3/3] Create a dedicated test suite for Perf

2016-07-08 Thread Jérémie Galarneau 
On Fri, Jul 8, 2016 at 4:41 PM, Julien Desfossez
 wrote:
>> >> have_libpfm should be used to set an automake variable and enable the test
>> >> conditionally. Similar to what is done here:
>> >>
>> >> https://github.com/lttng/lttng-tools/blob/master/tests/regression/Makefile.am#L44
>> >
>> > Hum, the intent here is to make the tests fail if the dependency is not
>> > available, but we do not want to enforce it as a dependency since most
>> > deployments cannot run these tests. What we want here if for the test to
>> > fail if a user tries to run it without the dependency installed, then
>> > they will install the dependency and run it again. Having a transparent
>> > way to disable these tests would render them useless because we will
>> > think they passed.
>>
>> Agreed to not include them in the standard test suite. However, the
>> test should be skipped if the dependency is not found on the system,
>> along with a message explaining why.
>>
>> Currently the test will fail with the following output if run without
>> libpfm4 installed on the system.
>>
>> $ ./tests/perf/test_perf_raw
>> 1..20
>> # Perf counters
>> ok 1 - Start session daemon
>> ./tests/perf/test_perf_raw: line 50: ./tests/perf//find_event: No such
>> file or directory
>> not ok 2 - Find PMU UNHALTED_REFERENCE_CYCLES
> [...]
>>
>> This does't make it obvious why the test is failing.
>>
>> >
>> > There may be a better way of doing it, but we should avoid using magical
>> > "skip" in this case, these tests should fail if the target architecture
>> > does not support all the Perf-related features we support.
>>
>> I want to make it clear to the user that the test is failing because
>> of a missing dependency, and not because his HW doesn't have the
>> capabilities needed.
>>
>> Skip with a clear error message seems appropriate here, especially
>> since the test will not be run automatically.
>
> How about having a first step in the test that checks if the dependency
> is present and fails if not ? This would make it clear that the
> dependency is needed to run the test, and it would not magically pass if
> run in the background or in batch.
>
> I am really worried that skipping here will confuse users, I see this
> test suite as a way to guarantee that perf-related features all work on
> their system if the test returns 0 at the end.

That's fair. Feel free to have a look at how we use autoconf to generate
the test scripts based on configure-time results in Babeltrace [1][2].

You should be able to export "LTTNG_TOOLS_BUILD_WITH_LIBPFM",
check its value in the script and bail out with an explanation.

[1] 
https://github.com/efficios/babeltrace/blob/master/tests/lib/test_ctf_writer_complete.in
[2] https://github.com/efficios/babeltrace/blob/master/configure.ac#L363

Jeremie
>
> Thanks,
>
> Julien
> ___
> lttng-dev mailing list
> lttng-dev@lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
___
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Re: [lttng-dev] [PATCH lttng-tools v3 3/3] Create a dedicated test suite for Perf

2016-07-08 Thread Julien Desfossez 
> >> have_libpfm should be used to set an automake variable and enable the test
> >> conditionally. Similar to what is done here:
> >>
> >> https://github.com/lttng/lttng-tools/blob/master/tests/regression/Makefile.am#L44
> >
> > Hum, the intent here is to make the tests fail if the dependency is not
> > available, but we do not want to enforce it as a dependency since most
> > deployments cannot run these tests. What we want here if for the test to
> > fail if a user tries to run it without the dependency installed, then
> > they will install the dependency and run it again. Having a transparent
> > way to disable these tests would render them useless because we will
> > think they passed.
> 
> Agreed to not include them in the standard test suite. However, the
> test should be skipped if the dependency is not found on the system,
> along with a message explaining why.
> 
> Currently the test will fail with the following output if run without
> libpfm4 installed on the system.
> 
> $ ./tests/perf/test_perf_raw
> 1..20
> # Perf counters
> ok 1 - Start session daemon
> ./tests/perf/test_perf_raw: line 50: ./tests/perf//find_event: No such
> file or directory
> not ok 2 - Find PMU UNHALTED_REFERENCE_CYCLES
[...]
> 
> This does't make it obvious why the test is failing.
> 
> >
> > There may be a better way of doing it, but we should avoid using magical
> > "skip" in this case, these tests should fail if the target architecture
> > does not support all the Perf-related features we support.
> 
> I want to make it clear to the user that the test is failing because
> of a missing dependency, and not because his HW doesn't have the
> capabilities needed.
> 
> Skip with a clear error message seems appropriate here, especially
> since the test will not be run automatically.

How about having a first step in the test that checks if the dependency
is present and fails if not ? This would make it clear that the
dependency is needed to run the test, and it would not magically pass if
run in the background or in batch.

I am really worried that skipping here will confuse users, I see this
test suite as a way to guarantee that perf-related features all work on
their system if the test returns 0 at the end.

Thanks,

Julien
___
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Re: [lttng-dev] [PATCH lttng-tools v3 3/3] Create a dedicated test suite for Perf

2016-07-08 Thread Jérémie Galarneau 
On Fri, Jul 8, 2016 at 4:07 PM, Julien Desfossez
 wrote:
> On 16-07-08 03:56 PM, Jérémie Galarneau wrote:
>> The first two patches look good to me. See comments on this one below
>> (and your own reply).
>>
>> On Tue, Jul 5, 2016 at 11:50 AM, Julien Desfossez
>>  wrote:
>>> Introduce the perf_regression test suite that must be run manually to
>>> check if the support for the Perf-related features are available on the
>>> current machine. This test cannot be run automatically since there are
>>> some platforms where it can fail.
>>
>> Is this still true given lttng-ust's new "read()" fallback?
>
> Yes, the test tries to enable a raw context and it depends on the
> hardware (which CPU, SoC, etc), so there are many places where it can
> fail, including in VM in the CI.
>
>>> For now, the test only makes sure that we can trace events with perf
>>> contexts enabled by raw ID in kernel and user-space. The test only works
>>> if libpfm is installed on the system and fails if it is not installed.
>>>
>>> Signed-off-by: Julien Desfossez 
>>> ---
>>>  .gitignore   |   1 +
>>>  README.md|   2 +
>>>  configure.ac |   8 +++
>>>  tests/Makefile.am|   8 +--
>>>  tests/perf/Makefile.am   |   6 +++
>>>  tests/perf/find_event.c  |  83 ++
>>>  tests/perf/test_perf_raw | 129 
>>> +++
>>>  tests/perf_regression|   1 +
>>>  8 files changed, 234 insertions(+), 4 deletions(-)
>>>  create mode 100644 tests/perf/Makefile.am
>>>  create mode 100644 tests/perf/find_event.c
>>>  create mode 100755 tests/perf/test_perf_raw
>>>  create mode 100644 tests/perf_regression
>>>
>>> diff --git a/.gitignore b/.gitignore
>>> index ac78292..c31dbc5 100644
>>> --- a/.gitignore
>>> +++ b/.gitignore
>>> @@ -106,6 +106,7 @@ tests/regression/ust/python-logging/test_python_logging
>>>  /tests/utils/testapp/gen-ust-tracef/gen-ust-tracef
>>>  /tests/regression/tools/live/live_test
>>>  /tests/unit/ini_config/ini_config
>>> +/tests/perf/find_event
>>>
>>>  # man pages
>>>  /doc/man/*.1
>>> diff --git a/README.md b/README.md
>>> index 22de252..3156a15 100644
>>> --- a/README.md
>>> +++ b/README.md
>>> @@ -57,6 +57,8 @@ The following items are _optional_ dependencies:
>>>  pages with the `--help` option or with the `lttng help` command.
>>>  Note that without `man`, you cannot get offline help with
>>>  LTTng-tools commands, not even their usage.
>>> +  - **`libpfm`**: needed to run the perf regression test suite.
>>> +- Debian/Ubuntu package: `libpfm4-dev`
>>
>> Which version is required?
>>
>>>
>>>  LTTng-tools supports both the [LTTng Linux Kernel 
>>> tracer](https://lttng.org)
>>>  and [LTTng user space tracer](https://lttng.org) released as part of the 
>>> same
>>> diff --git a/configure.ac b/configure.ac
>>> index fb2b013..f96d25b 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -467,6 +467,13 @@ AC_CHECK_LIB([c], [open_memstream],
>>>  ]
>>>  )
>>>
>>> +# check for libpfm
>>> +AC_CHECK_LIB([pfm], [pfm_initialize],
>>> +[
>>> + have_libpfm=yes
>>> + ])
>>> +AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBPFM], [test "x$have_libpfm" = 
>>> "xyes"])
>>> +
>>>  AC_ARG_ENABLE([git-version],
>>>[AC_HELP_STRING([--disable-git-version],
>>>[Do not use the git version for the build])],
>>> @@ -1008,6 +1015,7 @@ AC_CONFIG_FILES([
>>> tests/stress/Makefile
>>> tests/unit/Makefile
>>> tests/unit/ini_config/Makefile
>>> +   tests/perf/Makefile
>>
>> have_libpfm should be used to set an automake variable and enable the test
>> conditionally. Similar to what is done here:
>>
>> https://github.com/lttng/lttng-tools/blob/master/tests/regression/Makefile.am#L44
>
> Hum, the intent here is to make the tests fail if the dependency is not
> available, but we do not want to enforce it as a dependency since most
> deployments cannot run these tests. What we want here if for the test to
> fail if a user tries to run it without the dependency installed, then
> they will install the dependency and run it again. Having a transparent
> way to disable these tests would render them useless because we will
> think they passed.

Agreed to not include them in the standard test suite. However, the
test should be skipped if the dependency is not found on the system,
along with a message explaining why.

Currently the test will fail with the following output if run without
libpfm4 installed on the system.

$ ./tests/perf/test_perf_raw
1..20
# Perf counters
ok 1 - Start session daemon
./tests/perf/test_perf_raw: line 50: ./tests/perf//find_event: No such
file or directory
not ok 2 - Find PMU UNHALTED_REFERENCE_CYCLES
#   Failed test 'Find PMU UNHALTED_REFERENCE_CYCLES'
#   in ./tests/perf/test_perf_raw:test_ust_raw() at line 52.
ok 3 - Create session

Re: [lttng-dev] [PATCH lttng-tools v3 3/3] Create a dedicated test suite for Perf

2016-07-08 Thread Julien Desfossez 
On 16-07-08 03:56 PM, Jérémie Galarneau wrote:
> The first two patches look good to me. See comments on this one below
> (and your own reply).
> 
> On Tue, Jul 5, 2016 at 11:50 AM, Julien Desfossez
>  wrote:
>> Introduce the perf_regression test suite that must be run manually to
>> check if the support for the Perf-related features are available on the
>> current machine. This test cannot be run automatically since there are
>> some platforms where it can fail.
> 
> Is this still true given lttng-ust's new "read()" fallback?

Yes, the test tries to enable a raw context and it depends on the
hardware (which CPU, SoC, etc), so there are many places where it can
fail, including in VM in the CI.

>> For now, the test only makes sure that we can trace events with perf
>> contexts enabled by raw ID in kernel and user-space. The test only works
>> if libpfm is installed on the system and fails if it is not installed.
>>
>> Signed-off-by: Julien Desfossez 
>> ---
>>  .gitignore   |   1 +
>>  README.md|   2 +
>>  configure.ac |   8 +++
>>  tests/Makefile.am|   8 +--
>>  tests/perf/Makefile.am   |   6 +++
>>  tests/perf/find_event.c  |  83 ++
>>  tests/perf/test_perf_raw | 129 
>> +++
>>  tests/perf_regression|   1 +
>>  8 files changed, 234 insertions(+), 4 deletions(-)
>>  create mode 100644 tests/perf/Makefile.am
>>  create mode 100644 tests/perf/find_event.c
>>  create mode 100755 tests/perf/test_perf_raw
>>  create mode 100644 tests/perf_regression
>>
>> diff --git a/.gitignore b/.gitignore
>> index ac78292..c31dbc5 100644
>> --- a/.gitignore
>> +++ b/.gitignore
>> @@ -106,6 +106,7 @@ tests/regression/ust/python-logging/test_python_logging
>>  /tests/utils/testapp/gen-ust-tracef/gen-ust-tracef
>>  /tests/regression/tools/live/live_test
>>  /tests/unit/ini_config/ini_config
>> +/tests/perf/find_event
>>
>>  # man pages
>>  /doc/man/*.1
>> diff --git a/README.md b/README.md
>> index 22de252..3156a15 100644
>> --- a/README.md
>> +++ b/README.md
>> @@ -57,6 +57,8 @@ The following items are _optional_ dependencies:
>>  pages with the `--help` option or with the `lttng help` command.
>>  Note that without `man`, you cannot get offline help with
>>  LTTng-tools commands, not even their usage.
>> +  - **`libpfm`**: needed to run the perf regression test suite.
>> +- Debian/Ubuntu package: `libpfm4-dev`
> 
> Which version is required?
> 
>>
>>  LTTng-tools supports both the [LTTng Linux Kernel tracer](https://lttng.org)
>>  and [LTTng user space tracer](https://lttng.org) released as part of the 
>> same
>> diff --git a/configure.ac b/configure.ac
>> index fb2b013..f96d25b 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -467,6 +467,13 @@ AC_CHECK_LIB([c], [open_memstream],
>>  ]
>>  )
>>
>> +# check for libpfm
>> +AC_CHECK_LIB([pfm], [pfm_initialize],
>> +[
>> + have_libpfm=yes
>> + ])
>> +AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBPFM], [test "x$have_libpfm" = 
>> "xyes"])
>> +
>>  AC_ARG_ENABLE([git-version],
>>[AC_HELP_STRING([--disable-git-version],
>>[Do not use the git version for the build])],
>> @@ -1008,6 +1015,7 @@ AC_CONFIG_FILES([
>> tests/stress/Makefile
>> tests/unit/Makefile
>> tests/unit/ini_config/Makefile
>> +   tests/perf/Makefile
> 
> have_libpfm should be used to set an automake variable and enable the test
> conditionally. Similar to what is done here:
> 
> https://github.com/lttng/lttng-tools/blob/master/tests/regression/Makefile.am#L44

Hum, the intent here is to make the tests fail if the dependency is not
available, but we do not want to enforce it as a dependency since most
deployments cannot run these tests. What we want here if for the test to
fail if a user tries to run it without the dependency installed, then
they will install the dependency and run it again. Having a transparent
way to disable these tests would render them useless because we will
think they passed.

There may be a better way of doing it, but we should avoid using magical
"skip" in this case, these tests should fail if the target architecture
does not support all the Perf-related features we support.

Thanks,

Julien
___
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Re: [lttng-dev] [PATCH lttng-tools v3 3/3] Create a dedicated test suite for Perf

2016-07-08 Thread Jérémie Galarneau 
The first two patches look good to me. See comments on this one below
(and your own reply).

On Tue, Jul 5, 2016 at 11:50 AM, Julien Desfossez
 wrote:
> Introduce the perf_regression test suite that must be run manually to
> check if the support for the Perf-related features are available on the
> current machine. This test cannot be run automatically since there are
> some platforms where it can fail.

Is this still true given lttng-ust's new "read()" fallback?

>
> For now, the test only makes sure that we can trace events with perf
> contexts enabled by raw ID in kernel and user-space. The test only works
> if libpfm is installed on the system and fails if it is not installed.
>
> Signed-off-by: Julien Desfossez 
> ---
>  .gitignore   |   1 +
>  README.md|   2 +
>  configure.ac |   8 +++
>  tests/Makefile.am|   8 +--
>  tests/perf/Makefile.am   |   6 +++
>  tests/perf/find_event.c  |  83 ++
>  tests/perf/test_perf_raw | 129 
> +++
>  tests/perf_regression|   1 +
>  8 files changed, 234 insertions(+), 4 deletions(-)
>  create mode 100644 tests/perf/Makefile.am
>  create mode 100644 tests/perf/find_event.c
>  create mode 100755 tests/perf/test_perf_raw
>  create mode 100644 tests/perf_regression
>
> diff --git a/.gitignore b/.gitignore
> index ac78292..c31dbc5 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -106,6 +106,7 @@ tests/regression/ust/python-logging/test_python_logging
>  /tests/utils/testapp/gen-ust-tracef/gen-ust-tracef
>  /tests/regression/tools/live/live_test
>  /tests/unit/ini_config/ini_config
> +/tests/perf/find_event
>
>  # man pages
>  /doc/man/*.1
> diff --git a/README.md b/README.md
> index 22de252..3156a15 100644
> --- a/README.md
> +++ b/README.md
> @@ -57,6 +57,8 @@ The following items are _optional_ dependencies:
>  pages with the `--help` option or with the `lttng help` command.
>  Note that without `man`, you cannot get offline help with
>  LTTng-tools commands, not even their usage.
> +  - **`libpfm`**: needed to run the perf regression test suite.
> +- Debian/Ubuntu package: `libpfm4-dev`

Which version is required?

>
>  LTTng-tools supports both the [LTTng Linux Kernel tracer](https://lttng.org)
>  and [LTTng user space tracer](https://lttng.org) released as part of the same
> diff --git a/configure.ac b/configure.ac
> index fb2b013..f96d25b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -467,6 +467,13 @@ AC_CHECK_LIB([c], [open_memstream],
>  ]
>  )
>
> +# check for libpfm
> +AC_CHECK_LIB([pfm], [pfm_initialize],
> +[
> + have_libpfm=yes
> + ])
> +AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBPFM], [test "x$have_libpfm" = 
> "xyes"])
> +
>  AC_ARG_ENABLE([git-version],
>[AC_HELP_STRING([--disable-git-version],
>[Do not use the git version for the build])],
> @@ -1008,6 +1015,7 @@ AC_CONFIG_FILES([
> tests/stress/Makefile
> tests/unit/Makefile
> tests/unit/ini_config/Makefile
> +   tests/perf/Makefile

have_libpfm should be used to set an automake variable and enable the test
conditionally. Similar to what is done here:

https://github.com/lttng/lttng-tools/blob/master/tests/regression/Makefile.am#L44

> tests/utils/Makefile
> tests/utils/tap/Makefile
> tests/utils/testapp/Makefile
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index 3600e99..d460fb6 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -1,8 +1,8 @@
>  SUBDIRS =
> -DIST_SUBDIRS = utils regression unit stress destructive
> +DIST_SUBDIRS = utils regression unit stress destructive perf
>
>  if BUILD_TESTS
> -SUBDIRS += . utils regression unit stress destructive
> +SUBDIRS += . utils regression unit stress destructive perf
>  if HAS_PGREP
>  check-am:
> $(top_srcdir)/tests/utils/warn_processes.sh $(PGREP)
> @@ -14,8 +14,8 @@ else
>  endif
>
>
> -dist_noinst_SCRIPTS = run.sh fast_regression long_regression root_regression 
> root_destructive_tests
> -EXTRA_DIST = run.sh fast_regression long_regression root_regression README 
> root_destructive_tests
> +dist_noinst_SCRIPTS = run.sh fast_regression long_regression root_regression 
> root_destructive_tests perf_regression
> +EXTRA_DIST = run.sh fast_regression long_regression root_regression README 
> root_destructive_tests perf_regression
>
>  all-local:
> @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
> diff --git a/tests/perf/Makefile.am b/tests/perf/Makefile.am
> new file mode 100644
> index 000..40bb754
> --- /dev/null
> +++ b/tests/perf/Makefile.am
> @@ -0,0 +1,6 @@
> +if LTTNG_TOOLS_BUILD_WITH_LIBPFM
> +LIBS += -lpfm
> +
> +noinst_PROGRAMS = find_event
> +find_event_SOURCES = find_event.c
> +endif
> diff --git a/tests/perf/find_event.c b/tests/perf/find_event.c
> new file mode 100644
> index

Re: [lttng-dev] [PATCH lttng-tools v3 3/3] Create a dedicated test suite for Perf

2016-07-06 Thread Julien Desfossez 
> diff --git a/tests/perf/find_event.c b/tests/perf/find_event.c
> new file mode 100644
> index 000..ae63800
> --- /dev/null
> +++ b/tests/perf/find_event.c
> @@ -0,0 +1,83 @@
> +/*
> + * Copyright (c)  2016 Julien Desfossez 
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * as published by the Free Software Foundation; only version 2
> + * of the License.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License along
> + * with this program; if not, write to the Free Software Foundation, Inc.,
> + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
> + */
> +
> +#include 
> +#include 
> +#include 
> +
> +int main(int argc, char **argv)
> +{
> + int ret, i;
> + unsigned int j;
> + pfm_pmu_info_t pinfo;
> +
> + if (argc != 2) {
> + fprintf(stderr, "Usage: %s \n"
> + "ex: %s UNHALTED_REFERENCE_CYCLES\n"
> + "Returns the first occurence it finds with "
> + "return code 0.\n"
> + "If not found returns 1, on error returns -1\n",
> + argv[0], argv[0]);
> + ret = -1;
> + goto end;
> + }
> +
> + memset(, 0, sizeof(pinfo));
> + pinfo.size = sizeof(pinfo);
> +
> + ret = pfm_initialize();
> + if (ret != PFM_SUCCESS) {
> + fprintf(stderr, "Failed to initialise libpfm: %s",
> + pfm_strerror(ret));
> + ret = -1;
> + goto end;
> + }
> +
> + pfm_for_all_pmus(j) {
> + ret = pfm_get_pmu_info(j, );
> + if (ret != PFM_SUCCESS) {
> + continue;
> + }
> +
> + for (i = pinfo.first_event; i != -1; i = pfm_get_event_next(i)) 
> {
> + pfm_event_info_t info;
> +
> + ret = pfm_get_event_info(i, PFM_OS_NONE, );
> + if (ret != PFM_SUCCESS) {
> + fprintf(stderr, "Cannot get event info: %s\n",
> + pfm_strerror(ret));
> + ret = -1;
> + goto end;
> + }
> +
> + if (info.pmu != j)
> + continue;
> +
> + if (strcmp(info.name, argv[1]) == 0) {
> + fprintf(stdout, "r%lx\n", info.code);
This should be:
fprintf(stdout, "r%" PRIx64 "\n", info.code);

I will wait for other comments if any before resubmitting a new version
(or you can directly apply the fix when you merge).

Thanks,

Julien
___
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

[lttng-dev] [PATCH lttng-tools v3 3/3] Create a dedicated test suite for Perf

2016-07-05 Thread Julien Desfossez 
Introduce the perf_regression test suite that must be run manually to
check if the support for the Perf-related features are available on the
current machine. This test cannot be run automatically since there are
some platforms where it can fail.

For now, the test only makes sure that we can trace events with perf
contexts enabled by raw ID in kernel and user-space. The test only works
if libpfm is installed on the system and fails if it is not installed.

Signed-off-by: Julien Desfossez 
---
 .gitignore   |   1 +
 README.md|   2 +
 configure.ac |   8 +++
 tests/Makefile.am|   8 +--
 tests/perf/Makefile.am   |   6 +++
 tests/perf/find_event.c  |  83 ++
 tests/perf/test_perf_raw | 129 +++
 tests/perf_regression|   1 +
 8 files changed, 234 insertions(+), 4 deletions(-)
 create mode 100644 tests/perf/Makefile.am
 create mode 100644 tests/perf/find_event.c
 create mode 100755 tests/perf/test_perf_raw
 create mode 100644 tests/perf_regression

diff --git a/.gitignore b/.gitignore
index ac78292..c31dbc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,6 +106,7 @@ tests/regression/ust/python-logging/test_python_logging
 /tests/utils/testapp/gen-ust-tracef/gen-ust-tracef
 /tests/regression/tools/live/live_test
 /tests/unit/ini_config/ini_config
+/tests/perf/find_event
 
 # man pages
 /doc/man/*.1
diff --git a/README.md b/README.md
index 22de252..3156a15 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,8 @@ The following items are _optional_ dependencies:
 pages with the `--help` option or with the `lttng help` command.
 Note that without `man`, you cannot get offline help with
 LTTng-tools commands, not even their usage.
+  - **`libpfm`**: needed to run the perf regression test suite.
+- Debian/Ubuntu package: `libpfm4-dev`
 
 LTTng-tools supports both the [LTTng Linux Kernel tracer](https://lttng.org)
 and [LTTng user space tracer](https://lttng.org) released as part of the same
diff --git a/configure.ac b/configure.ac
index fb2b013..f96d25b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,6 +467,13 @@ AC_CHECK_LIB([c], [open_memstream],
 ]
 )
 
+# check for libpfm
+AC_CHECK_LIB([pfm], [pfm_initialize],
+[
+ have_libpfm=yes
+ ])
+AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBPFM], [test "x$have_libpfm" = 
"xyes"])
+
 AC_ARG_ENABLE([git-version],
   [AC_HELP_STRING([--disable-git-version],
   [Do not use the git version for the build])],
@@ -1008,6 +1015,7 @@ AC_CONFIG_FILES([
tests/stress/Makefile
tests/unit/Makefile
tests/unit/ini_config/Makefile
+   tests/perf/Makefile
tests/utils/Makefile
tests/utils/tap/Makefile
tests/utils/testapp/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3600e99..d460fb6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS =
-DIST_SUBDIRS = utils regression unit stress destructive
+DIST_SUBDIRS = utils regression unit stress destructive perf
 
 if BUILD_TESTS
-SUBDIRS += . utils regression unit stress destructive
+SUBDIRS += . utils regression unit stress destructive perf
 if HAS_PGREP
 check-am:
$(top_srcdir)/tests/utils/warn_processes.sh $(PGREP)
@@ -14,8 +14,8 @@ else
 endif
 
 
-dist_noinst_SCRIPTS = run.sh fast_regression long_regression root_regression 
root_destructive_tests
-EXTRA_DIST = run.sh fast_regression long_regression root_regression README 
root_destructive_tests
+dist_noinst_SCRIPTS = run.sh fast_regression long_regression root_regression 
root_destructive_tests perf_regression
+EXTRA_DIST = run.sh fast_regression long_regression root_regression README 
root_destructive_tests perf_regression
 
 all-local:
@if [ x"$(srcdir)" != x"$(builddir)" ]; then \
diff --git a/tests/perf/Makefile.am b/tests/perf/Makefile.am
new file mode 100644
index 000..40bb754
--- /dev/null
+++ b/tests/perf/Makefile.am
@@ -0,0 +1,6 @@
+if LTTNG_TOOLS_BUILD_WITH_LIBPFM
+LIBS += -lpfm
+
+noinst_PROGRAMS = find_event
+find_event_SOURCES = find_event.c
+endif
diff --git a/tests/perf/find_event.c b/tests/perf/find_event.c
new file mode 100644
index 000..ae63800
--- /dev/null
+++ b/tests/perf/find_event.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c)  2016 Julien Desfossez 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public