Skip to contentSkip to conversation

perf report: Fix branch stack mode cannot be set

PATCH Applied He Kuang 3 participants 4 messages Feb 15, 2015 – Feb 28, 2015 perf events

lore
Share & tools
lore

He Kuang

author
#0 lore raw

PATCH 1/1 perf report: Fix branch stack mode cannot be set

When perf.data file be abtained by using 'perf record -b', perf report should use branch stack mode to generate output. But this function is broken by improper comparison between boolean and constant -1.

before this patch:
$perf report -b -i perf.data
Samples: 16 of event 'cycles', Event count (approx.): 3171896

Overhead  Command  Shared Object      Symbol
  13.59%  ls       [kernel.kallsyms]  [k] prio_tree_remove
  13.16%  ls       [kernel.kallsyms]  [k] change_pte_range
  12.09%  ls       [kernel.kallsyms]  [k] page_fault
  12.02%  ls       [kernel.kallsyms]  [k] zap_pte_range

...

after this patch:
$perf report -b -i perf.data
Samples: 256 of event 'cycles', Event count (approx.): 256

Overhead  Command  Source Shared Object  Source Symbol                               Target Shared Object  Target Symbol
   9.38%  ls       [unknown]             [k] 0000000000000000                        [unknown]             [k] 0000000000000000
   6.25%  ls       libc-2.19.so          [.] _dl_addr                                libc-2.19.so          [.] _dl_addr
   6.25%  ls       [kernel.kallsyms]     [k] zap_pte_range                           [kernel.kallsyms]     [k] zap_pte_range
   6.25%  ls       [kernel.kallsyms]     [k] change_pte_range                        [kernel.kallsyms]     [k] change_pte_range
   0.39%  ls       [kernel.kallsyms]     [k] prio_tree_remove                        [kernel.kallsyms]     [k] prio_tree_remove

...

---
 tools/perf/builtin-report.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-report.c +1 -1
index 2f91094..ecc453b 100644
@@ -766,7 +766,7 @@ repeat:
 	 * 0/1 means the user chose a mode.
 	 */
 	if (((branch_mode == -1 && has_br_stack) || branch_mode == 1) &&
-	    branch_call_mode == -1) {
+	    !branch_call_mode) {
 		sort__mode = SORT_MODE__BRANCH;
 		symbol_conf.cumulate_callchain = false;
 	}
Signature · 1 line
2.2.0.33.gc18b867
author
#1 lore raw

ping..

Quoted 43 lines · He Kuang

When perf.data file be abtained by using 'perf record -b', perf report should use branch stack mode to generate output. But this function is broken by improper comparison between boolean and constant -1.

before this patch:
$perf report -b -i perf.data
Samples: 16 of event 'cycles', Event count (approx.): 3171896
Overhead Command Shared Object Symbol

   13.59%  ls       [kernel.kallsyms]  [k] prio_tree_remove
   13.16%  ls       [kernel.kallsyms]  [k] change_pte_range
   12.09%  ls       [kernel.kallsyms]  [k] page_fault
   12.02%  ls       [kernel.kallsyms]  [k] zap_pte_range

...

after this patch:
$perf report -b -i perf.data
Samples: 256 of event 'cycles', Event count (approx.): 256
Overhead Command Source Shared Object Source Symbol Target Shared Object Target Symbol

    9.38%  ls       [unknown]             [k] 0000000000000000                        [unknown]             [k] 0000000000000000
    6.25%  ls       libc-2.19.so          [.] _dl_addr                                libc-2.19.so          [.] _dl_addr
    6.25%  ls       [kernel.kallsyms]     [k] zap_pte_range                           [kernel.kallsyms]     [k] zap_pte_range
    6.25%  ls       [kernel.kallsyms]     [k] change_pte_range                        [kernel.kallsyms]     [k] change_pte_range
    0.39%  ls       [kernel.kallsyms]     [k] prio_tree_remove                        [kernel.kallsyms]     [k] prio_tree_remove

...

---
  tools/perf/builtin-report.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-report.c +1 -1
index 2f91094..ecc453b 100644
@@ -766,7 +766,7 @@ repeat:
  	 * 0/1 means the user chose a mode.
  	 */
  	if (((branch_mode == -1 && has_br_stack) || branch_mode == 1) &&
-	    branch_call_mode == -1) {
+	    !branch_call_mode) {
  		sort__mode = SORT_MODE__BRANCH;
  		symbol_conf.cumulate_callchain = false;
  	}
maintainer Applied
#2 lore raw

Em Fri, Feb 27, 2015 at 05:58:44PM +0800, He Kuang escreveu:

Quoted 1 line

ping..

Thanks, applied to perf/core.

- Arnaldo

Quoted 45 lines · He Kuang
Quoted 43 lines

When perf.data file be abtained by using 'perf record -b', perf report should use branch stack mode to generate output. But this function is broken by improper comparison between boolean and constant -1.

before this patch:
$perf report -b -i perf.data
Samples: 16 of event 'cycles', Event count (approx.): 3171896

Overhead  Command  Shared Object      Symbol
  13.59%  ls       [kernel.kallsyms]  [k] prio_tree_remove
  13.16%  ls       [kernel.kallsyms]  [k] change_pte_range
  12.09%  ls       [kernel.kallsyms]  [k] page_fault
  12.02%  ls       [kernel.kallsyms]  [k] zap_pte_range

...

after this patch:
$perf report -b -i perf.data
Samples: 256 of event 'cycles', Event count (approx.): 256

Overhead  Command  Source Shared Object  Source Symbol                               Target Shared Object  Target Symbol
   9.38%  ls       [unknown]             [k] 0000000000000000                        [unknown]             [k] 0000000000000000
   6.25%  ls       libc-2.19.so          [.] _dl_addr                                libc-2.19.so          [.] _dl_addr
   6.25%  ls       [kernel.kallsyms]     [k] zap_pte_range                           [kernel.kallsyms]     [k] zap_pte_range
   6.25%  ls       [kernel.kallsyms]     [k] change_pte_range                        [kernel.kallsyms]     [k] change_pte_range
   0.39%  ls       [kernel.kallsyms]     [k] prio_tree_remove                        [kernel.kallsyms]     [k] prio_tree_remove

...

---
 tools/perf/builtin-report.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-report.c +1 -1
index 2f91094..ecc453b 100644
@@ -766,7 +766,7 @@ repeat:
 	 * 0/1 means the user chose a mode.
 	 */
 	if (((branch_mode == -1 && has_br_stack) || branch_mode == 1) &&
-	    branch_call_mode == -1) {
+	    !branch_call_mode) {
 		sort__mode = SORT_MODE__BRANCH;
 		symbol_conf.cumulate_callchain = false;
 	}
#3 lore raw
In reply to He Kuang
perf report: Fix branch stack mode cannot be set
Commit-ID:  fefd2d9619de3bf0bf02a8622e9f445c3d19cc3f
Gitweb:     http://git.kernel.org/tip/fefd2d9619de3bf0bf02a8622e9f445c3d19cc3f
Author:     He Kuang <[email protected]>
AuthorDate: Sun, 15 Feb 2015 10:33:37 +0800
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 27 Feb 2015 15:52:42 -0300

perf report: Fix branch stack mode cannot be set

When perf.data file is obtained using 'perf record -b', perf report should use branch stack mode to generate output. But this function is broken by improper comparison between boolean and constant -1.

before this patch:

  $ perf report -b -i perf.data
  Samples: 16  of event 'cycles', Event count (approx.): 3171896
  Overhead  Command  Shared Object      Symbol
    13.59%  ls       [kernel.kallsyms]  [k] prio_tree_remove
    13.16%  ls       [kernel.kallsyms]  [k] change_pte_range
    12.09%  ls       [kernel.kallsyms]  [k] page_fault
    12.02%  ls       [kernel.kallsyms]  [k] zap_pte_range
  ...

after this patch:

  $ perf report -b -i perf.data
  Samples: 256  of event 'cycles', Event count (approx.): 256
  Overhead  Command  Source Shared Object  Source Symbol                               Target Shared Object  Target Symbol
     9.38%  ls       [unknown]             [k] 0000000000000000                        [unknown]             [k] 0000000000000000
     6.25%  ls       libc-2.19.so          [.] _dl_addr                                libc-2.19.so          [.] _dl_addr
     6.25%  ls       [kernel.kallsyms]     [k] zap_pte_range                           [kernel.kallsyms]     [k] zap_pte_range
     6.25%  ls       [kernel.kallsyms]     [k] change_pte_range                        [kernel.kallsyms]     [k] change_pte_range
     0.39%  ls       [kernel.kallsyms]     [k] prio_tree_remove                        [kernel.kallsyms]     [k] prio_tree_remove
  ...
---
 tools/perf/builtin-report.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-report.c +1 -1
index 0ba5f07..fb35034 100644
@@ -768,7 +768,7 @@ repeat:
 	 * 0/1 means the user chose a mode.
 	 */
 	if (((branch_mode == -1 && has_br_stack) || branch_mode == 1) &&
-	    branch_call_mode == -1) {
+	    !branch_call_mode) {
 		sort__mode = SORT_MODE__BRANCH;
 		symbol_conf.cumulate_callchain = false;
 	}