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

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Fri, Aug 21, 2015 at 10:05:58PM +0300, Adrian Hunter escreveu:
> On 21/08/2015 7:33 p.m., Arnaldo Carvalho de Melo wrote:
> >   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

> >From 8d36bfbc31c4a845b0a22b2dd4fcca86be7f0058 Mon Sep 17 00:00:00 2001
> From: Adrian Hunter <ajhunter@gmail.com>
> 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 <adrian.hunter@intel.com>
> ---
>  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
> 
> diff --git a/tools/perf/tests/perf-targz-src-pkg b/tools/perf/tests/perf-targz-src-pkg
> index 238aa39..261a912 100755
> --- a/tools/perf/tests/perf-targz-src-pkg
> +++ b/tools/perf/tests/perf-targz-src-pkg
> @@ -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
> diff --git a/tools/perf/util/intel-pt-decoder/inat.c b/tools/perf/util/intel-pt-decoder/inat.c
> index feeaa50..906d94a 100644
> --- a/tools/perf/util/intel-pt-decoder/inat.c
> +++ b/tools/perf/util/intel-pt-decoder/inat.c
> @@ -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"
> diff --git a/tools/perf/util/intel-pt-decoder/inat.h b/tools/perf/util/intel-pt-decoder/inat.h
> index 74a2e31..611645e 100644
> --- a/tools/perf/util/intel-pt-decoder/inat.h
> +++ b/tools/perf/util/intel-pt-decoder/inat.h
> @@ -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
> diff --git a/tools/perf/util/intel-pt-decoder/inat_types.h b/tools/perf/util/intel-pt-decoder/inat_types.h
> new file mode 100644
> index 0000000..cb3c20c
> --- /dev/null
> +++ b/tools/perf/util/intel-pt-decoder/inat_types.h
> @@ -0,0 +1,29 @@
> +#ifndef _ASM_X86_INAT_TYPES_H
> +#define _ASM_X86_INAT_TYPES_H
> +/*
> + * x86 instruction attributes
> + *
> + * Written by Masami Hiramatsu <mhiramat@redhat.com>
> + *
> + * 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
> diff --git a/tools/perf/util/intel-pt-decoder/insn.c b/tools/perf/util/intel-pt-decoder/insn.c
> index 8f72b33..47314a6 100644
> --- a/tools/perf/util/intel-pt-decoder/insn.c
> +++ b/tools/perf/util/intel-pt-decoder/insn.c
> @@ -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)	\
> diff --git a/tools/perf/util/intel-pt-decoder/insn.h b/tools/perf/util/intel-pt-decoder/insn.h
> index e7814b7..dd12da0 100644
> --- a/tools/perf/util/intel-pt-decoder/insn.h
> +++ b/tools/perf/util/intel-pt-decoder/insn.h
> @@ -21,7 +21,7 @@
>   */
>  
>  /* insn_attr_t is defined in inat.h */
> -#include <asm/inat.h>
> +#include "inat.h"
>  
>  struct insn_field {
>  	union {
> diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
> index 46980fc..9e4eb8f 100644
> --- a/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
> +++ b/tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
> @@ -20,7 +20,7 @@
>  
>  #include "event.h"
>  
> -#include <asm/insn.h>
> +#include "insn.h"
>  
>  #include "inat.c"
>  #include "insn.c"
> -- 
> 1.9.1
>