perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: ce75632cc4012f1832bd56efd97c2ba75ca964bb Merge tag 'perf-hists-hierarchy-fixes-for-mingo-20161111' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
An uncore PMU driver hardware enablement change for Intel SkyLake uncore PMUs (Skylake Y, U, H and S platforms), plus a number of tooling fixes for the histogram handling/displaying code.
Thanks,
Ingo
------------------>
Kan Liang (1):
perf/x86/intel/uncore: Add more Intel uncore IMC PCI IDs for SkyLake
Namhyung Kim (5):
perf hist browser: Fix hierarchy column counts
perf hists browser: Fix indentation of folded sign on --hierarchy perf hists browser: Show folded sign properly on --hierarchy perf hists browser: Fix column indentation on --hierarchy perf hists: Fix column length on --hierarchy
arch/x86/events/intel/uncore_snb.c | 32 +++++++++++++++++++++---- tools/perf/ui/browsers/hists.c | 48 +++++++++++++++++++++++++++++--------- tools/perf/util/hist.c | 12 +++++----- 3 files changed, 71 insertions(+), 21 deletions(-)
arch/x86/events/intel/uncore_snb.c +28 -4
@@ -8,8 +8,12 @@#define PCI_DEVICE_ID_INTEL_HSW_IMC 0x0c00#define PCI_DEVICE_ID_INTEL_HSW_U_IMC 0x0a04#define PCI_DEVICE_ID_INTEL_BDW_IMC 0x1604 -#define PCI_DEVICE_ID_INTEL_SKL_IMC 0x191f -#define PCI_DEVICE_ID_INTEL_SKL_U_IMC 0x190c +#define PCI_DEVICE_ID_INTEL_SKL_U_IMC 0x1904 +#define PCI_DEVICE_ID_INTEL_SKL_Y_IMC 0x190c +#define PCI_DEVICE_ID_INTEL_SKL_HD_IMC 0x1900 +#define PCI_DEVICE_ID_INTEL_SKL_HQ_IMC 0x1910 +#define PCI_DEVICE_ID_INTEL_SKL_SD_IMC 0x190f +#define PCI_DEVICE_ID_INTEL_SKL_SQ_IMC 0x191f/* SNB event control */ #define SNB_UNC_CTL_EV_SEL_MASK 0x000000ff
@@ -616,13 +620,29 @@ static const struct pci_device_id bdw_uncore_pci_ids[] = {static const struct pci_device_id skl_uncore_pci_ids[] = { {/* IMC */ -PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_IMC ), +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_Y_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), }, {/* IMC */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_U_IMC ), .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HD_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_HQ_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SD_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, + {/* IMC */ +PCI_DEVICE (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_SKL_SQ_IMC ), + .driver_data =UNCORE_PCI_DEV_DATA (SNB_PCI_UNCORE_IMC ,0 ), + }, {/* end: all zeroes */ }, };
@@ -666,8 +686,12 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = {IMC_DEV (HSW_IMC , &hsw_uncore_pci_driver),/* 4th Gen Core Processor */ IMC_DEV (HSW_U_IMC , &hsw_uncore_pci_driver),/* 4th Gen Core ULT Mobile Processor */ IMC_DEV (BDW_IMC , &bdw_uncore_pci_driver),/* 5th Gen Core U */ -IMC_DEV (SKL_IMC , &skl_uncore_pci_driver),/* 6th Gen Core */ +IMC_DEV (SKL_Y_IMC , &skl_uncore_pci_driver),/* 6th Gen Core Y */ IMC_DEV (SKL_U_IMC , &skl_uncore_pci_driver),/* 6th Gen Core U */ +IMC_DEV (SKL_HD_IMC , &skl_uncore_pci_driver),/* 6th Gen Core H Dual Core */ +IMC_DEV (SKL_HQ_IMC , &skl_uncore_pci_driver),/* 6th Gen Core H Quad Core */ +IMC_DEV (SKL_SD_IMC , &skl_uncore_pci_driver),/* 6th Gen Core S Dual Core */ + IMC_DEV(SKL_SQ_IMC, &skl_uncore_pci_driver), /* 6th Gen Core S Quad Core */ { /* end marker */ } };
tools/perf/ui/browsers/hists.c +37 -11
90 lines not on this page · raw message
tools/perf/util/hist.c +6 -6
@@ -1600,18 +1600,18 @@ static void hists__hierarchy_output_resort(struct hists *hists,if (prog)ui_progress__update (prog,1 ); + hists->nr_entries++; +if (!he->filtered) { + hists->nr_non_filtered_entries++; +hists__calc_col_len (hists, he); + } +if (!he->leaf) {hists__hierarchy_output_resort (hists, prog, &he->hroot_in, &he->hroot_out, min_callchain_hits, use_callchain); - hists->nr_entries++; -if (!he->filtered) { - hists->nr_non_filtered_entries++; -hists__calc_col_len (hists, he); - } -continue ; }