* Re: [PATCH] perf report: Fix broken arrow at row 0 in annotate view
2017-06-08 6:01 [PATCH] perf report: Fix broken arrow at row 0 in annotate view Jin Yao
@ 2017-07-07 5:11 ` Jin, Yao
2017-07-07 12:20 ` Arnaldo Carvalho de Melo
2017-07-07 14:21 ` Arnaldo Carvalho de Melo
2017-07-11 8:50 ` [tip:perf/urgent] perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target tip-bot for Jin Yao
2 siblings, 1 reply; 5+ messages in thread
From: Jin, Yao @ 2017-07-07 5:11 UTC (permalink / raw)
To: acme, jolsa, peterz, mingo, alexander.shishkin
Cc: Linux-kernel, ak, kan.liang, yao.jin
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;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] perf report: Fix broken arrow at row 0 in annotate view
2017-07-07 5:11 ` Jin, Yao
@ 2017-07-07 12:20 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-07-07 12:20 UTC (permalink / raw)
To: Jin, Yao
Cc: jolsa, peterz, mingo, alexander.shishkin, Linux-kernel, ak,
kan.liang, yao.jin
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;
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] perf report: Fix broken arrow at row 0 in annotate view
2017-06-08 6:01 [PATCH] perf report: Fix broken arrow at row 0 in annotate view Jin Yao
2017-07-07 5:11 ` Jin, Yao
@ 2017-07-07 14:21 ` Arnaldo Carvalho de Melo
2017-07-11 8:50 ` [tip:perf/urgent] perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target tip-bot for Jin Yao
2 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2017-07-07 14:21 UTC (permalink / raw)
To: Jin Yao
Cc: jolsa, peterz, mingo, alexander.shishkin, Linux-kernel, ak,
kan.liang, yao.jin
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip:perf/urgent] perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target
2017-06-08 6:01 [PATCH] perf report: Fix broken arrow at row 0 in annotate view Jin Yao
2017-07-07 5:11 ` Jin, Yao
2017-07-07 14:21 ` Arnaldo Carvalho de Melo
@ 2017-07-11 8:50 ` tip-bot for Jin Yao
2 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Jin Yao @ 2017-07-11 8:50 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, acme, mingo, peterz, alexander.shishkin, linux-kernel,
yao.jin, ak, hpa, kan.liang, jolsa
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;
^ permalink raw reply related [flat|nested] 5+ messages in thread