perf: make tarball broken by some file added by pt/bts

DISCUSSION Arnaldo Carvalho de Melo 3 participants 6 messages Aug 21, 2015 – Aug 28, 2015

Subsystems (2)

x86 perf events

lore

Share & tools

lore

Arnaldo Carvalho de Melo

author maintainer

2015-08-21 16:33 UTC #0 lore raw

CC util/scripting-engines/trace-event-python.o
CC util/intel-pt-decoder/intel-pt-insn-decoder.o
util/intel-pt-decoder/intel-pt-insn-decoder.c:23:22: fatal error:
asm/insn.h: No such file or directory

 #include <asm/insn.h>
                      ^

compilation terminated.
make[4]: *** [util/intel-pt-decoder/intel-pt-insn-decoder.o] Error 1 make[3]: *** [intel-pt-decoder] Error 2
make[3]: *** Waiting for unfinished jobs....
LD util/scripting-engines/libperf-in.o
make[2]: *** [util] Error 2
make[1]: *** [libperf-in.o] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [all] Error 2
make: Leaving directory `/tmp/tmp.hgx9LlqzIn/perf-4.2.0-rc7/tools/perf' [acme@felicio linux]$

I'll fix this after lunch, but please try:

make -C tools/perf build-test

Before pushing patches :-)

In this case this failed:

<SNIP>
- make_minimal_O: cd . && make -f Makefile O=/tmp/tmp.FfxP61RpEW DESTDIR=/tmp/tmp.4o7LkgFCKh NO_LIBPERL=1 NO_LIBPYTHON=1 NO_NEWT=1 NO_GTK2=1 NO_DEMANGLE=1 NO_LIBELF=1 NO_LIBUNWIND=1 NO_BACKTRACE=1 NO_LIBNUMA=1 NO_LIBAUDIT=1 NO_LIBBIONIC=1 NO_LIBDW_DWARF_UNWIND=1 NO_AUXTRACE=1
- make_static_O: cd . && make -f Makefile O=/tmp/tmp.4kh7c73Ymv DESTDIR=/tmp/tmp.k6c2XzIPgB LDFLAGS=-static
- make_tags_O: cd . && make -f Makefile O=/tmp/tmp.uPISETPX1e DESTDIR=/tmp/tmp.LT7sZE4jbt tags
- make_cscope_O: cd . && make -f Makefile O=/tmp/tmp.iTI7eBbUhb DESTDIR=/tmp/tmp.ljYFf2oiTp cscope
- tarpkg: ./tests/perf-targz-src-pkg .
make[2]: *** [tarpkg] Error 2
make[1]: *** [all] Error 2
make: *** [build-test] Error 2
make: Leaving directory `/home/acme/git/linux/tools/perf'

We need to improve this, but to see the problem I've been doing:

cp tools/perf/tests/perf-targz-src-pkg /tmp

then editing the local copy to remove the output redirection to NULL for
the make command, the test uses just the exit return :-\

- Arnaldo

Adrian Hunter

reviewer

2015-08-21 19:06 UTC #1 lore raw

Quoted 7 lines · Arnaldo Carvalho de Melo

CC util/scripting-engines/trace-event-python.o
CC util/intel-pt-decoder/intel-pt-insn-decoder.o
util/intel-pt-decoder/intel-pt-insn-decoder.c:23:22: fatal error:
asm/insn.h: No such file or directory
  #include <asm/insn.h>
                       ^
compilation terminated.

Here is what I found was needed

Quoted 1 line

From 8d36bfbc31c4a845b0a22b2dd4fcca86be7f0058 Mon Sep 17 00:00:00 2001

From: Adrian Hunter <[email protected]>
Date: Fri, 21 Aug 2015 21:57:42 +0300
Subject: [PATCH] perf tools: Fix tarball build broken by pt/bts

Fix some include paths and add missing inat_types.h.

Signed-off-by Adrian Hunter <[email protected]>

---
 tools/perf/tests/perf-targz-src-pkg                |  2 +-
 tools/perf/util/intel-pt-decoder/inat.c            |  2 +-
 tools/perf/util/intel-pt-decoder/inat.h            |  2 +-
 tools/perf/util/intel-pt-decoder/inat_types.h      | 29 ++++++++++++++++++++++
 tools/perf/util/intel-pt-decoder/insn.c            |  4 +--
 tools/perf/util/intel-pt-decoder/insn.h            |  2 +-
 .../util/intel-pt-decoder/intel-pt-insn-decoder.c  |  2 +-
 7 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 tools/perf/util/intel-pt-decoder/inat_types.h

tools/perf/tests/perf-targz-src-pkg +1 -1

index 238aa39..261a912 100755
@@ -17,5 +17,5 @@ rm -f ${TARBALL}
 cd - > /dev/null
 make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1
 RC=$?
-rm -rf ${TMP_DEST}
+#rm -rf ${TMP_DEST}
 exit $RC

tools/perf/util/intel-pt-decoder/inat.c +1 -1

index feeaa50..906d94a 100644
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <asm/insn.h>
+#include "insn.h"
 
 /* Attribute tables are generated from opcode map */
 #include "inat-tables.c"

tools/perf/util/intel-pt-decoder/inat.h +1 -1

index 74a2e31..611645e 100644
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <asm/inat_types.h>
+#include "inat_types.h"
 
 /*
  * Internal bits. Don't use bitmasks directly, because these bits are

tools/perf/util/intel-pt-decoder/inat_types.h new file +29 -0

new file mode 100644
index 0000000..cb3c20c
@@ -0,0 +1,29 @@
+#ifndef _ASM_X86_INAT_TYPES_H
+#define _ASM_X86_INAT_TYPES_H
+/*
+ * x86 instruction attributes
+ *
+ * Written by Masami Hiramatsu <[email protected]>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+/* Instruction attributes */
+typedef unsigned int insn_attr_t;
+typedef unsigned char insn_byte_t;
+typedef signed int insn_value_t;
+
+#endif

tools/perf/util/intel-pt-decoder/insn.c +2 -2

index 8f72b33..47314a6 100644
@@ -23,8 +23,8 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h>
-#include <asm/insn.h>
+#include "inat.h"
+#include "insn.h"
 
 /* Verify next sizeof(t) bytes can be on the same instruction */
 #define validate_next(t, insn, n)	\

tools/perf/util/intel-pt-decoder/insn.h +1 -1

index e7814b7..dd12da0 100644
@@ -21,7 +21,7 @@
  */
 
 /* insn_attr_t is defined in inat.h */
-#include <asm/inat.h>
+#include "inat.h"
 
 struct insn_field {
 	union {

tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c +1 -1

index 46980fc..9e4eb8f 100644
@@ -20,7 +20,7 @@
 
 #include "event.h"
 
-#include <asm/insn.h>
+#include "insn.h"
 
 #include "inat.c"
 #include "insn.c"

Signature · 1 line

1.9.1

Adrian Hunter

reviewer

2015-08-21 19:08 UTC #2 lore raw

Quoted 38 lines · Adrian Hunter

Quoted 7 lines · Arnaldo Carvalho de Melo
CC util/scripting-engines/trace-event-python.o
CC util/intel-pt-decoder/intel-pt-insn-decoder.o
util/intel-pt-decoder/intel-pt-insn-decoder.c:23:22: fatal error:
asm/insn.h: No such file or directory
  #include <asm/insn.h>
                       ^
compilation terminated.
Here is what I found was needed
0001-perf-tools-Fix-tarball-build-broken-by-pt-bts.patch
From 8d36bfbc31c4a845b0a22b2dd4fcca86be7f0058 Mon Sep 17 00:00:00 2001
From: Adrian Hunter<[email protected]>
Date: Fri, 21 Aug 2015 21:57:42 +0300
Subject: [PATCH] perf tools: Fix tarball build broken by pt/bts
Fix some include paths and add missing inat_types.h.
Signed-off-by Adrian Hunter<[email protected]>
---
  tools/perf/tests/perf-targz-src-pkg                |  2 +-
  tools/perf/util/intel-pt-decoder/inat.c            |  2 +-
  tools/perf/util/intel-pt-decoder/inat.h            |  2 +-
  tools/perf/util/intel-pt-decoder/inat_types.h      | 29 ++++++++++++++++++++++
  tools/perf/util/intel-pt-decoder/insn.c            |  4 +--
  tools/perf/util/intel-pt-decoder/insn.h            |  2 +-
  .../util/intel-pt-decoder/intel-pt-insn-decoder.c  |  2 +-
  7 files changed, 36 insertions(+), 7 deletions(-)
create mode 100644 tools/perf/util/intel-pt-decoder/inat_types.h
tools/perf/tests/perf-targz-src-pkg +0 -0
index 238aa39..261a912 100755

tools/perf/tests/perf-targz-src-pkg rm -f ${TARBALL} · line 20

Quoted 5 lines

tools/perf/tests/perf-targz-src-pkg +1 -1

@@ -17,5 +17,5 @@ rm -f ${TARBALL}
  cd - > /dev/null
  make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1
  RC=$?
-rm -rf ${TMP_DEST}
+#rm -rf ${TMP_DEST}

Err, not that bit though.

Arnaldo Carvalho de Melo

author maintainer

2015-08-21 19:51 UTC #4 lore raw

In reply to Adrian Hunter

Em Fri, Aug 21, 2015 at 10:05:58PM +0300, Adrian Hunter escreveu:

Quoted 10 lines · Arnaldo Carvalho de Melo

Quoted 7 lines
CC util/scripting-engines/trace-event-python.o
CC util/intel-pt-decoder/intel-pt-insn-decoder.o
util/intel-pt-decoder/intel-pt-insn-decoder.c:23:22: fatal error:
asm/insn.h: No such file or directory
 #include <asm/insn.h>
                      ^
compilation terminated.
Here is what I found was needed

Thanks for the prompt reply, testing.

- Arnaldo

Quoted 135 lines

Quoted 1 line

From 8d36bfbc31c4a845b0a22b2dd4fcca86be7f0058 Mon Sep 17 00:00:00 2001

From: Adrian Hunter <[email protected]>
Date: Fri, 21 Aug 2015 21:57:42 +0300
Subject: [PATCH] perf tools: Fix tarball build broken by pt/bts

Fix some include paths and add missing inat_types.h.

Signed-off-by Adrian Hunter <[email protected]>

---
 tools/perf/tests/perf-targz-src-pkg                |  2 +-
 tools/perf/util/intel-pt-decoder/inat.c            |  2 +-
 tools/perf/util/intel-pt-decoder/inat.h            |  2 +-
 tools/perf/util/intel-pt-decoder/inat_types.h      | 29 ++++++++++++++++++++++
 tools/perf/util/intel-pt-decoder/insn.c            |  4 +--
 tools/perf/util/intel-pt-decoder/insn.h            |  2 +-
 .../util/intel-pt-decoder/intel-pt-insn-decoder.c  |  2 +-
 7 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 tools/perf/util/intel-pt-decoder/inat_types.h

tools/perf/tests/perf-targz-src-pkg +1 -1

index 238aa39..261a912 100755
@@ -17,5 +17,5 @@ rm -f ${TARBALL}
 cd - > /dev/null
 make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1
 RC=$?
-rm -rf ${TMP_DEST}
+#rm -rf ${TMP_DEST}
 exit $RC

tools/perf/util/intel-pt-decoder/inat.c +1 -1

index feeaa50..906d94a 100644
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <asm/insn.h>
+#include "insn.h"
 
 /* Attribute tables are generated from opcode map */
 #include "inat-tables.c"

tools/perf/util/intel-pt-decoder/inat.h +1 -1

index 74a2e31..611645e 100644
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <asm/inat_types.h>
+#include "inat_types.h"
 
 /*
  * Internal bits. Don't use bitmasks directly, because these bits are

tools/perf/util/intel-pt-decoder/inat_types.h new file +29 -0

new file mode 100644
index 0000000..cb3c20c
@@ -0,0 +1,29 @@
+#ifndef _ASM_X86_INAT_TYPES_H
+#define _ASM_X86_INAT_TYPES_H
+/*
+ * x86 instruction attributes
+ *
+ * Written by Masami Hiramatsu <[email protected]>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+/* Instruction attributes */
+typedef unsigned int insn_attr_t;
+typedef unsigned char insn_byte_t;
+typedef signed int insn_value_t;
+
+#endif

tools/perf/util/intel-pt-decoder/insn.c +2 -2

index 8f72b33..47314a6 100644
@@ -23,8 +23,8 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h>
-#include <asm/insn.h>
+#include "inat.h"
+#include "insn.h"
 
 /* Verify next sizeof(t) bytes can be on the same instruction */
 #define validate_next(t, insn, n)	\

tools/perf/util/intel-pt-decoder/insn.h +1 -1

index e7814b7..dd12da0 100644
@@ -21,7 +21,7 @@
  */
 
 /* insn_attr_t is defined in inat.h */
-#include <asm/inat.h>
+#include "inat.h"
 
 struct insn_field {
 	union {

tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c +1 -1

index 46980fc..9e4eb8f 100644
@@ -20,7 +20,7 @@
 
 #include "event.h"
 
-#include <asm/insn.h>
+#include "insn.h"
 
 #include "inat.c"
 #include "insn.c"

Signature · 1 line

1.9.1

Arnaldo Carvalho de Melo

author maintainer

2015-08-21 19:53 UTC #3 lore raw

In reply to Adrian Hunter

Em Fri, Aug 21, 2015 at 10:08:06PM +0300, Adrian Hunter escreveu:

Quoted 34 lines · Adrian Hunter

Quoted 33 lines · Arnaldo Carvalho de Melo
Quoted 7 lines
CC util/scripting-engines/trace-event-python.o
CC util/intel-pt-decoder/intel-pt-insn-decoder.o
util/intel-pt-decoder/intel-pt-insn-decoder.c:23:22: fatal error:
asm/insn.h: No such file or directory
 #include <asm/insn.h>
                      ^
compilation terminated.
Here is what I found was needed
0001-perf-tools-Fix-tarball-build-broken-by-pt-bts.patch
From 8d36bfbc31c4a845b0a22b2dd4fcca86be7f0058 Mon Sep 17 00:00:00 2001
From: Adrian Hunter<[email protected]>
Date: Fri, 21 Aug 2015 21:57:42 +0300
Subject: [PATCH] perf tools: Fix tarball build broken by pt/bts
Fix some include paths and add missing inat_types.h.
Signed-off-by Adrian Hunter<[email protected]>
---
 tools/perf/tests/perf-targz-src-pkg                |  2 +-
 tools/perf/util/intel-pt-decoder/inat.c            |  2 +-
 tools/perf/util/intel-pt-decoder/inat.h            |  2 +-
 tools/perf/util/intel-pt-decoder/inat_types.h      | 29 ++++++++++++++++++++++
 tools/perf/util/intel-pt-decoder/insn.c            |  4 +--
 tools/perf/util/intel-pt-decoder/insn.h            |  2 +-
 .../util/intel-pt-decoder/intel-pt-insn-decoder.c  |  2 +-
 7 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 tools/perf/util/intel-pt-decoder/inat_types.h

Quoted 12 lines

tools/perf/tests/perf-targz-src-pkg rm -f ${TARBALL} · line 20
Quoted 10 lines
tools/perf/tests/perf-targz-src-pkg +1 -1
index 238aa39..261a912 100755
@@ -17,5 +17,5 @@ rm -f ${TARBALL}
 cd - > /dev/null
 make -C $TMP_DEST/perf*/tools/perf > /dev/null 2>&1
 RC=$?
-rm -rf ${TMP_DEST}
+#rm -rf ${TMP_DEST}
Err, not that bit though.

I noticed that, removing, but that needs to be echoed in case of failure, deleted otherwise :)

- Arnaldo

tip-bot for Adrian Hunter

merge bot

2015-08-28 06:36 UTC #5 lore raw

[tip:perf/core] perf tools: Fix tarball build broken by pt/bts

In reply to Adrian Hunter

perf tools: Fix tarball build broken by pt/bts

Commit-ID:  5839a5506de30c23d4cfaf49755cd294f5c48368
Gitweb:     http://git.kernel.org/tip/5839a5506de30c23d4cfaf49755cd294f5c48368
Author:     Adrian Hunter <[email protected]>
AuthorDate: Fri, 21 Aug 2015 22:05:58 +0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Sat, 22 Aug 2015 12:27:07 -0300

perf tools: Fix tarball build broken by pt/bts

Fix some include paths and add missing inat_types.h.

Reported-by Arnaldo Carvalho de Melo <[email protected]>

Signed-off-by Adrian Hunter <[email protected]>

Cc Jiri Olsa <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/intel-pt-decoder/inat.c                               | 2 +-
 tools/perf/util/intel-pt-decoder/inat.h                               | 2 +-
 .../x86/include/asm => tools/perf/util/intel-pt-decoder}/inat_types.h | 0
 tools/perf/util/intel-pt-decoder/insn.c                               | 4 ++--
 tools/perf/util/intel-pt-decoder/insn.h                               | 2 +-
 tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c              | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

tools/perf/util/intel-pt-decoder/inat.c +1 -1

index feeaa50..906d94a 100644
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <asm/insn.h>
+#include "insn.h"
 
 /* Attribute tables are generated from opcode map */
 #include "inat-tables.c"

tools/perf/util/intel-pt-decoder/inat.h +1 -1

index 74a2e31..611645e 100644
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  */
-#include <asm/inat_types.h>
+#include "inat_types.h"
 
 /*
  * Internal bits. Don't use bitmasks directly, because these bits are

tools/perf/util/intel-pt-decoder/inat_types.h renamed from arch/x86/include/asm/inat_types.h +0 -0

similarity index 100%
copy from arch/x86/include/asm/inat_types.h
copy to tools/perf/util/intel-pt-decoder/inat_types.h

tools/perf/util/intel-pt-decoder/insn.c +2 -2

index 8f72b33..47314a6 100644
@@ -23,8 +23,8 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h>
-#include <asm/insn.h>
+#include "inat.h"
+#include "insn.h"
 
 /* Verify next sizeof(t) bytes can be on the same instruction */
 #define validate_next(t, insn, n)	\

tools/perf/util/intel-pt-decoder/insn.h +1 -1

index e7814b7..dd12da0 100644
@@ -21,7 +21,7 @@
  */
 
 /* insn_attr_t is defined in inat.h */
-#include <asm/inat.h>
+#include "inat.h"
 
 struct insn_field {
 	union {

tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c +1 -1

index 46980fc..9e4eb8f 100644
@@ -20,7 +20,7 @@
 
 #include "event.h"
 
-#include <asm/insn.h>
+#include "insn.h"
 
 #include "inat.c"
 #include "insn.c"