[GIT PULL 0/2] perf/tests improvements

[GIT PULL 0/2] perf/tests improvements

[Arnaldo Carvalho de Melo]

Hi Jiri,

	Experimenting with more topic branches, this time for things you're the
are the original developer and de facto maintainer, the tools/perf/tests/ harness.

	This was done on top of your perf/core branch, please let me know if all is
ok and then you can try pulling from it or perhaps you could just ack it and then
Ingo could pull it directly, opinions? Ingo?

- Arnaldo

The following changes since commit 1bb7b24b0457eeea549262780c0b9d0755416e2f:

  perf tools: Support spark lines in perf stat (2014-06-06 11:54:06 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-tests-for-jirka

for you to fetch changes up to 38b8d135293e110780eaa02b021eb9c13c4009a6:

  perf tests: Show the inner make output when an error happens (2014-06-06 10:45:09 -0300)

----------------------------------------------------------------
perf/tests improvements:

Developer stuff.

. Emit more precise message for missing glibc static library,
  from Arnaldo Carvalho de Melo.

. Show the 'make -f tests/make' inner make output when an error happens.

  The perf build tests harness, invoked with:

    make -C tools/perf -f tests/make

  Will call many combinations of builds, trying to check if all of them
  continue to work over time, for instance, if removing perl support, or
  if building using static libraries still builds fine.

  But one would have to check the contents of a per build test entry
  file to figure out what the error was about. Do it automatically,
  speeding up the process of, for instance, installing missing static
  libraries.

  from Arnaldo Carvalho de Melo.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

----------------------------------------------------------------
Arnaldo Carvalho de Melo (2):
      perf tools: Emit more precise message for missing glibc static library
      perf tests: Show the inner make output when an error happens

 tools/perf/config/Makefile | 6 +++++-
 tools/perf/tests/make      | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

[PATCH 1/2] perf tools: Emit more precise message for missing glibc static library

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

When the user does:

  make -C tools/perf LDFLAGS=-static

asking for a static build, and the glibc-static (or equivalent) is not
found, the message wasn't clear, stating that one of glibc-devel or
glibc-static wasn't installed, clarify it checking if -static is
present in LDFLAGS.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-7e0sfobbzgeydzi9gsz8ss3m@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/config/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 4f100b54ba8b..f30ac5e5d271 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -299,7 +299,11 @@ else
       NO_LIBUNWIND := 1
       NO_LIBDW_DWARF_UNWIND := 1
     else
-      msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static);
+      ifneq ($(filter s% -static%,$(LDFLAGS),),)
+        msg := $(error No static glibc found, please install glibc-static);
+      else
+        msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]);
+      endif
     endif
   else
     ifndef NO_LIBDW_DWARF_UNWIND
-- 
1.9.3

[PATCH 2/2] perf tests: Show the inner make output when an error happens

[Arnaldo Carvalho de Melo]

From: Arnaldo Carvalho de Melo <acme@redhat.com>

Before:

  [acme@zoo linux]$ make -C tools/perf -f tests/make make_static
  make: Entering directory `/home/git/linux/tools/perf'
  - make_static: cd . && make -f Makefile DESTDIR=/tmp/tmp.JcWuM4Zu9f LDFLAGS=-static
  make: *** [make_static] Error 1
  make: Leaving directory `/home/git/linux/tools/perf'
  [acme@zoo linux]$

After:

  [acme@zoo linux]$ make -C tools/perf -f tests/make make_static
  make: Entering directory `/home/git/linux/tools/perf'
  - make_static: cd . && make -f Makefile DESTDIR=/tmp/tmp.X3su83i14u LDFLAGS=-static
  cd . && make -f Makefile DESTDIR=/tmp/tmp.X3su83i14u LDFLAGS=-static
    BUILD:   Doing 'make -j4' parallel build
  config/Makefile:303: *** No static glibc found, please install glibc-static.  Stop.
  make[1]: *** [all] Error 2
    test: test -x ./perf
  make: Leaving directory `/home/git/linux/tools/perf'
  [acme@zoo linux]$

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-s3ycajsl9n249n9e8gomfex5@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/tests/make | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 2f92d6e7ee00..c21db653b1f2 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -205,8 +205,7 @@ $(run):
 	( eval $$cmd ) >> $@ 2>&1; \
 	echo "  test: $(call test,$@)" >> $@ 2>&1; \
 	$(call test,$@) && \
-	rm -f $@ \
-	rm -rf $$TMP_DEST
+	rm -rf $@ $$TMP_DEST || cat $@
 
 $(run_O):
 	$(call clean)
-- 
1.9.3

Re: [PATCH 2/2] perf tests: Show the inner make output when an error happens

[Jiri Olsa]

On Fri, Jun 06, 2014 at 11:11:49AM -0300, Arnaldo Carvalho de Melo wrote:
> From: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> Before:
> 
>   [acme@zoo linux]$ make -C tools/perf -f tests/make make_static
>   make: Entering directory `/home/git/linux/tools/perf'
>   - make_static: cd . && make -f Makefile DESTDIR=/tmp/tmp.JcWuM4Zu9f LDFLAGS=-static
>   make: *** [make_static] Error 1
>   make: Leaving directory `/home/git/linux/tools/perf'
>   [acme@zoo linux]$
> 
> After:
> 
>   [acme@zoo linux]$ make -C tools/perf -f tests/make make_static
>   make: Entering directory `/home/git/linux/tools/perf'
>   - make_static: cd . && make -f Makefile DESTDIR=/tmp/tmp.X3su83i14u LDFLAGS=-static
>   cd . && make -f Makefile DESTDIR=/tmp/tmp.X3su83i14u LDFLAGS=-static
>     BUILD:   Doing 'make -j4' parallel build
>   config/Makefile:303: *** No static glibc found, please install glibc-static.  Stop.
>   make[1]: *** [all] Error 2
>     test: test -x ./perf
>   make: Leaving directory `/home/git/linux/tools/perf'
>   [acme@zoo linux]$
> 
> Cc: Adrian Hunter <adrian.hunter@intel.com>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Don Zickus <dzickus@redhat.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Mike Galbraith <efault@gmx.de>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Stephane Eranian <eranian@google.com>
> Link: http://lkml.kernel.org/n/tip-s3ycajsl9n249n9e8gomfex5@git.kernel.org
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> ---
>  tools/perf/tests/make | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tools/perf/tests/make b/tools/perf/tests/make
> index 2f92d6e7ee00..c21db653b1f2 100644
> --- a/tools/perf/tests/make
> +++ b/tools/perf/tests/make
> @@ -205,8 +205,7 @@ $(run):
>  	( eval $$cmd ) >> $@ 2>&1; \
>  	echo "  test: $(call test,$@)" >> $@ 2>&1; \
>  	$(call test,$@) && \
> -	rm -f $@ \
> -	rm -rf $$TMP_DEST
> +	rm -rf $@ $$TMP_DEST || cat $@

I like that we show the log, but we need to fail the target
so the processing is stopped and the rest is not executed,
like adding this:

    .... cat $@ && false
>  
>  $(run_O):
>  	$(call clean)

also you need to put same change to $(run_O) target

thanks,
jirka

Re: [GIT PULL 0/2] perf/tests improvements

[Jiri Olsa]

On Fri, Jun 06, 2014 at 11:11:47AM -0300, Arnaldo Carvalho de Melo wrote:
> Hi Jiri,
> 
> 	Experimenting with more topic branches, this time for things you're the
> are the original developer and de facto maintainer, the tools/perf/tests/ harness.
> 
> 	This was done on top of your perf/core branch, please let me know if all is
> ok and then you can try pulling from it or perhaps you could just ack it and then
> Ingo could pull it directly, opinions? Ingo?

either way works for me,

thanks,
jirka

Re: [GIT PULL 0/2] perf/tests improvements

[Arnaldo Carvalho de Melo]

Em Fri, Jun 06, 2014 at 04:51:11PM +0200, Jiri Olsa escreveu:
> On Fri, Jun 06, 2014 at 11:11:47AM -0300, Arnaldo Carvalho de Melo wrote:
> > Hi Jiri,
> > 
> > 	Experimenting with more topic branches, this time for things you're the
> > are the original developer and de facto maintainer, the tools/perf/tests/ harness.
> > 
> > 	This was done on top of your perf/core branch, please let me know if all is
> > ok and then you can try pulling from it or perhaps you could just ack it and then
> > Ingo could pull it directly, opinions? Ingo?
> 
> either way works for me,

Ok, I'll fix up the problem you mentioned and refresh the branch.

- Arnaldo

Re: [PATCH 2/2] perf tests: Show the inner make output when an error happens

[Arnaldo Carvalho de Melo]

Em Fri, Jun 06, 2014 at 04:50:23PM +0200, Jiri Olsa escreveu:
> On Fri, Jun 06, 2014 at 11:11:49AM -0300, Arnaldo Carvalho de Melo wrote:
> > From: Arnaldo Carvalho de Melo <acme@redhat.com>
> > +++ b/tools/perf/tests/make
> > @@ -205,8 +205,7 @@ $(run):
> >  	( eval $$cmd ) >> $@ 2>&1; \
> >  	echo "  test: $(call test,$@)" >> $@ 2>&1; \
> >  	$(call test,$@) && \
> > -	rm -f $@ \
> > -	rm -rf $$TMP_DEST
> > +	rm -rf $@ $$TMP_DEST || cat $@
 
> I like that we show the log, but we need to fail the target
> so the processing is stopped and the rest is not executed,
> like adding this:
 
>     .... cat $@ && false
  
> >  $(run_O):
> >  	$(call clean)
 
> also you need to put same change to $(run_O) target

Updated patch:

commit 40cb3da56c614bb3ea42ce4b99e379859d8be9a5
Author: Arnaldo Carvalho de Melo <acme@redhat.com>
Date:   Thu Jun 5 17:15:47 2014 -0300

    perf tests: Show the inner make output when an error happens
    
    Before:
    
      [acme@zoo linux]$ make -C tools/perf -f tests/make make_static
      make: Entering directory `/home/git/linux/tools/perf'
      - make_static: cd . && make -f Makefile DESTDIR=/tmp/tmp.JcWuM4Zu9f LDFLAGS=-static
      make: *** [make_static] Error 1
      make: Leaving directory `/home/git/linux/tools/perf'
      [acme@zoo linux]$
    
    After:
    
      [acme@zoo linux]$ make -C tools/perf -f tests/make make_static
      make: Entering directory `/home/git/linux/tools/perf'
      - make_static: cd . && make -f Makefile DESTDIR=/tmp/tmp.X3su83i14u LDFLAGS=-static
      cd . && make -f Makefile DESTDIR=/tmp/tmp.X3su83i14u LDFLAGS=-static
        BUILD:   Doing 'make -j4' parallel build
      config/Makefile:303: *** No static glibc found, please install glibc-static.  Stop.
      make[1]: *** [all] Error 2
        test: test -x ./perf
      make: Leaving directory `/home/git/linux/tools/perf'
      [acme@zoo linux]$
    
    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Don Zickus <dzickus@redhat.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/n/tip-h4kby5wyp6nfev3882rzm3r9@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 2f92d6e7ee00..69a71ff84e01 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -205,8 +205,7 @@ $(run):
 	( eval $$cmd ) >> $@ 2>&1; \
 	echo "  test: $(call test,$@)" >> $@ 2>&1; \
 	$(call test,$@) && \
-	rm -f $@ \
-	rm -rf $$TMP_DEST
+	rm -rf $@ $$TMP_DEST || (cat $@ ; false)
 
 $(run_O):
 	$(call clean)
@@ -217,9 +216,7 @@ $(run_O):
 	( eval $$cmd ) >> $@ 2>&1 && \
 	echo "  test: $(call test_O,$@)" >> $@ 2>&1; \
 	$(call test_O,$@) && \
-	rm -f $@ && \
-	rm -rf $$TMP_O \
-	rm -rf $$TMP_DEST
+	rm -rf $@ $$TMP_O $$TMP_DEST || (cat $@ ; false)
 
 tarpkg:
 	@cmd="$(PERF)/tests/perf-targz-src-pkg $(PERF)"; \

Re: [PATCH 1/2] perf tools: Emit more precise message for missing glibc static library

[Don Zickus]

Hi Arnaldo,

I am hijacking your thread for another Makefile problem.  It seems like
you were doing some cleanups here, so I wanted to throw another problem at
you. :-)

It seems the fedora-kernel guys found a multilib packaging problem and
posted a patch to clean it up.  It is from Kyle McMartin (copy-n-pasted).

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 802cf54..7f30bfa 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -621,8 +621,12 @@ endif
 ifeq ($(IS_X86_64),1)
 lib = lib64
 else
+ifdef MULTILIBDIR
+lib = $(MULTILIBDIR)
+else
 lib = lib
 endif
+endif
 libdir = $(prefix)/$(lib)

 # Shell quote (do not use $(call) to accommodate ancient setups);

Not sure if this is the right way to do this or if you had a better
solution.

Cheers,
Don

perf tools: MULTILIB install issues. was Re: [PATCH 1/2] perf tools: Emit more precise message for missing glibc static library

[Arnaldo Carvalho de Melo]

Em Tue, Jun 10, 2014 at 11:50:31AM -0400, Don Zickus escreveu:
> I am hijacking your thread for another Makefile problem.  It seems like
> you were doing some cleanups here, so I wanted to throw another problem at
> you. :-)

Yeah, I skimmed that discussion about our home grown autoconf
replacement 8-)
 
> It seems the fedora-kernel guys found a multilib packaging problem and
> posted a patch to clean it up.  It is from Kyle McMartin
> (copy-n-pasted).
 
> +++ b/tools/perf/config/Makefile
> @@ -621,8 +621,12 @@ endif
>  ifeq ($(IS_X86_64),1)
>  lib = lib64
>  else
> +ifdef MULTILIBDIR
> +lib = $(MULTILIBDIR)
> +else
>  lib = lib
>  endif
> +endif
>  libdir = $(prefix)/$(lib)
 
>  # Shell quote (do not use $(call) to accommodate ancient setups);

> Not sure if this is the right way to do this or if you had a better
> solution.

I'm unsure as well, but it looks like something that suits the needs of
distros, right? Anyone?

- Arnaldo