linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL 0/6] perf/urgent fixes
@ 2019-12-05 19:32 Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 1/6] perf report/top TUI: Replace pr_err() with ui__error() Arnaldo Carvalho de Melo
                   ` (7 more replies)
  0 siblings, 8 replies; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-05 19:32 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner
  Cc: Jiri Olsa, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Arnaldo Carvalho de Melo, Adrian Hunter,
	Ravi Bangoria, Arnaldo Carvalho de Melo

Hi Ingo/Thomas,

	Please consider pulling,

Best regards,

- Arnaldo

Test results at the end of this message, as usual.

The following changes since commit 9f58c93efdffc2cba91fdcee010b3e5e8860334d:

  Merge tag 'perf-core-for-mingo-5.5-20191203' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2019-12-04 08:49:52 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-5.5-20191205

for you to fetch changes up to fd9bee5e24141d00e23b66d1b51bc759efa7e3fe:

  tools headers UAPI: Update tools's copy of drm.h headers (2019-12-04 16:22:38 -0300)

----------------------------------------------------------------
perf inject:

  Adrian Hunter:

  - Fix processing of ID index for injected instruction tracing

perf report:

  Ravi Bangoria:

  - Replace pr_err() with ui__error(), so that we can see the output
    in the TUI mode instead of showing and immediately restoring the
    screen to the state before perf was started.

  - Don't start --mem-mode/--branch-mode mode if required samples are not
    available.

tools headers UAPI:

  Arnaldo Carvalho de Melo:

  - Sync drm/i915_drm.h with the kernel sources

  - Update tools's copy of drm.h headers.

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

----------------------------------------------------------------
Adrian Hunter (1):
      perf inject: Fix processing of ID index for injected instruction tracing

Arnaldo Carvalho de Melo (2):
      tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
      tools headers UAPI: Update tools's copy of drm.h headers

Ravi Bangoria (3):
      perf report/top TUI: Replace pr_err() with ui__error()
      perf report: Make -F more strict like -s
      perf report: Bail out --mem-mode if mem info is not available

 tools/include/uapi/drm/drm.h      |   3 +-
 tools/include/uapi/drm/i915_drm.h | 128 +++++++++++++++++++++++++++++++++++++-
 tools/perf/builtin-inject.c       |  13 +---
 tools/perf/builtin-report.c       |   8 +++
 tools/perf/util/sort.c            |  16 +++--
 5 files changed, 147 insertions(+), 21 deletions(-)

Test results:

The first ones are container based builds of tools/perf with and without libelf
support.  Where clang is available, it is also used to build perf with/without
libelf, and building with LIBCLANGLLVM=1 (built-in clang) with gcc and clang
when clang and its devel libraries are installed.

The objtool and samples/bpf/ builds are disabled now that I'm switching from
using the sources in a local volume to fetching them from a http server to
build it inside the container, to make it easier to build in a container cluster.
Those will come back later.

Several are cross builds, the ones with -x-ARCH and the android one, and those
may not have all the features built, due to lack of multi-arch devel packages,
available and being used so far on just a few, like
debian:experimental-x-{arm64,mipsel}.

The 'perf test' one will perform a variety of tests exercising
tools/perf/util/, tools/lib/{bpf,traceevent,etc}, as well as run perf commands
with a variety of command line event specifications to then intercept the
sys_perf_event syscall to check that the perf_event_attr fields are set up as
expected, among a variety of other unit tests.

Then there is the 'make -C tools/perf build-test' ones, that build tools/perf/
with a variety of feature sets, exercising the build with an incomplete set of
features as well as with a complete one. It is planned to have it run on each
of the containers mentioned above, using some container orchestration
infrastructure. Get in contact if interested in helping having this in place.

Clearlinux is failing when building with libpython, but that is not a perf
regression, will try to remove one compiler warning that is causing the problem
when building some of the glue code files in the python files, outside perf.

OpenMandriva Cooker works well with gcc, uncovers a bug where we have to
get compiler-clang.h from the kernel sources, will be fixed soon.

With the update of linux/linkage.h to move from ENTRY()/ENDPROC() to
SYM_FUNC_START()/etc some of the older containers can't be used with clang,
as the minimum version for the constructs used in the new linkage.h is 3.5,
older versions (3.4, 3.4.2, etc) end up with:

  bench/../../arch/x86/lib/memcpy_64.S:44:14: error: unexpected token in '.type' directive
  .type MEMCPY STT_FUNC ; .size MEMCPY, .-MEMCPY
               ^

Finally the build-tests and container tests were performed with the following
two fixes (different sha, same contents), that are not in this patch series,
will go thru the bpf/net trees.

The 'perf test' was performed with what is in this series tho.

  $ git log --oneline -2
  e1bc15a8e7d1 (HEAD -> perf/core) libbpf: Use PRIu64 for sym->st_value to fix build on 32-bit arches
  0d0f9df96c5a libbpf: Fix up generation of bpf_helper_defs.h
  $ 

  # export PERF_TARBALL=http://192.168.124.1/perf/perf-5.4.0.tar.xz
  # dm 
   1 alpine:3.4                    : Ok   gcc (Alpine 5.3.0) 5.3.0, clang version 3.8.0 (tags/RELEASE_380/final)
   2 alpine:3.5                    : Ok   gcc (Alpine 6.2.1) 6.2.1 20160822, clang version 3.8.1 (tags/RELEASE_381/final)
   3 alpine:3.6                    : Ok   gcc (Alpine 6.3.0) 6.3.0, clang version 4.0.0 (tags/RELEASE_400/final)
   4 alpine:3.7                    : Ok   gcc (Alpine 6.4.0) 6.4.0, Alpine clang version 5.0.0 (tags/RELEASE_500/final) (based on LLVM 5.0.0)
   5 alpine:3.8                    : Ok   gcc (Alpine 6.4.0) 6.4.0, Alpine clang version 5.0.1 (tags/RELEASE_501/final) (based on LLVM 5.0.1)
   6 alpine:3.9                    : Ok   gcc (Alpine 8.3.0) 8.3.0, Alpine clang version 5.0.1 (tags/RELEASE_502/final) (based on LLVM 5.0.1)
   7 alpine:3.10                   : Ok   gcc (Alpine 8.3.0) 8.3.0, Alpine clang version 8.0.0 (tags/RELEASE_800/final) (based on LLVM 8.0.0)
   8 alpine:edge                   : Ok   gcc (Alpine 9.2.0) 9.2.0, Alpine clang version 9.0.0 (git://git.alpinelinux.org/aports 25c73ae7b95bdb42ae5f0ceac3b703e766582527) (based on LLVM 9.0.0)
   9 amazonlinux:1                 : Ok   gcc (GCC) 7.2.1 20170915 (Red Hat 7.2.1-2), clang version 3.6.2 (tags/RELEASE_362/final)
  10 amazonlinux:2                 : Ok   gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6), clang version 7.0.1 (Amazon Linux 2 7.0.1-1.amzn2.0.2)
  11 android-ndk:r12b-arm          : Ok   arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease)
  12 android-ndk:r15c-arm          : Ok   arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease)
  13 centos:5                      : Ok   gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55)
  14 centos:6                      : Ok   gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23)
  15 centos:7                      : Ok   gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-39)
  16 centos:8                      : Ok   gcc (GCC) 8.2.1 20180905 (Red Hat 8.2.1-3), clang version 7.0.1 (tags/RELEASE_701/final)
  17 clearlinux:latest             : FAIL gcc (Clear Linux OS for Intel Architecture) 9.2.1 20191125 gcc-9-branch@278689, clang version 9.0.0 (tags/RELEASE_900/final)
  18 debian:8                      : Ok   gcc (Debian 4.9.2-10+deb8u2) 4.9.2, Debian clang version 3.5.0-10 (tags/RELEASE_350/final) (based on LLVM 3.5.0)
  19 debian:9                      : Ok   gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, clang version 3.8.1-24 (tags/RELEASE_381/final)
  20 debian:10                     : Ok   gcc (Debian 8.3.0-6) 8.3.0, clang version 7.0.1-8 (tags/RELEASE_701/final)
  21 debian:experimental           : Ok   gcc (Debian 9.2.1-19) 9.2.1 20191109, clang version 8.0.1-4 (tags/RELEASE_801/final)
  22 debian:experimental-x-arm64   : Ok   aarch64-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0
  23 debian:experimental-x-mips    : Ok   mips-linux-gnu-gcc (Debian 8.3.0-19) 8.3.0
  24 debian:experimental-x-mips64  : Ok   mips64-linux-gnuabi64-gcc (Debian 9.2.1-8) 9.2.1 20190909
  25 debian:experimental-x-mipsel  : Ok   mipsel-linux-gnu-gcc (Debian 9.2.1-8) 9.2.1 20190909
  26 fedora:20                     : Ok   gcc (GCC) 4.8.3 20140911 (Red Hat 4.8.3-7)
  27 fedora:22                     : Ok   gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.5.0 (tags/RELEASE_350/final)
  28 fedora:23                     : Ok   gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6), clang version 3.7.0 (tags/RELEASE_370/final)
  29 fedora:24                     : Ok   gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1), clang version 3.8.1 (tags/RELEASE_381/final)
  30 fedora:24-x-ARC-uClibc        : Ok   arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710
  31 fedora:25                     : Ok   gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1), clang version 3.9.1 (tags/RELEASE_391/final)
  32 fedora:26                     : Ok   gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2), clang version 4.0.1 (tags/RELEASE_401/final)
  33 fedora:27                     : Ok   gcc (GCC) 7.3.1 20180712 (Red Hat 7.3.1-6), clang version 5.0.2 (tags/RELEASE_502/final)
  34 fedora:28                     : Ok   gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 6.0.1 (tags/RELEASE_601/final)
  35 fedora:29                     : Ok   gcc (GCC) 8.3.1 20190223 (Red Hat 8.3.1-2), clang version 7.0.1 (Fedora 7.0.1-6.fc29)
  36 fedora:30                     : Ok   gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 8.0.0 (Fedora 8.0.0-3.fc30)
  37 fedora:30-x-ARC-glibc         : Ok   arc-linux-gcc (ARC HS GNU/Linux glibc toolchain 2019.03-rc1) 8.3.1 20190225
  38 fedora:30-x-ARC-uClibc        : Ok   arc-linux-gcc (ARCv2 ISA Linux uClibc toolchain 2019.03-rc1) 8.3.1 20190225
  39 fedora:31                     : Ok   gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 9.0.0 (Fedora 9.0.0-1.fc31)
  40 fedora:32                     : Ok   gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 9.0.0 (Fedora 9.0.0-1.fc32)
  41 fedora:rawhide                : Ok   gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 9.0.0 (Fedora 9.0.0-1.fc32)
  42 gentoo-stage3-amd64:latest    : Ok   gcc (Gentoo 9.2.0-r2 p3) 9.2.0
  43 mageia:5                      : Ok   gcc (GCC) 4.9.2, clang version 3.5.2 (tags/RELEASE_352/final)
  44 mageia:6                      : Ok   gcc (Mageia 5.5.0-1.mga6) 5.5.0, clang version 3.9.1 (tags/RELEASE_391/final)
  45 mageia:7                      : Ok   gcc (Mageia 8.3.1-0.20190524.1.mga7) 8.3.1 20190524, clang version 8.0.0 (Mageia 8.0.0-1.mga7)
  46 manjaro:latest                : Ok   gcc (GCC) 9.2.0, clang version 9.0.0 (tags/RELEASE_900/final)
  47 openmandriva:cooker           : Ok   gcc (GCC) 9.2.1 20191123 (OpenMandriva)
  48 opensuse:15.0                 : Ok   gcc (SUSE Linux) 7.4.1 20190424 [gcc-7-branch revision 270538], clang version 5.0.1 (tags/RELEASE_501/final 312548)
  49 opensuse:15.1                 : Ok   gcc (SUSE Linux) 7.4.1 20190905 [gcc-7-branch revision 275407], clang version 7.0.1 (tags/RELEASE_701/final 349238)
  50 opensuse:15.2                 : Ok   gcc (SUSE Linux) 7.4.1 20190905 [gcc-7-branch revision 275407], clang version 7.0.1 (tags/RELEASE_701/final 349238)
  51 opensuse:42.3                 : Ok   gcc (SUSE Linux) 4.8.5, clang version 3.8.0 (tags/RELEASE_380/final 262553)
  52 opensuse:tumbleweed           : Ok   gcc (SUSE Linux) 9.2.1 20190903 [gcc-9-branch revision 275330], clang version 9.0.0 (tags/RELEASE_900/final 372316)
  53 oraclelinux:6                 : Ok   gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23.0.1)
  54 oraclelinux:7                 : Ok   gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-39.0.3)
  55 oraclelinux:8                 : Ok   gcc (GCC) 8.2.1 20180905 (Red Hat 8.2.1-3.0.1), clang version 7.0.1 (tags/RELEASE_701/final)
  56 ubuntu:12.04                  : Ok   gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3, Ubuntu clang version 3.0-6ubuntu3 (tags/RELEASE_30/final) (based on LLVM 3.0)
  57 ubuntu:14.04                  : Ok   gcc (Ubuntu 4.8.4-2ubuntu1~14.04.4) 4.8.4
  58 ubuntu:16.04                  : Ok   gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609, clang version 3.8.0-2ubuntu4 (tags/RELEASE_380/final)
  59 ubuntu:16.04-x-arm            : Ok   arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
  60 ubuntu:16.04-x-arm64          : Ok   aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
  61 ubuntu:16.04-x-powerpc        : Ok   powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
  62 ubuntu:16.04-x-powerpc64      : Ok   powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
  63 ubuntu:16.04-x-powerpc64el    : Ok   powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
  64 ubuntu:16.04-x-s390           : Ok   s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609
  65 ubuntu:18.04                  : Ok   gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0, clang version 6.0.0-1ubuntu2 (tags/RELEASE_600/final)
  66 ubuntu:18.04-x-arm            : Ok   arm-linux-gnueabihf-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0
  67 ubuntu:18.04-x-arm64          : Ok   aarch64-linux-gnu-gcc (Ubuntu/Linaro 7.4.0-1ubuntu1~18.04.1) 7.4.0
  68 ubuntu:18.04-x-m68k           : Ok   m68k-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
  69 ubuntu:18.04-x-powerpc        : Ok   powerpc-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
  70 ubuntu:18.04-x-powerpc64      : Ok   powerpc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
  71 ubuntu:18.04-x-powerpc64el    : Ok   powerpc64le-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
  72 ubuntu:18.04-x-riscv64        : Ok   riscv64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
  73 ubuntu:18.04-x-s390           : Ok   s390x-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
  74 ubuntu:18.04-x-sh4            : Ok   sh4-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
  75 ubuntu:18.04-x-sparc64        : Ok   sparc64-linux-gnu-gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
  76 ubuntu:18.10                  : Ok   gcc (Ubuntu 8.3.0-6ubuntu1~18.10.1) 8.3.0, clang version 7.0.0-3 (tags/RELEASE_700/final)
  77 ubuntu:19.04                  : Ok   gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0, clang version 8.0.0-3 (tags/RELEASE_800/final)
  78 ubuntu:19.04-x-alpha          : Ok   alpha-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0
  79 ubuntu:19.04-x-arm64          : Ok   aarch64-linux-gnu-gcc (Ubuntu/Linaro 8.3.0-6ubuntu1) 8.3.0
  80 ubuntu:19.04-x-hppa           : Ok   hppa-linux-gnu-gcc (Ubuntu 8.3.0-6ubuntu1) 8.3.0
  81 ubuntu:19.10                  : Ok   gcc (Ubuntu 9.2.1-9ubuntu2) 9.2.1 20191008, clang version 9.0.0-2 (tags/RELEASE_900/final)

  # uname -a
  Linux quaco 5.3.14-200.fc30.x86_64 #1 SMP Mon Dec 2 15:57:50 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
  # git log --oneline -1
  fd9bee5e2414 tools headers UAPI: Update tools's copy of drm.h headers
  # perf version --build-options
  perf version 5.4.gfd9bee5e2414
                   dwarf: [ on  ]  # HAVE_DWARF_SUPPORT
      dwarf_getlocations: [ on  ]  # HAVE_DWARF_GETLOCATIONS_SUPPORT
                   glibc: [ on  ]  # HAVE_GLIBC_SUPPORT
                    gtk2: [ on  ]  # HAVE_GTK2_SUPPORT
           syscall_table: [ on  ]  # HAVE_SYSCALL_TABLE_SUPPORT
                  libbfd: [ on  ]  # HAVE_LIBBFD_SUPPORT
                  libelf: [ on  ]  # HAVE_LIBELF_SUPPORT
                 libnuma: [ on  ]  # HAVE_LIBNUMA_SUPPORT
  numa_num_possible_cpus: [ on  ]  # HAVE_LIBNUMA_SUPPORT
                 libperl: [ on  ]  # HAVE_LIBPERL_SUPPORT
               libpython: [ on  ]  # HAVE_LIBPYTHON_SUPPORT
                libslang: [ on  ]  # HAVE_SLANG_SUPPORT
               libcrypto: [ on  ]  # HAVE_LIBCRYPTO_SUPPORT
               libunwind: [ on  ]  # HAVE_LIBUNWIND_SUPPORT
      libdw-dwarf-unwind: [ on  ]  # HAVE_DWARF_SUPPORT
                    zlib: [ on  ]  # HAVE_ZLIB_SUPPORT
                    lzma: [ on  ]  # HAVE_LZMA_SUPPORT
               get_cpuid: [ on  ]  # HAVE_AUXTRACE_SUPPORT
                     bpf: [ on  ]  # HAVE_LIBBPF_SUPPORT
                     aio: [ on  ]  # HAVE_AIO_SUPPORT
                    zstd: [ on  ]  # HAVE_ZSTD_SUPPORT
  # perf test
   1: vmlinux symtab matches kallsyms                       : Ok
   2: Detect openat syscall event                           : Ok
   3: Detect openat syscall event on all cpus               : Ok
   4: Read samples using the mmap interface                 : Ok
   5: Test data source output                               : Ok
   6: Parse event definition strings                        : Ok
   7: Simple expression parser                              : Ok
   8: PERF_RECORD_* events & perf_sample fields             : Ok
   9: Parse perf pmu format                                 : Ok
  10: DSO data read                                         : Ok
  11: DSO data cache                                        : Ok
  12: DSO data reopen                                       : Ok
  13: Roundtrip evsel->name                                 : Ok
  14: Parse sched tracepoints fields                        : Ok
  15: syscalls:sys_enter_openat event fields                : Ok
  16: Setup struct perf_event_attr                          : Ok
  17: Match and link multiple hists                         : Ok
  18: 'import perf' in python                               : Ok
  19: Breakpoint overflow signal handler                    : Ok
  20: Breakpoint overflow sampling                          : Ok
  21: Breakpoint accounting                                 : Ok
  22: Watchpoint                                            :
  22.1: Read Only Watchpoint                                : Skip
  22.2: Write Only Watchpoint                               : Ok
  22.3: Read / Write Watchpoint                             : Ok
  22.4: Modify Watchpoint                                   : Ok
  23: Number of exit events of a simple workload            : Ok
  24: Software clock events period values                   : Ok
  25: Object code reading                                   : Ok
  26: Sample parsing                                        : Ok
  27: Use a dummy software event to keep tracking           : Ok
  28: Parse with no sample_id_all bit set                   : Ok
  29: Filter hist entries                                   : Ok
  30: Lookup mmap thread                                    : Ok
  31: Share thread maps                                     : Ok
  32: Sort output of hist entries                           : Ok
  33: Cumulate child hist entries                           : Ok
  34: Track with sched_switch                               : Ok
  35: Filter fds with revents mask in a fdarray             : Ok
  36: Add fd to a fdarray, making it autogrow               : Ok
  37: kmod_path__parse                                      : Ok
  38: Thread map                                            : Ok
  39: LLVM search and compile                               :
  39.1: Basic BPF llvm compile                              : Ok
  39.2: kbuild searching                                    : Ok
  39.3: Compile source for BPF prologue generation          : Ok
  39.4: Compile source for BPF relocation                   : Ok
  40: Session topology                                      : Ok
  41: BPF filter                                            :
  41.1: Basic BPF filtering                                 : Ok
  41.2: BPF pinning                                         : Ok
  41.3: BPF prologue generation                             : Ok
  41.4: BPF relocation checker                              : Ok
  42: Synthesize thread map                                 : Ok
  43: Remove thread map                                     : Ok
  44: Synthesize cpu map                                    : Ok
  45: Synthesize stat config                                : Ok
  46: Synthesize stat                                       : Ok
  47: Synthesize stat round                                 : Ok
  48: Synthesize attr update                                : Ok
  49: Event times                                           : Ok
  50: Read backward ring buffer                             : Ok
  51: Print cpu map                                         : Ok
  52: Merge cpu map                                         : Ok
  53: Probe SDT events                                      : Ok
  54: is_printable_array                                    : Ok
  55: Print bitmap                                          : Ok
  56: perf hooks                                            : Ok
  57: builtin clang support                                 : Skip (not compiled in)
  58: unit_number__scnprintf                                : Ok
  59: mem2node                                              : Ok
  60: time utils                                            : Ok
  61: Test jit_write_elf                                    : Ok
  62: maps__merge_in                                        : Ok
  63: x86 rdpmc                                             : Ok
  64: Convert perf time to TSC                              : Ok
  65: DWARF unwind                                          : Ok
  66: x86 instruction decoder - new instructions            : Ok
  67: Intel PT packet decoder                               : Ok
  68: x86 bp modify                                         : Ok
  69: probe libc's inet_pton & backtrace it with ping       : Ok
  70: Use vfs_getname probe to get syscall args filenames   : Ok
  71: Add vfs_getname probe to get syscall args filenames   : Ok
  72: Check open filename arg using perf trace + vfs_getname: Ok
  73: Zstd perf.data compression/decompression              : Ok

  $ make -C tools/perf build-test 
  make: Entering directory '/home/acme/git/perf/tools/perf'
  - tarpkg: ./tests/perf-targz-src-pkg .
                   make_help_O: make help
             make_no_libnuma_O: make NO_LIBNUMA=1
                   make_tags_O: make tags
              make_clean_all_O: make clean all
            make_no_auxtrace_O: make NO_AUXTRACE=1
           make_no_libpython_O: make NO_LIBPYTHON=1
                make_no_gtk2_O: make NO_GTK2=1
                make_no_newt_O: make NO_NEWT=1
         make_with_clangllvm_O: make LIBCLANGLLVM=1
  make_no_libdw_dwarf_unwind_O: make NO_LIBDW_DWARF_UNWIND=1
                 make_static_O: make LDFLAGS=-static NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 NO_JVMTI=1
           make_no_libbionic_O: make NO_LIBBIONIC=1
                 make_cscope_O: make cscope
       make_util_pmu_bison_o_O: make util/pmu-bison.o
           make_no_backtrace_O: make NO_BACKTRACE=1
             make_util_map_o_O: make util/map.o
              make_no_libelf_O: make NO_LIBELF=1
            make_no_libaudit_O: make NO_LIBAUDIT=1
                make_minimal_O: make 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 NO_LIBBPF=1 NO_LIBCRYPTO=1 NO_SDT=1 NO_JVMTI=1 NO_LIBZSTD=1 NO_LIBCAP=1
           make_no_libunwind_O: make NO_LIBUNWIND=1
                  make_debug_O: make DEBUG=1
               make_no_slang_O: make NO_SLANG=1
                make_install_O: make install
                   make_pure_O: make
         make_install_prefix_O: make install prefix=/tmp/krava
   make_install_prefix_slash_O: make install prefix=/tmp/krava/
                  make_no_ui_O: make NO_NEWT=1 NO_SLANG=1 NO_GTK2=1
                    make_doc_O: make doc
             make_no_scripts_O: make NO_LIBPYTHON=1 NO_LIBPERL=1
        make_with_babeltrace_O: make LIBBABELTRACE=1
              make_no_libbpf_O: make NO_LIBBPF=1
             make_no_libperl_O: make NO_LIBPERL=1
            make_install_bin_O: make install-bin
                 make_perf_o_O: make perf.o
            make_no_demangle_O: make NO_DEMANGLE=1
  OK
  make: Leaving directory '/home/acme/git/perf/tools/perf'
  $

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 1/6] perf report/top TUI: Replace pr_err() with ui__error()
  2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
@ 2019-12-05 19:32 ` Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 2/6] perf report: Make -F more strict like -s Arnaldo Carvalho de Melo
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-05 19:32 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner
  Cc: Jiri Olsa, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Ravi Bangoria, Arnaldo Carvalho de Melo,
	Alexander Shishkin, Andi Kleen, Jin Yao, Kan Liang, Mark Rutland

From: Ravi Bangoria <ravi.bangoria@linux.ibm.com>

pr_err() in TUI mode does not print anyting on the screen and just
quits.

Replace such pr_err() with ui__error().

Before:

  $ perf report -s +
  $

After:

  $ perf report -s +

    ┌─Error:────────────────┐
    │Invalid --sort key: `+'│
    │                       │
    │Press any key...       │
    └───────────────────────┘

Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20191114132213.5419-2-ravi.bangoria@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/sort.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 345b5ccc90f6..106d795574ba 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2681,12 +2681,12 @@ static int setup_sort_list(struct perf_hpp_list *list, char *str,
 			ret = sort_dimension__add(list, tok, evlist, level);
 			if (ret == -EINVAL) {
 				if (!cacheline_size() && !strncasecmp(tok, "dcacheline", strlen(tok)))
-					pr_err("The \"dcacheline\" --sort key needs to know the cacheline size and it couldn't be determined on this system");
+					ui__error("The \"dcacheline\" --sort key needs to know the cacheline size and it couldn't be determined on this system");
 				else
-					pr_err("Invalid --sort key: `%s'", tok);
+					ui__error("Invalid --sort key: `%s'", tok);
 				break;
 			} else if (ret == -ESRCH) {
-				pr_err("Unknown --sort key: `%s'", tok);
+				ui__error("Unknown --sort key: `%s'", tok);
 				break;
 			}
 		}
@@ -2743,7 +2743,7 @@ static int setup_sort_order(struct evlist *evlist)
 		return 0;
 
 	if (sort_order[1] == '\0') {
-		pr_err("Invalid --sort key: `+'");
+		ui__error("Invalid --sort key: `+'");
 		return -EINVAL;
 	}
 
@@ -3034,7 +3034,7 @@ static int __setup_output_field(void)
 		strp++;
 
 	if (!strlen(strp)) {
-		pr_err("Invalid --fields key: `+'");
+		ui__error("Invalid --fields key: `+'");
 		goto out;
 	}
 
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 2/6] perf report: Make -F more strict like -s
  2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 1/6] perf report/top TUI: Replace pr_err() with ui__error() Arnaldo Carvalho de Melo
@ 2019-12-05 19:32 ` Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 3/6] perf report: Bail out --mem-mode if mem info is not available Arnaldo Carvalho de Melo
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-05 19:32 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner
  Cc: Jiri Olsa, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Ravi Bangoria, Arnaldo Carvalho de Melo,
	Alexander Shishkin, Andi Kleen, Jin Yao, Kan Liang, Mark Rutland,
	Arnaldo Carvalho de Melo

From: Ravi Bangoria <ravi.bangoria@linux.ibm.com>

Currently -F allows branch-mode / mem-mode fields with -F even
when perf report is not running in that mode. Don't allow that.

Suggested-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20191114132213.5419-3-ravi.bangoria@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/sort.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 106d795574ba..9fcba2872130 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2959,6 +2959,9 @@ int output_field_add(struct perf_hpp_list *list, char *tok)
 		if (strncasecmp(tok, sd->name, strlen(tok)))
 			continue;
 
+		if (sort__mode != SORT_MODE__MEMORY)
+			return -EINVAL;
+
 		return __sort_dimension__add_output(list, sd);
 	}
 
@@ -2968,6 +2971,9 @@ int output_field_add(struct perf_hpp_list *list, char *tok)
 		if (strncasecmp(tok, sd->name, strlen(tok)))
 			continue;
 
+		if (sort__mode != SORT_MODE__BRANCH)
+			return -EINVAL;
+
 		return __sort_dimension__add_output(list, sd);
 	}
 
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 3/6] perf report: Bail out --mem-mode if mem info is not available
  2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 1/6] perf report/top TUI: Replace pr_err() with ui__error() Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 2/6] perf report: Make -F more strict like -s Arnaldo Carvalho de Melo
@ 2019-12-05 19:32 ` Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 4/6] perf inject: Fix processing of ID index for injected instruction tracing Arnaldo Carvalho de Melo
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-05 19:32 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner
  Cc: Jiri Olsa, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Ravi Bangoria, Arnaldo Carvalho de Melo,
	Arnaldo Carvalho de Melo, Alexander Shishkin, Andi Kleen,
	Jin Yao, Kan Liang, Mark Rutland

From: Ravi Bangoria <ravi.bangoria@linux.ibm.com>

If perf.data is recorded without -d, don't allow user to use --mem-mode
with 'perf report'. symbol_daddr and phys_daddr can be recorded
separately and may be present in the perf.data but at the report time
they are associated with mem-mode fields and thus this restriction
applies to them as well.

Before:
  $ perf record ls
  $ perf report --mem-mode --stdio
  # Overhead  Local Weight  Memory access  Symbol
  # ........  ............  .............  .......................
      55.56%  0             N/A            [k] 0xffffffff81a00ae7

After:
  $ perf report --mem-mode --stdio
  Error:
  Selected --mem-mode but no mem data. Did you call perf record without -d?

Suggested-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20191114132213.5419-4-ravi.bangoria@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-report.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 830d563de889..387311c67264 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -388,6 +388,14 @@ static int report__setup_sample_type(struct report *rep)
 		}
 	}
 
+	if (sort__mode == SORT_MODE__MEMORY) {
+		if (!is_pipe && !(sample_type & PERF_SAMPLE_DATA_SRC)) {
+			ui__error("Selected --mem-mode but no mem data. "
+				  "Did you call perf record without -d?\n");
+			return -1;
+		}
+	}
+
 	if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain) {
 		if ((sample_type & PERF_SAMPLE_REGS_USER) &&
 		    (sample_type & PERF_SAMPLE_STACK_USER)) {
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 4/6] perf inject: Fix processing of ID index for injected instruction tracing
  2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
                   ` (2 preceding siblings ...)
  2019-12-05 19:32 ` [PATCH 3/6] perf report: Bail out --mem-mode if mem info is not available Arnaldo Carvalho de Melo
@ 2019-12-05 19:32 ` Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 5/6] tools headers UAPI: Sync drm/i915_drm.h with the kernel sources Arnaldo Carvalho de Melo
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-05 19:32 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner
  Cc: Jiri Olsa, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Adrian Hunter, Jiri Olsa,
	Arnaldo Carvalho de Melo

From: Adrian Hunter <adrian.hunter@intel.com>

The ID index event is used when decoding, but can result in the
following error:

 $ perf record --aux-sample -e '{intel_pt//,branch-misses}:u' ls
 $ perf inject -i perf.data -o perf.data.inj --itrace=be
 $ perf script -i perf.data.inj
 0x1020 [0x410]: failed to process type: 69 [No such file or directory]

Fix by having 'perf inject' drop the ID index event.

Fixes: c0a6de06c446 ("perf record: Add support for AUX area sampling")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lore.kernel.org/lkml/20191204120800.8138-1-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-inject.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 9664a72a089d..7e124a7b8bfd 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -403,17 +403,6 @@ static int perf_event__repipe_tracing_data(struct perf_session *session,
 	return err;
 }
 
-static int perf_event__repipe_id_index(struct perf_session *session,
-				       union perf_event *event)
-{
-	int err;
-
-	perf_event__repipe_synth(session->tool, event);
-	err = perf_event__process_id_index(session, event);
-
-	return err;
-}
-
 static int dso__read_build_id(struct dso *dso)
 {
 	if (dso->has_build_id)
@@ -651,7 +640,7 @@ static int __cmd_inject(struct perf_inject *inject)
 		inject->tool.comm	    = perf_event__repipe_comm;
 		inject->tool.namespaces	    = perf_event__repipe_namespaces;
 		inject->tool.exit	    = perf_event__repipe_exit;
-		inject->tool.id_index	    = perf_event__repipe_id_index;
+		inject->tool.id_index	    = perf_event__process_id_index;
 		inject->tool.auxtrace_info  = perf_event__process_auxtrace_info;
 		inject->tool.auxtrace	    = perf_event__process_auxtrace;
 		inject->tool.aux	    = perf_event__drop_aux;
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 5/6] tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
  2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
                   ` (3 preceding siblings ...)
  2019-12-05 19:32 ` [PATCH 4/6] perf inject: Fix processing of ID index for injected instruction tracing Arnaldo Carvalho de Melo
@ 2019-12-05 19:32 ` Arnaldo Carvalho de Melo
  2019-12-05 19:32 ` [PATCH 6/6] tools headers UAPI: Update tools's copy of drm.h headers Arnaldo Carvalho de Melo
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-05 19:32 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner
  Cc: Jiri Olsa, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Arnaldo Carvalho de Melo, Adrian Hunter,
	Chris Wilson, Daniele Ceraolo Spurio, Lionel Landwerlin

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

To pick the change in:

  a0e047156cde ("drm/i915/gem: Make context persistence optional")
  9cd20ef7803c ("drm/i915/perf: allow holding preemption on filtered ctx")
  7831e9a965ea ("drm/i915/perf: Allow dynamic reconfiguration of the OA stream")
  4f6ccc74a85c ("drm/i915: add support for perf configuration queries")
  b8d49f28aa03 ("drm/i915/perf: introduce a versioning of the i915-perf uapi")
  601734f7aabd ("drm/i915/tgl: s/ss/eu fuse reading support")

That don't result in any changes in tooling, just silences this perf
build warning:

  Warning: Kernel ABI header at 'tools/include/uapi/drm/i915_drm.h' differs from latest version at 'include/uapi/drm/i915_drm.h'
  diff -u tools/include/uapi/drm/i915_drm.h include/uapi/drm/i915_drm.h

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-qwzjrgwj55y3g6rjdf9spkpr@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/include/uapi/drm/i915_drm.h | 128 +++++++++++++++++++++++++++++-
 1 file changed, 125 insertions(+), 3 deletions(-)

diff --git a/tools/include/uapi/drm/i915_drm.h b/tools/include/uapi/drm/i915_drm.h
index 469dc512cca3..5400d7e057f1 100644
--- a/tools/include/uapi/drm/i915_drm.h
+++ b/tools/include/uapi/drm/i915_drm.h
@@ -611,6 +611,13 @@ typedef struct drm_i915_irq_wait {
  * See I915_EXEC_FENCE_OUT and I915_EXEC_FENCE_SUBMIT.
  */
 #define I915_PARAM_HAS_EXEC_SUBMIT_FENCE 53
+
+/*
+ * Revision of the i915-perf uAPI. The value returned helps determine what
+ * i915-perf features are available. See drm_i915_perf_property_id.
+ */
+#define I915_PARAM_PERF_REVISION	54
+
 /* Must be kept compact -- no holes and well documented */
 
 typedef struct drm_i915_getparam {
@@ -1565,6 +1572,21 @@ struct drm_i915_gem_context_param {
  *   i915_context_engines_bond (I915_CONTEXT_ENGINES_EXT_BOND)
  */
 #define I915_CONTEXT_PARAM_ENGINES	0xa
+
+/*
+ * I915_CONTEXT_PARAM_PERSISTENCE:
+ *
+ * Allow the context and active rendering to survive the process until
+ * completion. Persistence allows fire-and-forget clients to queue up a
+ * bunch of work, hand the output over to a display server and then quit.
+ * If the context is marked as not persistent, upon closing (either via
+ * an explicit DRM_I915_GEM_CONTEXT_DESTROY or implicitly from file closure
+ * or process termination), the context and any outstanding requests will be
+ * cancelled (and exported fences for cancelled requests marked as -EIO).
+ *
+ * By default, new contexts allow persistence.
+ */
+#define I915_CONTEXT_PARAM_PERSISTENCE	0xb
 /* Must be kept compact -- no holes and well documented */
 
 	__u64 value;
@@ -1844,23 +1866,31 @@ enum drm_i915_perf_property_id {
 	 * Open the stream for a specific context handle (as used with
 	 * execbuffer2). A stream opened for a specific context this way
 	 * won't typically require root privileges.
+	 *
+	 * This property is available in perf revision 1.
 	 */
 	DRM_I915_PERF_PROP_CTX_HANDLE = 1,
 
 	/**
 	 * A value of 1 requests the inclusion of raw OA unit reports as
 	 * part of stream samples.
+	 *
+	 * This property is available in perf revision 1.
 	 */
 	DRM_I915_PERF_PROP_SAMPLE_OA,
 
 	/**
 	 * The value specifies which set of OA unit metrics should be
 	 * be configured, defining the contents of any OA unit reports.
+	 *
+	 * This property is available in perf revision 1.
 	 */
 	DRM_I915_PERF_PROP_OA_METRICS_SET,
 
 	/**
 	 * The value specifies the size and layout of OA unit reports.
+	 *
+	 * This property is available in perf revision 1.
 	 */
 	DRM_I915_PERF_PROP_OA_FORMAT,
 
@@ -1870,9 +1900,22 @@ enum drm_i915_perf_property_id {
 	 * from this exponent as follows:
 	 *
 	 *   80ns * 2^(period_exponent + 1)
+	 *
+	 * This property is available in perf revision 1.
 	 */
 	DRM_I915_PERF_PROP_OA_EXPONENT,
 
+	/**
+	 * Specifying this property is only valid when specify a context to
+	 * filter with DRM_I915_PERF_PROP_CTX_HANDLE. Specifying this property
+	 * will hold preemption of the particular context we want to gather
+	 * performance data about. The execbuf2 submissions must include a
+	 * drm_i915_gem_execbuffer_ext_perf parameter for this to apply.
+	 *
+	 * This property is available in perf revision 3.
+	 */
+	DRM_I915_PERF_PROP_HOLD_PREEMPTION,
+
 	DRM_I915_PERF_PROP_MAX /* non-ABI */
 };
 
@@ -1901,6 +1944,8 @@ struct drm_i915_perf_open_param {
  * to close and re-open a stream with the same configuration.
  *
  * It's undefined whether any pending data for the stream will be lost.
+ *
+ * This ioctl is available in perf revision 1.
  */
 #define I915_PERF_IOCTL_ENABLE	_IO('i', 0x0)
 
@@ -1908,9 +1953,24 @@ struct drm_i915_perf_open_param {
  * Disable data capture for a stream.
  *
  * It is an error to try and read a stream that is disabled.
+ *
+ * This ioctl is available in perf revision 1.
  */
 #define I915_PERF_IOCTL_DISABLE	_IO('i', 0x1)
 
+/**
+ * Change metrics_set captured by a stream.
+ *
+ * If the stream is bound to a specific context, the configuration change
+ * will performed inline with that context such that it takes effect before
+ * the next execbuf submission.
+ *
+ * Returns the previously bound metrics set id, or a negative error code.
+ *
+ * This ioctl is available in perf revision 2.
+ */
+#define I915_PERF_IOCTL_CONFIG	_IO('i', 0x2)
+
 /**
  * Common to all i915 perf records
  */
@@ -1984,6 +2044,7 @@ struct drm_i915_query_item {
 	__u64 query_id;
 #define DRM_I915_QUERY_TOPOLOGY_INFO    1
 #define DRM_I915_QUERY_ENGINE_INFO	2
+#define DRM_I915_QUERY_PERF_CONFIG      3
 /* Must be kept compact -- no holes and well documented */
 
 	/*
@@ -1995,9 +2056,18 @@ struct drm_i915_query_item {
 	__s32 length;
 
 	/*
-	 * Unused for now. Must be cleared to zero.
+	 * When query_id == DRM_I915_QUERY_TOPOLOGY_INFO, must be 0.
+	 *
+	 * When query_id == DRM_I915_QUERY_PERF_CONFIG, must be one of the
+	 * following :
+	 *         - DRM_I915_QUERY_PERF_CONFIG_LIST
+	 *         - DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID
+	 *         - DRM_I915_QUERY_PERF_CONFIG_FOR_UUID
 	 */
 	__u32 flags;
+#define DRM_I915_QUERY_PERF_CONFIG_LIST          1
+#define DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID 2
+#define DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_ID   3
 
 	/*
 	 * Data will be written at the location pointed by data_ptr when the
@@ -2033,8 +2103,10 @@ struct drm_i915_query {
  *           (data[X / 8] >> (X % 8)) & 1
  *
  * - the subslice mask for each slice with one bit per subslice telling
- *   whether a subslice is available. The availability of subslice Y in slice
- *   X can be queried with the following formula :
+ *   whether a subslice is available. Gen12 has dual-subslices, which are
+ *   similar to two gen11 subslices. For gen12, this array represents dual-
+ *   subslices. The availability of subslice Y in slice X can be queried
+ *   with the following formula :
  *
  *           (data[subslice_offset +
  *                 X * subslice_stride +
@@ -2123,6 +2195,56 @@ struct drm_i915_query_engine_info {
 	struct drm_i915_engine_info engines[];
 };
 
+/*
+ * Data written by the kernel with query DRM_I915_QUERY_PERF_CONFIG.
+ */
+struct drm_i915_query_perf_config {
+	union {
+		/*
+		 * When query_item.flags == DRM_I915_QUERY_PERF_CONFIG_LIST, i915 sets
+		 * this fields to the number of configurations available.
+		 */
+		__u64 n_configs;
+
+		/*
+		 * When query_id == DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_ID,
+		 * i915 will use the value in this field as configuration
+		 * identifier to decide what data to write into config_ptr.
+		 */
+		__u64 config;
+
+		/*
+		 * When query_id == DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID,
+		 * i915 will use the value in this field as configuration
+		 * identifier to decide what data to write into config_ptr.
+		 *
+		 * String formatted like "%08x-%04x-%04x-%04x-%012x"
+		 */
+		char uuid[36];
+	};
+
+	/*
+	 * Unused for now. Must be cleared to zero.
+	 */
+	__u32 flags;
+
+	/*
+	 * When query_item.flags == DRM_I915_QUERY_PERF_CONFIG_LIST, i915 will
+	 * write an array of __u64 of configuration identifiers.
+	 *
+	 * When query_item.flags == DRM_I915_QUERY_PERF_CONFIG_DATA, i915 will
+	 * write a struct drm_i915_perf_oa_config. If the following fields of
+	 * drm_i915_perf_oa_config are set not set to 0, i915 will write into
+	 * the associated pointers the values of submitted when the
+	 * configuration was created :
+	 *
+	 *         - n_mux_regs
+	 *         - n_boolean_regs
+	 *         - n_flex_regs
+	 */
+	__u8 data[];
+};
+
 #if defined(__cplusplus)
 }
 #endif
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 6/6] tools headers UAPI: Update tools's copy of drm.h headers
  2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
                   ` (4 preceding siblings ...)
  2019-12-05 19:32 ` [PATCH 5/6] tools headers UAPI: Sync drm/i915_drm.h with the kernel sources Arnaldo Carvalho de Melo
@ 2019-12-05 19:32 ` Arnaldo Carvalho de Melo
  2019-12-06  7:57 ` [GIT PULL 0/6] perf/urgent fixes Ingo Molnar
  2020-01-13  8:28 ` [GIT PULL 0/6] perf/urgent fixes Ravi Bangoria
  7 siblings, 0 replies; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-05 19:32 UTC (permalink / raw)
  To: Ingo Molnar, Thomas Gleixner
  Cc: Jiri Olsa, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Arnaldo Carvalho de Melo, Adrian Hunter,
	Christian König, Chunming Zhou

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

Picking the changes from:

  2093dea3def9 ("drm/syncobj: extend syncobj query ability v3")

Which doesn't affect tooling, just silences this perf build warning:

  Warning: Kernel ABI header at 'tools/include/uapi/drm/drm.h' differs from latest version at 'include/uapi/drm/drm.h'
  diff -u tools/include/uapi/drm/drm.h include/uapi/drm/drm.h

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Chunming Zhou <david1.zhou@amd.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-t1xqmjffo4rxdw395dsnu34j@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/include/uapi/drm/drm.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/include/uapi/drm/drm.h b/tools/include/uapi/drm/drm.h
index 8a5b2f8f8eb9..868bf7996c0f 100644
--- a/tools/include/uapi/drm/drm.h
+++ b/tools/include/uapi/drm/drm.h
@@ -778,11 +778,12 @@ struct drm_syncobj_array {
 	__u32 pad;
 };
 
+#define DRM_SYNCOBJ_QUERY_FLAGS_LAST_SUBMITTED (1 << 0) /* last available point on timeline syncobj */
 struct drm_syncobj_timeline_array {
 	__u64 handles;
 	__u64 points;
 	__u32 count_handles;
-	__u32 pad;
+	__u32 flags;
 };
 
 
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
                   ` (5 preceding siblings ...)
  2019-12-05 19:32 ` [PATCH 6/6] tools headers UAPI: Update tools's copy of drm.h headers Arnaldo Carvalho de Melo
@ 2019-12-06  7:57 ` Ingo Molnar
  2019-12-06 14:24   ` Arnaldo Carvalho de Melo
  2019-12-06 14:25   ` Jiri Olsa
  2020-01-13  8:28 ` [GIT PULL 0/6] perf/urgent fixes Ravi Bangoria
  7 siblings, 2 replies; 18+ messages in thread
From: Ingo Molnar @ 2019-12-06  7:57 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Thomas Gleixner, Jiri Olsa, Namhyung Kim, Clark Williams,
	linux-kernel, linux-perf-users, Adrian Hunter, Ravi Bangoria,
	Arnaldo Carvalho de Melo


* Arnaldo Carvalho de Melo <acme@kernel.org> wrote:

> Hi Ingo/Thomas,
> 
> 	Please consider pulling,
> 
> Best regards,
> 
> - Arnaldo
> 
> Test results at the end of this message, as usual.
> 
> The following changes since commit 9f58c93efdffc2cba91fdcee010b3e5e8860334d:
> 
>   Merge tag 'perf-core-for-mingo-5.5-20191203' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2019-12-04 08:49:52 +0100)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-5.5-20191205
> 
> for you to fetch changes up to fd9bee5e24141d00e23b66d1b51bc759efa7e3fe:
> 
>   tools headers UAPI: Update tools's copy of drm.h headers (2019-12-04 16:22:38 -0300)
> 
> ----------------------------------------------------------------
> perf inject:
> 
>   Adrian Hunter:
> 
>   - Fix processing of ID index for injected instruction tracing
> 
> perf report:
> 
>   Ravi Bangoria:
> 
>   - Replace pr_err() with ui__error(), so that we can see the output
>     in the TUI mode instead of showing and immediately restoring the
>     screen to the state before perf was started.
> 
>   - Don't start --mem-mode/--branch-mode mode if required samples are not
>     available.
> 
> tools headers UAPI:
> 
>   Arnaldo Carvalho de Melo:
> 
>   - Sync drm/i915_drm.h with the kernel sources
> 
>   - Update tools's copy of drm.h headers.
> 
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> 
> ----------------------------------------------------------------
> Adrian Hunter (1):
>       perf inject: Fix processing of ID index for injected instruction tracing
> 
> Arnaldo Carvalho de Melo (2):
>       tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
>       tools headers UAPI: Update tools's copy of drm.h headers
> 
> Ravi Bangoria (3):
>       perf report/top TUI: Replace pr_err() with ui__error()
>       perf report: Make -F more strict like -s
>       perf report: Bail out --mem-mode if mem info is not available
> 
>  tools/include/uapi/drm/drm.h      |   3 +-
>  tools/include/uapi/drm/i915_drm.h | 128 +++++++++++++++++++++++++++++++++++++-
>  tools/perf/builtin-inject.c       |  13 +---
>  tools/perf/builtin-report.c       |   8 +++
>  tools/perf/util/sort.c            |  16 +++--
>  5 files changed, 147 insertions(+), 21 deletions(-)

Pulled, thanks a lot Arnaldo!

JFYI, on my system the default perf/urgent build still has this noise 
generated by util/parse-events.y and util/expr.y:

  util/parse-events.y:1.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
      1 | %pure-parser
      | ^~~~~~~~~~~~
  util/parse-events.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
  util/expr.y:15.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
     15 | %pure-parser
      | ^~~~~~~~~~~~
  util/expr.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]


Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2019-12-06  7:57 ` [GIT PULL 0/6] perf/urgent fixes Ingo Molnar
@ 2019-12-06 14:24   ` Arnaldo Carvalho de Melo
  2019-12-06 14:25   ` Jiri Olsa
  1 sibling, 0 replies; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-06 14:24 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Thomas Gleixner, Jiri Olsa, Namhyung Kim, Clark Williams,
	linux-kernel, linux-perf-users, Adrian Hunter, Ravi Bangoria,
	Arnaldo Carvalho de Melo

Em Fri, Dec 06, 2019 at 08:57:01AM +0100, Ingo Molnar escreveu:
> Pulled, thanks a lot Arnaldo!
 
> JFYI, on my system the default perf/urgent build still has this noise 
> generated by util/parse-events.y and util/expr.y:
 
>   util/parse-events.y:1.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
>       1 | %pure-parser
>       | ^~~~~~~~~~~~
>   util/parse-events.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
>   util/expr.y:15.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
>      15 | %pure-parser
>       | ^~~~~~~~~~~~
>   util/expr.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]

I'll get to this, I've been postponing dealing with this nuisance as,
IIRC, this will make perf not build in systems with older bisons.

- Arnaldo


^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2019-12-06  7:57 ` [GIT PULL 0/6] perf/urgent fixes Ingo Molnar
  2019-12-06 14:24   ` Arnaldo Carvalho de Melo
@ 2019-12-06 14:25   ` Jiri Olsa
  2019-12-06 14:43     ` Arnaldo Carvalho de Melo
  1 sibling, 1 reply; 18+ messages in thread
From: Jiri Olsa @ 2019-12-06 14:25 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Arnaldo Carvalho de Melo, Thomas Gleixner, Jiri Olsa,
	Namhyung Kim, Clark Williams, linux-kernel, linux-perf-users,
	Adrian Hunter, Ravi Bangoria, Arnaldo Carvalho de Melo

On Fri, Dec 06, 2019 at 08:57:01AM +0100, Ingo Molnar wrote:

SNIP

> >  tools/include/uapi/drm/drm.h      |   3 +-
> >  tools/include/uapi/drm/i915_drm.h | 128 +++++++++++++++++++++++++++++++++++++-
> >  tools/perf/builtin-inject.c       |  13 +---
> >  tools/perf/builtin-report.c       |   8 +++
> >  tools/perf/util/sort.c            |  16 +++--
> >  5 files changed, 147 insertions(+), 21 deletions(-)
> 
> Pulled, thanks a lot Arnaldo!
> 
> JFYI, on my system the default perf/urgent build still has this noise 
> generated by util/parse-events.y and util/expr.y:
> 
>   util/parse-events.y:1.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
>       1 | %pure-parser
>       | ^~~~~~~~~~~~
>   util/parse-events.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
>   util/expr.y:15.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
>      15 | %pure-parser
>       | ^~~~~~~~~~~~
>   util/expr.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]

just saw it in fedora 31 with new bison, change below
should fix it, I'll post it with other fixes later

jirka

---
diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
index f9a20a39b64a..4ef801334b9d 100644
--- a/tools/perf/util/expr.y
+++ b/tools/perf/util/expr.y
@@ -12,7 +12,7 @@
 #define MAXIDLEN 256
 %}
 
-%pure-parser
+%define api.pure
 %parse-param { double *final_val }
 %parse-param { struct parse_ctx *ctx }
 %parse-param { const char **pp }
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index e2eea4e601b4..87a0d11676f0 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -1,4 +1,4 @@
-%pure-parser
+%define api.pure
 %parse-param {void *_parse_state}
 %parse-param {void *scanner}
 %lex-param {void* scanner}


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2019-12-06 14:25   ` Jiri Olsa
@ 2019-12-06 14:43     ` Arnaldo Carvalho de Melo
  2019-12-06 15:04       ` Jiri Olsa
  0 siblings, 1 reply; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-06 14:43 UTC (permalink / raw)
  To: Jiri Olsa
  Cc: Ingo Molnar, Thomas Gleixner, Jiri Olsa, Namhyung Kim,
	Clark Williams, linux-kernel, linux-perf-users, Adrian Hunter,
	Ravi Bangoria, Arnaldo Carvalho de Melo

Em Fri, Dec 06, 2019 at 03:25:16PM +0100, Jiri Olsa escreveu:
> On Fri, Dec 06, 2019 at 08:57:01AM +0100, Ingo Molnar wrote:
> 
> SNIP
> 
> > >  tools/include/uapi/drm/drm.h      |   3 +-
> > >  tools/include/uapi/drm/i915_drm.h | 128 +++++++++++++++++++++++++++++++++++++-
> > >  tools/perf/builtin-inject.c       |  13 +---
> > >  tools/perf/builtin-report.c       |   8 +++
> > >  tools/perf/util/sort.c            |  16 +++--
> > >  5 files changed, 147 insertions(+), 21 deletions(-)
> > 
> > Pulled, thanks a lot Arnaldo!
> > 
> > JFYI, on my system the default perf/urgent build still has this noise 
> > generated by util/parse-events.y and util/expr.y:
> > 
> >   util/parse-events.y:1.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
> >       1 | %pure-parser
> >       | ^~~~~~~~~~~~
> >   util/parse-events.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
> >   util/expr.y:15.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
> >      15 | %pure-parser
> >       | ^~~~~~~~~~~~
> >   util/expr.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
> 
> just saw it in fedora 31 with new bison, change below
> should fix it, I'll post it with other fixes later

As I explained to Ingo, this will make it fail with older systems, for
now this is just a warning, thus I've not been eager to get this merged,
Andi alredy submitted this, for instance.

Is there some way to have some sort of ifdef based on bison's version so
that we can have both?

At some point I'll just bite the bullet and stop testing on such older
systems, but while this is not strictly needed...

- Arnaldo
 
> jirka
> 
> ---
> diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
> index f9a20a39b64a..4ef801334b9d 100644
> --- a/tools/perf/util/expr.y
> +++ b/tools/perf/util/expr.y
> @@ -12,7 +12,7 @@
>  #define MAXIDLEN 256
>  %}
>  
> -%pure-parser
> +%define api.pure
>  %parse-param { double *final_val }
>  %parse-param { struct parse_ctx *ctx }
>  %parse-param { const char **pp }
> diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
> index e2eea4e601b4..87a0d11676f0 100644
> --- a/tools/perf/util/parse-events.y
> +++ b/tools/perf/util/parse-events.y
> @@ -1,4 +1,4 @@
> -%pure-parser
> +%define api.pure
>  %parse-param {void *_parse_state}
>  %parse-param {void *scanner}
>  %lex-param {void* scanner}

-- 

- Arnaldo

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2019-12-06 14:43     ` Arnaldo Carvalho de Melo
@ 2019-12-06 15:04       ` Jiri Olsa
  2019-12-06 15:35         ` Arnaldo Carvalho de Melo
  0 siblings, 1 reply; 18+ messages in thread
From: Jiri Olsa @ 2019-12-06 15:04 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Ingo Molnar, Thomas Gleixner, Jiri Olsa, Namhyung Kim,
	Clark Williams, linux-kernel, linux-perf-users, Adrian Hunter,
	Ravi Bangoria, Arnaldo Carvalho de Melo

On Fri, Dec 06, 2019 at 11:43:54AM -0300, Arnaldo Carvalho de Melo wrote:
> Em Fri, Dec 06, 2019 at 03:25:16PM +0100, Jiri Olsa escreveu:
> > On Fri, Dec 06, 2019 at 08:57:01AM +0100, Ingo Molnar wrote:
> > 
> > SNIP
> > 
> > > >  tools/include/uapi/drm/drm.h      |   3 +-
> > > >  tools/include/uapi/drm/i915_drm.h | 128 +++++++++++++++++++++++++++++++++++++-
> > > >  tools/perf/builtin-inject.c       |  13 +---
> > > >  tools/perf/builtin-report.c       |   8 +++
> > > >  tools/perf/util/sort.c            |  16 +++--
> > > >  5 files changed, 147 insertions(+), 21 deletions(-)
> > > 
> > > Pulled, thanks a lot Arnaldo!
> > > 
> > > JFYI, on my system the default perf/urgent build still has this noise 
> > > generated by util/parse-events.y and util/expr.y:
> > > 
> > >   util/parse-events.y:1.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
> > >       1 | %pure-parser
> > >       | ^~~~~~~~~~~~
> > >   util/parse-events.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
> > >   util/expr.y:15.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
> > >      15 | %pure-parser
> > >       | ^~~~~~~~~~~~
> > >   util/expr.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
> > 
> > just saw it in fedora 31 with new bison, change below
> > should fix it, I'll post it with other fixes later
> 
> As I explained to Ingo, this will make it fail with older systems, for
> now this is just a warning, thus I've not been eager to get this merged,
> Andi alredy submitted this, for instance.
> 
> Is there some way to have some sort of ifdef based on bison's version so
> that we can have both?

I see, I guess we could use one or another based on
bison version with macro

jirka

> 
> At some point I'll just bite the bullet and stop testing on such older
> systems, but while this is not strictly needed...
> 
> - Arnaldo
>  
> > jirka
> > 
> > ---
> > diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
> > index f9a20a39b64a..4ef801334b9d 100644
> > --- a/tools/perf/util/expr.y
> > +++ b/tools/perf/util/expr.y
> > @@ -12,7 +12,7 @@
> >  #define MAXIDLEN 256
> >  %}
> >  
> > -%pure-parser
> > +%define api.pure
> >  %parse-param { double *final_val }
> >  %parse-param { struct parse_ctx *ctx }
> >  %parse-param { const char **pp }
> > diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
> > index e2eea4e601b4..87a0d11676f0 100644
> > --- a/tools/perf/util/parse-events.y
> > +++ b/tools/perf/util/parse-events.y
> > @@ -1,4 +1,4 @@
> > -%pure-parser
> > +%define api.pure
> >  %parse-param {void *_parse_state}
> >  %parse-param {void *scanner}
> >  %lex-param {void* scanner}
> 
> -- 
> 
> - Arnaldo
> 


^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2019-12-06 15:04       ` Jiri Olsa
@ 2019-12-06 15:35         ` Arnaldo Carvalho de Melo
  2020-01-12 19:22           ` [PATCH] perf tools: Use %define api.pure full instead of %pure-parser Jiri Olsa
  0 siblings, 1 reply; 18+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-12-06 15:35 UTC (permalink / raw)
  To: Jiri Olsa
  Cc: Ingo Molnar, Thomas Gleixner, Jiri Olsa, Namhyung Kim,
	Clark Williams, linux-kernel, linux-perf-users, Adrian Hunter,
	Ravi Bangoria, Arnaldo Carvalho de Melo

Em Fri, Dec 06, 2019 at 04:04:55PM +0100, Jiri Olsa escreveu:
> On Fri, Dec 06, 2019 at 11:43:54AM -0300, Arnaldo Carvalho de Melo wrote:
> > Em Fri, Dec 06, 2019 at 03:25:16PM +0100, Jiri Olsa escreveu:
> > > On Fri, Dec 06, 2019 at 08:57:01AM +0100, Ingo Molnar wrote:
> > > 
> > > SNIP
> > > 
> > > > >  tools/include/uapi/drm/drm.h      |   3 +-
> > > > >  tools/include/uapi/drm/i915_drm.h | 128 +++++++++++++++++++++++++++++++++++++-
> > > > >  tools/perf/builtin-inject.c       |  13 +---
> > > > >  tools/perf/builtin-report.c       |   8 +++
> > > > >  tools/perf/util/sort.c            |  16 +++--
> > > > >  5 files changed, 147 insertions(+), 21 deletions(-)
> > > > 
> > > > Pulled, thanks a lot Arnaldo!
> > > > 
> > > > JFYI, on my system the default perf/urgent build still has this noise 
> > > > generated by util/parse-events.y and util/expr.y:
> > > > 
> > > >   util/parse-events.y:1.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
> > > >       1 | %pure-parser
> > > >       | ^~~~~~~~~~~~
> > > >   util/parse-events.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
> > > >   util/expr.y:15.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
> > > >      15 | %pure-parser
> > > >       | ^~~~~~~~~~~~
> > > >   util/expr.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
> > > 
> > > just saw it in fedora 31 with new bison, change below
> > > should fix it, I'll post it with other fixes later
> > 
> > As I explained to Ingo, this will make it fail with older systems, for
> > now this is just a warning, thus I've not been eager to get this merged,
> > Andi alredy submitted this, for instance.
> > 
> > Is there some way to have some sort of ifdef based on bison's version so
> > that we can have both?
> 
> I see, I guess we could use one or another based on
> bison version with macro

If you could do that, that would be great, the attempt may well
enlighten us if that is possible and if not, then, oh well, I can just
update bison on these older systems and keep a note in my container
definition files :-)

- Arnaldo
 
> jirka
> 
> > 
> > At some point I'll just bite the bullet and stop testing on such older
> > systems, but while this is not strictly needed...
> > 
> > - Arnaldo
> >  
> > > jirka
> > > 
> > > ---
> > > diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
> > > index f9a20a39b64a..4ef801334b9d 100644
> > > --- a/tools/perf/util/expr.y
> > > +++ b/tools/perf/util/expr.y
> > > @@ -12,7 +12,7 @@
> > >  #define MAXIDLEN 256
> > >  %}
> > >  
> > > -%pure-parser
> > > +%define api.pure
> > >  %parse-param { double *final_val }
> > >  %parse-param { struct parse_ctx *ctx }
> > >  %parse-param { const char **pp }
> > > diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
> > > index e2eea4e601b4..87a0d11676f0 100644
> > > --- a/tools/perf/util/parse-events.y
> > > +++ b/tools/perf/util/parse-events.y
> > > @@ -1,4 +1,4 @@
> > > -%pure-parser
> > > +%define api.pure
> > >  %parse-param {void *_parse_state}
> > >  %parse-param {void *scanner}
> > >  %lex-param {void* scanner}
> > 
> > -- 
> > 
> > - Arnaldo
> > 

-- 

- Arnaldo

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH] perf tools: Use %define api.pure full instead of %pure-parser
  2019-12-06 15:35         ` Arnaldo Carvalho de Melo
@ 2020-01-12 19:22           ` Jiri Olsa
  2020-01-20  8:27             ` [tip: perf/core] " tip-bot2 for Jiri Olsa
  0 siblings, 1 reply; 18+ messages in thread
From: Jiri Olsa @ 2020-01-12 19:22 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Ingo Molnar, Thomas Gleixner, Jiri Olsa, Namhyung Kim,
	Clark Williams, linux-kernel, linux-perf-users, Adrian Hunter,
	Ravi Bangoria, Arnaldo Carvalho de Melo

On Fri, Dec 06, 2019 at 12:35:09PM -0300, Arnaldo Carvalho de Melo wrote:
> Em Fri, Dec 06, 2019 at 04:04:55PM +0100, Jiri Olsa escreveu:
> > On Fri, Dec 06, 2019 at 11:43:54AM -0300, Arnaldo Carvalho de Melo wrote:
> > > Em Fri, Dec 06, 2019 at 03:25:16PM +0100, Jiri Olsa escreveu:
> > > > On Fri, Dec 06, 2019 at 08:57:01AM +0100, Ingo Molnar wrote:
> > > > 
> > > > SNIP
> > > > 
> > > > > >  tools/include/uapi/drm/drm.h      |   3 +-
> > > > > >  tools/include/uapi/drm/i915_drm.h | 128 +++++++++++++++++++++++++++++++++++++-
> > > > > >  tools/perf/builtin-inject.c       |  13 +---
> > > > > >  tools/perf/builtin-report.c       |   8 +++
> > > > > >  tools/perf/util/sort.c            |  16 +++--
> > > > > >  5 files changed, 147 insertions(+), 21 deletions(-)
> > > > > 
> > > > > Pulled, thanks a lot Arnaldo!
> > > > > 
> > > > > JFYI, on my system the default perf/urgent build still has this noise 
> > > > > generated by util/parse-events.y and util/expr.y:
> > > > > 
> > > > >   util/parse-events.y:1.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
> > > > >       1 | %pure-parser
> > > > >       | ^~~~~~~~~~~~
> > > > >   util/parse-events.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
> > > > >   util/expr.y:15.1-12: warning: deprecated directive, use ‘%define api.pure’ [-Wdeprecated]
> > > > >      15 | %pure-parser
> > > > >       | ^~~~~~~~~~~~
> > > > >   util/expr.y: warning: fix-its can be applied.  Rerun with option '--update'. [-Wother]
> > > > 
> > > > just saw it in fedora 31 with new bison, change below
> > > > should fix it, I'll post it with other fixes later
> > > 
> > > As I explained to Ingo, this will make it fail with older systems, for
> > > now this is just a warning, thus I've not been eager to get this merged,
> > > Andi alredy submitted this, for instance.
> > > 
> > > Is there some way to have some sort of ifdef based on bison's version so
> > > that we can have both?
> > 
> > I see, I guess we could use one or another based on
> > bison version with macro
> 
> If you could do that, that would be great, the attempt may well
> enlighten us if that is possible and if not, then, oh well, I can just
> update bison on these older systems and keep a note in my container
> definition files :-)

hi,
so I checked and the api.pure define was introduced quite
long time ago, so perhaps we could change it as it is..
could you please run your distro check on the patch below?

thanks,
jirka


---
Bison deprecated %pure-parser directive in favor of
%define api.pure full. The api.pure got introduced
in bison 2.3 (Oct 2007), so it seems safe to use it
without any version check.

Link: https://lkml.kernel.org/n/tip-qhrf915k2ynym32vf5ii8vzy@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/util/expr.y         | 3 ++-
 tools/perf/util/parse-events.y | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
index f9a20a39b64a..7d226241f1d7 100644
--- a/tools/perf/util/expr.y
+++ b/tools/perf/util/expr.y
@@ -12,7 +12,8 @@
 #define MAXIDLEN 256
 %}
 
-%pure-parser
+%define api.pure full
+
 %parse-param { double *final_val }
 %parse-param { struct parse_ctx *ctx }
 %parse-param { const char **pp }
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index e2eea4e601b4..94f8bcd83582 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -1,4 +1,4 @@
-%pure-parser
+%define api.pure full
 %parse-param {void *_parse_state}
 %parse-param {void *scanner}
 %lex-param {void* scanner}
-- 
2.24.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
                   ` (6 preceding siblings ...)
  2019-12-06  7:57 ` [GIT PULL 0/6] perf/urgent fixes Ingo Molnar
@ 2020-01-13  8:28 ` Ravi Bangoria
  2020-01-13  9:25   ` Jiri Olsa
  7 siblings, 1 reply; 18+ messages in thread
From: Ravi Bangoria @ 2020-01-13  8:28 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo, Jiri Olsa
  Cc: Ingo Molnar, Thomas Gleixner, Namhyung Kim, Clark Williams,
	linux-kernel, linux-perf-users, Adrian Hunter,
	Arnaldo Carvalho de Melo, Ravi Bangoria



On 12/6/19 1:02 AM, Arnaldo Carvalho de Melo wrote:
>    39 fedora:31                     : Ok   gcc (GCC) 9.2.1 20190827 (Red Hat 9.2.1-1), clang version 9.0.0 (Fedora 9.0.0-1.fc31)

Not related to this pull request, but because we are discussing the
bison issue in this thread, I thought to report here.

On my Fedora 31, gtk2 also fails:

   $ rpm -qa | grep gtk2
   gtk2-2.24.32-6.fc31.x86_64
   gtk2-devel-2.24.32-6.fc31.x86_64

   $ make
   Auto-detecting system features:
   ...                         glibc: [ on  ]
   ...                          gtk2: [ OFF ]
   ...                      libaudit: [ on  ]

   Makefile.config:687: GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev


Detail logs:

   $ cat tools/build/feature/test-gtk2.make.output
   In file included from /usr/include/gtk-2.0/gtk/gtkobject.h:37,
                    from /usr/include/gtk-2.0/gtk/gtkwidget.h:36,
                    from /usr/include/gtk-2.0/gtk/gtkcontainer.h:35,
                    from /usr/include/gtk-2.0/gtk/gtkbin.h:35,
                    from /usr/include/gtk-2.0/gtk/gtkwindow.h:36,
                    from /usr/include/gtk-2.0/gtk/gtkdialog.h:35,
                    from /usr/include/gtk-2.0/gtk/gtkaboutdialog.h:32,
                    from /usr/include/gtk-2.0/gtk/gtk.h:33,
                    from test-gtk2.c:3:
   /usr/include/gtk-2.0/gtk/gtktypeutils.h:236:1: error: ‘GTypeDebugFlags’ is deprecated [-Werror=deprecated-declarations]
     236 | void            gtk_type_init   (GTypeDebugFlags    debug_flags);
         | ^~~~
   In file included from /usr/include/glib-2.0/gobject/gobject.h:24,
                    from /usr/include/glib-2.0/gobject/gbinding.h:29,
                    from /usr/include/glib-2.0/glib-object.h:23,
                    from /usr/include/glib-2.0/gio/gioenums.h:28,
                    from /usr/include/glib-2.0/gio/giotypes.h:28,
                    from /usr/include/glib-2.0/gio/gio.h:26,
                    from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
                    from /usr/include/gtk-2.0/gdk/gdk.h:32,
                    from /usr/include/gtk-2.0/gtk/gtk.h:32,
                    from test-gtk2.c:3:
   /usr/include/glib-2.0/gobject/gtype.h:679:1: note: declared here
     679 | {
         | ^
   In file included from /usr/include/gtk-2.0/gtk/gtktoolitem.h:31,
                    from /usr/include/gtk-2.0/gtk/gtktoolbutton.h:30,
                    from /usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h:30,
                    from /usr/include/gtk-2.0/gtk/gtk.h:126,
                    from test-gtk2.c:3:
   /usr/include/gtk-2.0/gtk/gtktooltips.h:73:3: error: ‘GTimeVal’ is deprecated: Use 'GDateTime' instead [-Werror=deprecated-declarations]
      73 |   GTimeVal last_popdown;
         |   ^~~~~~~~
   In file included from /usr/include/glib-2.0/glib/galloca.h:32,
                    from /usr/include/glib-2.0/glib.h:30,
                    from /usr/include/glib-2.0/gobject/gbinding.h:28,
                    from /usr/include/glib-2.0/glib-object.h:23,
                    from /usr/include/glib-2.0/gio/gioenums.h:28,
                    from /usr/include/glib-2.0/gio/giotypes.h:28,
                    from /usr/include/glib-2.0/gio/gio.h:26,
                    from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
                    from /usr/include/gtk-2.0/gdk/gdk.h:32,
                    from /usr/include/gtk-2.0/gtk/gtk.h:32,
                    from test-gtk2.c:3:
   /usr/include/glib-2.0/glib/gtypes.h:551:8: note: declared here
     551 | struct _GTimeVal
         |        ^~~~~~~~~
   cc1: all warnings being treated as errors


^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2020-01-13  8:28 ` [GIT PULL 0/6] perf/urgent fixes Ravi Bangoria
@ 2020-01-13  9:25   ` Jiri Olsa
  2020-01-13  9:44     ` Ravi Bangoria
  0 siblings, 1 reply; 18+ messages in thread
From: Jiri Olsa @ 2020-01-13  9:25 UTC (permalink / raw)
  To: Ravi Bangoria
  Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Ingo Molnar,
	Thomas Gleixner, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Adrian Hunter, Arnaldo Carvalho de Melo

On Mon, Jan 13, 2020 at 01:58:59PM +0530, Ravi Bangoria wrote:

SNIP

>         | ^~~~
>   In file included from /usr/include/glib-2.0/gobject/gobject.h:24,
>                    from /usr/include/glib-2.0/gobject/gbinding.h:29,
>                    from /usr/include/glib-2.0/glib-object.h:23,
>                    from /usr/include/glib-2.0/gio/gioenums.h:28,
>                    from /usr/include/glib-2.0/gio/giotypes.h:28,
>                    from /usr/include/glib-2.0/gio/gio.h:26,
>                    from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
>                    from /usr/include/gtk-2.0/gdk/gdk.h:32,
>                    from /usr/include/gtk-2.0/gtk/gtk.h:32,
>                    from test-gtk2.c:3:
>   /usr/include/glib-2.0/gobject/gtype.h:679:1: note: declared here
>     679 | {
>         | ^
>   In file included from /usr/include/gtk-2.0/gtk/gtktoolitem.h:31,
>                    from /usr/include/gtk-2.0/gtk/gtktoolbutton.h:30,
>                    from /usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h:30,
>                    from /usr/include/gtk-2.0/gtk/gtk.h:126,
>                    from test-gtk2.c:3:
>   /usr/include/gtk-2.0/gtk/gtktooltips.h:73:3: error: ‘GTimeVal’ is deprecated: Use 'GDateTime' instead [-Werror=deprecated-declarations]
>      73 |   GTimeVal last_popdown;
>         |   ^~~~~~~~
>   In file included from /usr/include/glib-2.0/glib/galloca.h:32,
>                    from /usr/include/glib-2.0/glib.h:30,
>                    from /usr/include/glib-2.0/gobject/gbinding.h:28,
>                    from /usr/include/glib-2.0/glib-object.h:23,
>                    from /usr/include/glib-2.0/gio/gioenums.h:28,
>                    from /usr/include/glib-2.0/gio/giotypes.h:28,
>                    from /usr/include/glib-2.0/gio/gio.h:26,
>                    from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
>                    from /usr/include/gtk-2.0/gdk/gdk.h:32,
>                    from /usr/include/gtk-2.0/gtk/gtk.h:32,
>                    from test-gtk2.c:3:
>   /usr/include/glib-2.0/glib/gtypes.h:551:8: note: declared here
>     551 | struct _GTimeVal
>         |        ^~~~~~~~~
>   cc1: all warnings being treated as errors
> 

patch below fixes that for me.. please let me know
if it works for you and I'll post full patch

jirka


---
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index f30a89046aa3..7ac0d8088565 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -197,7 +197,7 @@ $(OUTPUT)test-libcrypto.bin:
 	$(BUILD) -lcrypto
 
 $(OUTPUT)test-gtk2.bin:
-	$(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
+	$(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) -Wno-deprecated-declarations
 
 $(OUTPUT)test-gtk2-infobar.bin:
 	$(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null)
diff --git a/tools/perf/ui/gtk/Build b/tools/perf/ui/gtk/Build
index ec22e899a224..eef708c502f4 100644
--- a/tools/perf/ui/gtk/Build
+++ b/tools/perf/ui/gtk/Build
@@ -1,4 +1,4 @@
-CFLAGS_gtk += -fPIC $(GTK_CFLAGS)
+CFLAGS_gtk += -fPIC $(GTK_CFLAGS) -Wno-deprecated-declarations
 
 gtk-y += browser.o
 gtk-y += hists.o
@@ -7,3 +7,8 @@ gtk-y += util.o
 gtk-y += helpline.o
 gtk-y += progress.o
 gtk-y += annotate.o
+gtk-y += zalloc.o
+
+$(OUTPUT)ui/gtk/zalloc.o: ../lib/zalloc.c FORCE
+	$(call rule_mkdir)
+	$(call if_changed_dep,cc_o_c)


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* Re: [GIT PULL 0/6] perf/urgent fixes
  2020-01-13  9:25   ` Jiri Olsa
@ 2020-01-13  9:44     ` Ravi Bangoria
  0 siblings, 0 replies; 18+ messages in thread
From: Ravi Bangoria @ 2020-01-13  9:44 UTC (permalink / raw)
  To: Jiri Olsa
  Cc: Arnaldo Carvalho de Melo, Jiri Olsa, Ingo Molnar,
	Thomas Gleixner, Namhyung Kim, Clark Williams, linux-kernel,
	linux-perf-users, Adrian Hunter, Arnaldo Carvalho de Melo,
	Ravi Bangoria



On 1/13/20 2:55 PM, Jiri Olsa wrote:
> On Mon, Jan 13, 2020 at 01:58:59PM +0530, Ravi Bangoria wrote:
> 
> SNIP
> 
>>          | ^~~~
>>    In file included from /usr/include/glib-2.0/gobject/gobject.h:24,
>>                     from /usr/include/glib-2.0/gobject/gbinding.h:29,
>>                     from /usr/include/glib-2.0/glib-object.h:23,
>>                     from /usr/include/glib-2.0/gio/gioenums.h:28,
>>                     from /usr/include/glib-2.0/gio/giotypes.h:28,
>>                     from /usr/include/glib-2.0/gio/gio.h:26,
>>                     from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
>>                     from /usr/include/gtk-2.0/gdk/gdk.h:32,
>>                     from /usr/include/gtk-2.0/gtk/gtk.h:32,
>>                     from test-gtk2.c:3:
>>    /usr/include/glib-2.0/gobject/gtype.h:679:1: note: declared here
>>      679 | {
>>          | ^
>>    In file included from /usr/include/gtk-2.0/gtk/gtktoolitem.h:31,
>>                     from /usr/include/gtk-2.0/gtk/gtktoolbutton.h:30,
>>                     from /usr/include/gtk-2.0/gtk/gtkmenutoolbutton.h:30,
>>                     from /usr/include/gtk-2.0/gtk/gtk.h:126,
>>                     from test-gtk2.c:3:
>>    /usr/include/gtk-2.0/gtk/gtktooltips.h:73:3: error: ‘GTimeVal’ is deprecated: Use 'GDateTime' instead [-Werror=deprecated-declarations]
>>       73 |   GTimeVal last_popdown;
>>          |   ^~~~~~~~
>>    In file included from /usr/include/glib-2.0/glib/galloca.h:32,
>>                     from /usr/include/glib-2.0/glib.h:30,
>>                     from /usr/include/glib-2.0/gobject/gbinding.h:28,
>>                     from /usr/include/glib-2.0/glib-object.h:23,
>>                     from /usr/include/glib-2.0/gio/gioenums.h:28,
>>                     from /usr/include/glib-2.0/gio/giotypes.h:28,
>>                     from /usr/include/glib-2.0/gio/gio.h:26,
>>                     from /usr/include/gtk-2.0/gdk/gdkapplaunchcontext.h:30,
>>                     from /usr/include/gtk-2.0/gdk/gdk.h:32,
>>                     from /usr/include/gtk-2.0/gtk/gtk.h:32,
>>                     from test-gtk2.c:3:
>>    /usr/include/glib-2.0/glib/gtypes.h:551:8: note: declared here
>>      551 | struct _GTimeVal
>>          |        ^~~~~~~~~
>>    cc1: all warnings being treated as errors
>>
> 
> patch below fixes that for me.. please let me know
> if it works for you and I'll post full patch
> 
> jirka
> 

LGTM. You can add:

Tested-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>


^ permalink raw reply	[flat|nested] 18+ messages in thread
* [tip: perf/core] perf tools: Use %define api.pure full instead of %pure-parser
  2020-01-12 19:22           ` [PATCH] perf tools: Use %define api.pure full instead of %pure-parser Jiri Olsa
@ 2020-01-20  8:27             ` tip-bot2 for Jiri Olsa
  0 siblings, 0 replies; 18+ messages in thread
From: tip-bot2 for Jiri Olsa @ 2020-01-20  8:27 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Jiri Olsa, Adrian Hunter, Clark Williams, Namhyung Kim,
	Ravi Bangoria, Thomas Gleixner, Arnaldo Carvalho de Melo, x86,
	LKML

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     fc8c0a99223367b071c83711259d754b6bb7a379
Gitweb:        https://git.kernel.org/tip/fc8c0a99223367b071c83711259d754b6bb7a379
Author:        Jiri Olsa <jolsa@redhat.com>
AuthorDate:    Sun, 12 Jan 2020 20:22:59 +01:00
Committer:     Arnaldo Carvalho de Melo <acme@redhat.com>
CommitterDate: Tue, 14 Jan 2020 12:02:19 -03:00

perf tools: Use %define api.pure full instead of %pure-parser

bison deprecated the "%pure-parser" directive in favor of "%define
api.pure full".

The api.pure got introduced in bison 2.3 (Oct 2007), so it seems safe to
use it without any version check.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lore.kernel.org/lkml/20200112192259.GA35080@krava
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/expr.y         | 3 ++-
 tools/perf/util/parse-events.y | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y
index f9a20a3..7d22624 100644
--- a/tools/perf/util/expr.y
+++ b/tools/perf/util/expr.y
@@ -12,7 +12,8 @@
 #define MAXIDLEN 256
 %}
 
-%pure-parser
+%define api.pure full
+
 %parse-param { double *final_val }
 %parse-param { struct parse_ctx *ctx }
 %parse-param { const char **pp }
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index e2eea4e..94f8bcd 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -1,4 +1,4 @@
-%pure-parser
+%define api.pure full
 %parse-param {void *_parse_state}
 %parse-param {void *scanner}
 %lex-param {void* scanner}

^ permalink raw reply related	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2020-01-20  8:27 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-05 19:32 [GIT PULL 0/6] perf/urgent fixes Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 1/6] perf report/top TUI: Replace pr_err() with ui__error() Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 2/6] perf report: Make -F more strict like -s Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 3/6] perf report: Bail out --mem-mode if mem info is not available Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 4/6] perf inject: Fix processing of ID index for injected instruction tracing Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 5/6] tools headers UAPI: Sync drm/i915_drm.h with the kernel sources Arnaldo Carvalho de Melo
2019-12-05 19:32 ` [PATCH 6/6] tools headers UAPI: Update tools's copy of drm.h headers Arnaldo Carvalho de Melo
2019-12-06  7:57 ` [GIT PULL 0/6] perf/urgent fixes Ingo Molnar
2019-12-06 14:24   ` Arnaldo Carvalho de Melo
2019-12-06 14:25   ` Jiri Olsa
2019-12-06 14:43     ` Arnaldo Carvalho de Melo
2019-12-06 15:04       ` Jiri Olsa
2019-12-06 15:35         ` Arnaldo Carvalho de Melo
2020-01-12 19:22           ` [PATCH] perf tools: Use %define api.pure full instead of %pure-parser Jiri Olsa
2020-01-20  8:27             ` [tip: perf/core] " tip-bot2 for Jiri Olsa
2020-01-13  8:28 ` [GIT PULL 0/6] perf/urgent fixes Ravi Bangoria
2020-01-13  9:25   ` Jiri Olsa
2020-01-13  9:44     ` Ravi Bangoria

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).