v8: --- Change PERF_BR_NONE to PERF_BR_UNKNOWN according to Peter's comments. No other functional changes.
v7: --- Redefine the common branch types according to review comments from Michael Ellerman <m...@ellerman.id.au> Now the patch series just defines a minimum but more common set of branch types. PERF_BR_NONE : unknown PERF_BR_COND :conditional PERF_BR_UNCOND : unconditional PERF_BR_IND : indirect PERF_BR_CALL : function call PERF_BR_IND_CALL : indirect function call PERF_BR_RET : function return PERF_BR_SYSCALL : syscall PERF_BR_SYSRET : syscall return PERF_BR_COND_CALL : conditional function call PERF_BR_COND_RET : conditional function return v6: --- Update according to the review comments from Jiri Olsa <jo...@redhat.com>. Major modifications are: 1. Move that multiline conditional code inside {} brackets. 2. Move branch_type_stat_display() from builtin-report.c to branch.c. Move branch_type_str() from callchain.c to branch.c. 3. Keep the original branch info display order, that is: predicted, abort, cycles, iterations v5: --- Mainly the v5 patch series are updated according to comments from Jiri Olsa <jo...@redhat.com>. The kernel part doesn't have functional change. It just solve the merge issue. In userspace, the functions of branch type counting and branch type name resolving are moved to the new files: util/branch.c, util/branch.h. And refactor the branch info printing code for better maintenance. Not changed (or just fix merge issue): perf/core: Define the common branch type classification perf/x86/intel: Record branch type perf record: Create a new option save_type in --branch-filter New patches: perf report: Refactor the branch info printing code perf util: Create branch.c/.h for common branch functions Changed: perf report: Show branch type statistics for stdio mode perf report: Show branch type in callchain entry v4: --- 1. Describe the major changes in patch description. Thanks for Peter Zijlstra's reminding. 2. Initialize branch type to 0 in intel_pmu_lbr_read_32 and intel_pmu_lbr_read_64. Remove the invalid else code in intel_pmu_lbr_filter. v3: --- 1. Move the JCC forward/backward and cross page computing from kernel to userspace. 2. Use lookup table to replace original switch/case processing. Changed: perf/core: Define the common branch type classification perf/x86/intel: Record branch type perf report: Show branch type statistics for stdio mode perf report: Show branch type in callchain entry Not changed: perf record: Create a new option save_type in --branch-filter v2: --- 1. Use 4 bits in perf_branch_entry to record branch type. 2. Pull out some common branch types from FAR_BRANCH. Now the branch types defined in perf_event.h: Jin Yao (7): perf/core: Define the common branch type classification perf/x86/intel: Record branch type perf record: Create a new option save_type in --branch-filter perf report: Refactor the branch info printing code perf util: Create branch.c/.h for common branch functions perf report: Show branch type statistics for stdio mode perf report: Show branch type in callchain entry arch/x86/events/intel/lbr.c | 53 +++++++++- include/uapi/linux/perf_event.h | 27 ++++- tools/include/uapi/linux/perf_event.h | 27 ++++- tools/perf/Documentation/perf-record.txt | 1 + tools/perf/builtin-report.c | 25 +++++ tools/perf/util/Build | 1 + tools/perf/util/branch.c | 166 +++++++++++++++++++++++++++++++ tools/perf/util/branch.h | 25 +++++ tools/perf/util/callchain.c | 140 ++++++++++++++------------ tools/perf/util/callchain.h | 5 +- tools/perf/util/event.h | 3 +- tools/perf/util/hist.c | 5 +- tools/perf/util/machine.c | 26 +++-- tools/perf/util/parse-branch-options.c | 1 + 14 files changed, 421 insertions(+), 84 deletions(-) create mode 100644 tools/perf/util/branch.c create mode 100644 tools/perf/util/branch.h -- 2.7.4