• Sandipan Das's avatar
    perf tests: Fix complex event name parsing · a6f39cec
    Sandipan Das authored
    The 'umask' event parameter is unsupported on some architectures like
    This can be observed on a powerpc64le system running Fedora 27 as shown
      # perf test "Parse event definition strings" -v
       6: Parse event definition strings                        :
      --- start ---
      test child forked, pid 45915
      running test 3 'cpu/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks',period=0x1,event=0x2,umask=0x3/ukp'Invalid event/parameter 'umask'
      Invalid event/parameter 'umask'
      failed to parse event 'cpu/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks',period=0x1,event=0x2,umask=0x3/ukp', err 1, str 'unknown term'
      event syntax error: '..,event=0x2,umask=0x3/ukp'
                                        \___ unknown term
      valid terms: event,mark,pmc,cache_sel,pmcxsel,unit,thresh_stop,thresh_start,combine,thresh_sel,thresh_cmp,sample_mode,config,config1,config2,name,period,freq,branch_type,time,call-graph,stack-size,no-inherit,inherit,max-stack,no-overwrite,overwrite,driver-config
      mem_access -> cpu/event=0x10401e0/
      running test 0 'config=10,config1,config2=3,umask=1'
      test child finished with 1
      ---- end ----
      Parse event definition strings: FAILED!
    Committer testing:
    After applying the patch these test passes and in verbose mode we get:
      # perf test -v "event definition"
       6: Parse event definition strings:
      --- start ---
      test child forked, pid 11061
      running test 0 'syscalls:sys_enter_openat'Using CPUID GenuineIntel-6-9E
      running test 53 'cycles/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks'/Duk'
      running test 0 'cpu/config=10,config1,config2=3,period=1000/u'
      running test 1 'cpu/config=1,name=krava/u,cpu/config=2/u'
      running test 2 'cpu/config=1,call-graph=fp,time,period=100000/,cpu/config=2,call-graph=no,time=0,period=2000/'
      running test 3 'cpu/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks',period=0x1,event=0x2/ukp'
      test child finished with 0
      ---- end ----
      Parse event definition strings: Ok
    Suggested-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.com>
    Signed-off-by: default avatarSandipan Das <sandipan@linux.ibm.com>
    Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
    Fixes: 06dc5bf2 ("perf tests: Check that complex event name is parsed correctly")
    Link: http://lkml.kernel.org/r/20180726105502.31670-1-sandipan@linux.ibm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parse-events.c 64.5 KB