[PATCH] perf report: Fix broken arrow at row 0 in annotate view

[PATCH] perf report: Fix broken arrow at row 0 in annotate view

[Jin Yao]

When the jump instruction is displayed at the row 0 in annotate view,
the arrow is broken. An example:

 16.86 │   ┌──je     82
  0.01 │      movsd  (%rsp),%xmm0
       │      movsd  0x8(%rsp),%xmm4
       │      movsd  0x8(%rsp),%xmm1
       │      movsd  (%rsp),%xmm3
       │      divsd  %xmm4,%xmm0
       │      divsd  %xmm3,%xmm1
       │      movsd  (%rsp),%xmm2
       │      addsd  %xmm1,%xmm0
       │      addsd  %xmm2,%xmm0
       │      movsd  %xmm0,(%rsp)
       │82:   sub    $0x1,%ebx
 83.03 │    ↑ jne    38
       │      add    $0x10,%rsp
       │      xor    %eax,%eax
       │      pop    %rbx
       │    ← retq

The patch increments the row number before checking with 0.

Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
---
 tools/perf/ui/browser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index a4d3762..83874b0 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -704,7 +704,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
 		ui_browser__gotorc(browser, row, column + 1);
 		SLsmg_draw_hline(2);
 
-		if (row++ == 0)
+		if (++row == 0)
 			goto out;
 	} else
 		row = 0;
-- 
2.7.4

Re: [PATCH] perf report: Fix broken arrow at row 0 in annotate view

[Jin, Yao]

Hi Arnaldo,

Could this patch be merged?

Otherwise the jump arrow is broken when it's displayed at the row 0 in 
annotate view.

Thanks

Jin Yao

On 6/8/2017 2:01 PM, Jin Yao wrote:
> When the jump instruction is displayed at the row 0 in annotate view,
> the arrow is broken. An example:
>
>   16.86 │   ┌──je     82
>    0.01 │      movsd  (%rsp),%xmm0
>         │      movsd  0x8(%rsp),%xmm4
>         │      movsd  0x8(%rsp),%xmm1
>         │      movsd  (%rsp),%xmm3
>         │      divsd  %xmm4,%xmm0
>         │      divsd  %xmm3,%xmm1
>         │      movsd  (%rsp),%xmm2
>         │      addsd  %xmm1,%xmm0
>         │      addsd  %xmm2,%xmm0
>         │      movsd  %xmm0,(%rsp)
>         │82:   sub    $0x1,%ebx
>   83.03 │    ↑ jne    38
>         │      add    $0x10,%rsp
>         │      xor    %eax,%eax
>         │      pop    %rbx
>         │    ← retq
>
> The patch increments the row number before checking with 0.
>
> Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
> ---
>   tools/perf/ui/browser.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
> index a4d3762..83874b0 100644
> --- a/tools/perf/ui/browser.c
> +++ b/tools/perf/ui/browser.c
> @@ -704,7 +704,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
>   		ui_browser__gotorc(browser, row, column + 1);
>   		SLsmg_draw_hline(2);
>   
> -		if (row++ == 0)
> +		if (++row == 0)
>   			goto out;
>   	} else
>   		row = 0;

Re: [PATCH] perf report: Fix broken arrow at row 0 in annotate view

[Arnaldo Carvalho de Melo]

Em Fri, Jul 07, 2017 at 01:11:42PM +0800, Jin, Yao escreveu:
> Hi Arnaldo,
> 
> Could this patch be merged?

I'll test this one and the v4 fused ins series, thanks for following
this up!

- Arnaldo
 
> Otherwise the jump arrow is broken when it's displayed at the row 0 in
> annotate view.
> 
> Thanks
> 
> Jin Yao
> 
> On 6/8/2017 2:01 PM, Jin Yao wrote:
> > When the jump instruction is displayed at the row 0 in annotate view,
> > the arrow is broken. An example:
> > 
> >   16.86 │   ┌──je     82
> >    0.01 │      movsd  (%rsp),%xmm0
> >         │      movsd  0x8(%rsp),%xmm4
> >         │      movsd  0x8(%rsp),%xmm1
> >         │      movsd  (%rsp),%xmm3
> >         │      divsd  %xmm4,%xmm0
> >         │      divsd  %xmm3,%xmm1
> >         │      movsd  (%rsp),%xmm2
> >         │      addsd  %xmm1,%xmm0
> >         │      addsd  %xmm2,%xmm0
> >         │      movsd  %xmm0,(%rsp)
> >         │82:   sub    $0x1,%ebx
> >   83.03 │    ↑ jne    38
> >         │      add    $0x10,%rsp
> >         │      xor    %eax,%eax
> >         │      pop    %rbx
> >         │    ← retq
> > 
> > The patch increments the row number before checking with 0.
> > 
> > Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
> > ---
> >   tools/perf/ui/browser.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
> > index a4d3762..83874b0 100644
> > --- a/tools/perf/ui/browser.c
> > +++ b/tools/perf/ui/browser.c
> > @@ -704,7 +704,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
> >   		ui_browser__gotorc(browser, row, column + 1);
> >   		SLsmg_draw_hline(2);
> > -		if (row++ == 0)
> > +		if (++row == 0)
> >   			goto out;
> >   	} else
> >   		row = 0;

Re: [PATCH] perf report: Fix broken arrow at row 0 in annotate view

[Arnaldo Carvalho de Melo]

Em Thu, Jun 08, 2017 at 02:01:44PM +0800, Jin Yao escreveu:
> When the jump instruction is displayed at the row 0 in annotate view,
> the arrow is broken. An example:
> 
>  16.86 │   ┌──je     82
>   0.01 │      movsd  (%rsp),%xmm0
>        │      movsd  0x8(%rsp),%xmm4
>        │      movsd  0x8(%rsp),%xmm1
>        │      movsd  (%rsp),%xmm3
>        │      divsd  %xmm4,%xmm0
>        │      divsd  %xmm3,%xmm1
>        │      movsd  (%rsp),%xmm2
>        │      addsd  %xmm1,%xmm0
>        │      addsd  %xmm2,%xmm0
>        │      movsd  %xmm0,(%rsp)
>        │82:   sub    $0x1,%ebx
>  83.03 │    ↑ jne    38
>        │      add    $0x10,%rsp
>        │      xor    %eax,%eax
>        │      pop    %rbx
>        │    ← retq
> 
> The patch increments the row number before checking with 0.

Thanks, tested and applied!

- Arnaldo

[tip:perf/urgent] perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target

[tip-bot for Jin Yao]

Commit-ID:  80f62589fa52f530cffc50e78c0b5a2ae572d61e
Gitweb:     http://git.kernel.org/tip/80f62589fa52f530cffc50e78c0b5a2ae572d61e
Author:     Jin Yao <yao.jin@linux.intel.com>
AuthorDate: Thu, 8 Jun 2017 14:01:44 +0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 10 Jul 2017 16:36:40 -0300

perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target

When the jump instruction is displayed at the row 0 in annotate view,
the arrow is broken. An example:

 16.86 │   ┌──je     82
  0.01 │      movsd  (%rsp),%xmm0
       │      movsd  0x8(%rsp),%xmm4
       │      movsd  0x8(%rsp),%xmm1
       │      movsd  (%rsp),%xmm3
       │      divsd  %xmm4,%xmm0
       │      divsd  %xmm3,%xmm1
       │      movsd  (%rsp),%xmm2
       │      addsd  %xmm1,%xmm0
       │      addsd  %xmm2,%xmm0
       │      movsd  %xmm0,(%rsp)
       │82:   sub    $0x1,%ebx
 83.03 │    ↑ jne    38
       │      add    $0x10,%rsp
       │      xor    %eax,%eax
       │      pop    %rbx
       │    ← retq

The patch increments the row number before checking with 0.

Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
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: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Fixes: 944e1abed9e1 ("perf ui browser: Add method to draw up/down arrow line")
Link: http://lkml.kernel.org/r/1496901704-30275-1-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index a4d3762..83874b0 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -704,7 +704,7 @@ static void __ui_browser__line_arrow_down(struct ui_browser *browser,
 		ui_browser__gotorc(browser, row, column + 1);
 		SLsmg_draw_hline(2);
 
-		if (row++ == 0)
+		if (++row == 0)
 			goto out;
 	} else
 		row = 0;