Re: [PATCH V2 0/9] Support branch counters in block annotation

[Liang, Kan]

On 2024-08-12 4:13 p.m., Arnaldo Carvalho de Melo wrote:
> On Mon, Aug 12, 2024 at 12:39:17PM -0700, Namhyung Kim wrote:
>> On Thu, Aug 08, 2024 at 12:33:15PM -0700, kan.liang@xxxxxxxxxxxxxxx wrote:
>>> From: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
>>> Kan Liang (9):
>>>   perf report: Fix --total-cycles --stdio output error
>>>   perf report: Remove the first overflow check for branch counters
>>>   perf evlist: Save branch counters information
>>>   perf annotate: Save branch counters for each block
>>>   perf evsel: Assign abbr name for the branch counter events
>>>   perf report: Display the branch counter histogram
>>>   perf annotate: Display the branch counter histogram
>>>   perf script: Add branch counters
>>>   perf test: Add new test cases for the branch counter feature
>>
>> Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx>
> 
> Clashed with something here, can you please take a look and rebase to
> what is in perf-tools-next/perf-tools-next?

Tools-next/perf-tools-next doesn't include Weilin's TPEBS patch. So I
fail at the patch 5, rather than patch 6 (the failure you observed.)

Can you please update the perf-tools-next?
Or should I re-base on top of the tmp.perf-tools-next?

$ git branch -v
  master              1639fae5132b Merge tag 'drm-fixes-2023-06-17' of
git://anongit.freedesktop.org/drm/drm
* perf-tools-next     cb1898f58e0f perf annotate-data: Support
--skip-empty option
  tmp.perf-tools-next 9da782071202 perf test: Add test for Intel TPEBS
counting mode
$ git branch --show-current
perf-tools-next

$ git am lbr_event_logging_v2/000*
Applying: perf report: Fix --total-cycles --stdio output error
Applying: perf report: Remove the first overflow check for branch counters
Applying: perf evlist: Save branch counters information
Applying: perf annotate: Save branch counters for each block
Applying: perf evsel: Assign abbr name for the branch counter events
error: patch failed: tools/perf/util/evlist.c:33
error: tools/perf/util/evlist.c: patch does not apply
Patch failed at 0005 perf evsel: Assign abbr name for the branch counter
events

Thanks,
Kan

> 
> - Arnaldo
> 
>   ✓ [PATCH v2 9/9] perf test: Add new test cases for the branch counter feature
>     + Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx> (✓ DKIM/kernel.org)
>     + Reviewed-by: Andi Kleen <ak@xxxxxxxxxxxxxxx> (✓ DKIM/intel.com)
>     + Link: https://lore.kernel.org/r/20240808193324.2027665-10-kan.liang@xxxxxxxxxxxxxxx
>     + Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
>   ---
>   ✓ Signed: DKIM/intel.com (From: kan.liang@xxxxxxxxxxxxxxx)
> ---
> Total patches: 9
> ---
> Cover: ./v2_20240808_kan_liang_support_branch_counters_in_block_annotation.cover
>  Link: https://lore.kernel.org/r/20240808193324.2027665-1-kan.liang@xxxxxxxxxxxxxxx
>  Base: not specified
>        git am ./v2_20240808_kan_liang_support_branch_counters_in_block_annotation.mbx
> ⬢[acme@toolbox perf-tools-next]$        git am ./v2_20240808_kan_liang_support_branch_counters_in_block_annotation.mbx
> Applying: perf report: Fix --total-cycles --stdio output error
> Applying: perf report: Remove the first overflow check for branch counters
> Applying: perf evlist: Save branch counters information
> Applying: perf annotate: Save branch counters for each block
> Applying: perf evsel: Assign abbr name for the branch counter events
> Applying: perf report: Display the branch counter histogram
> error: patch failed: tools/perf/util/annotate.h:551
> error: tools/perf/util/annotate.h: patch does not apply
> Patch failed at 0006 perf report: Display the branch counter histogram
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> ⬢[acme@toolbox perf-tools-next]$