svn commit: r334243 - in head: . lib/libpmc lib/libpmc/pmu-events lib/libpmc/pmu-events/arch/arm64 lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53 lib/libpmc/pmu-events/arch/arm64/cavium/thunderx2 ...

[Matt Macy]

Author: mmacy
Date: Sat May 26 19:26:19 2018
New Revision: 334243
URL: https://svnweb.freebsd.org/changeset/base/334243

Log:
  Revert r334242 "pmc(3)/hwpmc(4): update supported Intel processors to rely fully on the"
  because of squash commit messages

Added:
  head/lib/libpmcstat/libpmcstat_pmu_util.c   (contents, props changed)
  head/lib/libpmcstat/pmu-events/
  head/lib/libpmcstat/pmu-events/Makefile
     - copied, changed from r334242, head/lib/libpmc/pmu-events/Makefile
  head/lib/libpmcstat/pmu-events/README
     - copied, changed from r334242, head/lib/libpmc/pmu-events/README
  head/lib/libpmcstat/pmu-events/arch/
  head/lib/libpmcstat/pmu-events/arch/arm64/
  head/lib/libpmcstat/pmu-events/arch/arm64/arm/
  head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/
  head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/branch.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/branch.json
  head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/bus.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/bus.json
  head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/cache.json
  head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/memory.json
  head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/other.json
  head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/arm64/armv8-recommended.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/armv8-recommended.json
  head/lib/libpmcstat/pmu-events/arch/arm64/cavium/
  head/lib/libpmcstat/pmu-events/arch/arm64/cavium/thunderx2/
  head/lib/libpmcstat/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json
  head/lib/libpmcstat/pmu-events/arch/arm64/hisilicon/
  head/lib/libpmcstat/pmu-events/arch/arm64/hisilicon/hip08/
  head/lib/libpmcstat/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json
  head/lib/libpmcstat/pmu-events/arch/arm64/mapfile.csv
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/arm64/mapfile.csv
  head/lib/libpmcstat/pmu-events/arch/powerpc/
  head/lib/libpmcstat/pmu-events/arch/powerpc/mapfile.csv
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/mapfile.csv
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/cache.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/frontend.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/marked.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/marked.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/memory.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/other.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/pmc.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/pmc.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power8/translation.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/translation.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/cache.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/frontend.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/marked.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/marked.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/memory.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/other.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/pmc.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/pmc.json
  head/lib/libpmcstat/pmu-events/arch/powerpc/power9/translation.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/translation.json
  head/lib/libpmcstat/pmu-events/arch/s390/
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z10/
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z10/basic.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z10/crypto.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z10/extended.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z13/
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z13/basic.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z13/crypto.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z13/extended.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z14/
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z14/basic.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z14/crypto.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z14/extended.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z196/
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z196/basic.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z196/crypto.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_z196/extended.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_zec12/
  head/lib/libpmcstat/pmu-events/arch/s390/cf_zec12/basic.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_zec12/crypto.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json
  head/lib/libpmcstat/pmu-events/arch/s390/cf_zec12/extended.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json
  head/lib/libpmcstat/pmu-events/arch/s390/mapfile.csv
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/s390/mapfile.csv
  head/lib/libpmcstat/pmu-events/arch/x86/
  head/lib/libpmcstat/pmu-events/arch/x86/bonnell/
  head/lib/libpmcstat/pmu-events/arch/x86/bonnell/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/bonnell/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/bonnell/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/bonnell/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/bonnell/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/bonnell/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/bonnell/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/bdw-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/bdw-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/uncore.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/uncore.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwell/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/uncore-cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/uncore-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/uncore-power.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-power.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/bdx-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/bdx-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/uncore-cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/uncore-interconnect.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-interconnect.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/uncore-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/uncore-power.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-power.json
  head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmont/
  head/lib/libpmcstat/pmu-events/arch/x86/goldmont/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmont/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmont/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmont/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmont/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmont/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/
  head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/hsw-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/hsw-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/uncore.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/uncore.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswell/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/hsx-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/hsx-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/uncore-cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/uncore-interconnect.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-interconnect.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/uncore-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/uncore-power.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-power.json
  head/lib/libpmcstat/pmu-events/arch/x86/haswellx/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/ivb-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/ivb-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/uncore.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/uncore.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/ivt-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/ivt-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/uncore-cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/uncore-interconnect.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-interconnect.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/uncore-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/uncore-power.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-power.json
  head/lib/libpmcstat/pmu-events/arch/x86/ivytown/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/jkt-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/jkt-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/uncore-cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/uncore-interconnect.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-interconnect.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/uncore-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/uncore-power.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-power.json
  head/lib/libpmcstat/pmu-events/arch/x86/jaketown/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/
  head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/uncore-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/uncore-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/mapfile.csv
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/mapfile.csv
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/snb-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/snb-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/uncore.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/uncore.json
  head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/silvermont/
  head/lib/libpmcstat/pmu-events/arch/x86/silvermont/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/silvermont/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/silvermont/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/silvermont/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/silvermont/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/skl-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/skl-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/uncore.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/uncore.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylake/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/skx-metrics.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/skx-metrics.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/uncore-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/uncore-other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-other.json
  head/lib/libpmcstat/pmu-events/arch/x86/skylakex/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/virtual-memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereex/
  head/lib/libpmcstat/pmu-events/arch/x86/westmereex/cache.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/cache.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereex/floating-point.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/floating-point.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereex/frontend.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/frontend.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereex/memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/memory.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereex/other.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/other.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereex/pipeline.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/pipeline.json
  head/lib/libpmcstat/pmu-events/arch/x86/westmereex/virtual-memory.json
     - copied, changed from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/virtual-memory.json
  head/lib/libpmcstat/pmu-events/jevents.c
     - copied, changed from r334242, head/lib/libpmc/pmu-events/jevents.c
  head/lib/libpmcstat/pmu-events/jevents.h
     - copied, changed from r334242, head/lib/libpmc/pmu-events/jevents.h
  head/lib/libpmcstat/pmu-events/jsmn.c
     - copied, changed from r334242, head/lib/libpmc/pmu-events/jsmn.c
  head/lib/libpmcstat/pmu-events/jsmn.h
     - copied, changed from r334242, head/lib/libpmc/pmu-events/jsmn.h
  head/lib/libpmcstat/pmu-events/json.c
     - copied, changed from r334242, head/lib/libpmc/pmu-events/json.c
  head/lib/libpmcstat/pmu-events/json.h
     - copied, changed from r334242, head/lib/libpmc/pmu-events/json.h
  head/lib/libpmcstat/pmu-events/list.h
     - copied, changed from r334242, head/lib/libpmc/pmu-events/list.h
  head/lib/libpmcstat/pmu-events/pmu-events.h
     - copied, changed from r334242, head/lib/libpmc/pmu-events/pmu-events.h
Deleted:
  head/lib/libpmc/libpmc_pmu_util.c
  head/lib/libpmc/pmu-events/Makefile
  head/lib/libpmc/pmu-events/README
  head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/branch.json
  head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/bus.json
  head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/cache.json
  head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/memory.json
  head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/other.json
  head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json
  head/lib/libpmc/pmu-events/arch/arm64/armv8-recommended.json
  head/lib/libpmc/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json
  head/lib/libpmc/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json
  head/lib/libpmc/pmu-events/arch/arm64/mapfile.csv
  head/lib/libpmc/pmu-events/arch/powerpc/mapfile.csv
  head/lib/libpmc/pmu-events/arch/powerpc/power8/cache.json
  head/lib/libpmc/pmu-events/arch/powerpc/power8/floating-point.json
  head/lib/libpmc/pmu-events/arch/powerpc/power8/frontend.json
  head/lib/libpmc/pmu-events/arch/powerpc/power8/marked.json
  head/lib/libpmc/pmu-events/arch/powerpc/power8/memory.json
  head/lib/libpmc/pmu-events/arch/powerpc/power8/other.json
  head/lib/libpmc/pmu-events/arch/powerpc/power8/pipeline.json
  head/lib/libpmc/pmu-events/arch/powerpc/power8/pmc.json
  head/lib/libpmc/pmu-events/arch/powerpc/power8/translation.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/cache.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/floating-point.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/frontend.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/marked.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/memory.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/other.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/pipeline.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/pmc.json
  head/lib/libpmc/pmu-events/arch/powerpc/power9/translation.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json
  head/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json
  head/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json
  head/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json
  head/lib/libpmc/pmu-events/arch/s390/mapfile.csv
  head/lib/libpmc/pmu-events/arch/x86/bonnell/cache.json
  head/lib/libpmc/pmu-events/arch/x86/bonnell/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/bonnell/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/bonnell/memory.json
  head/lib/libpmc/pmu-events/arch/x86/bonnell/other.json
  head/lib/libpmc/pmu-events/arch/x86/bonnell/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/bonnell/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/bdw-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/cache.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/other.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/uncore.json
  head/lib/libpmc/pmu-events/arch/x86/broadwell/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/cache.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/memory.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/other.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-cache.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-memory.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-power.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellde/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/bdx-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/cache.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/memory.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/other.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-cache.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-interconnect.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-memory.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-power.json
  head/lib/libpmc/pmu-events/arch/x86/broadwellx/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/goldmont/cache.json
  head/lib/libpmc/pmu-events/arch/x86/goldmont/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/goldmont/memory.json
  head/lib/libpmc/pmu-events/arch/x86/goldmont/other.json
  head/lib/libpmc/pmu-events/arch/x86/goldmont/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/goldmont/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/goldmontplus/cache.json
  head/lib/libpmc/pmu-events/arch/x86/goldmontplus/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/goldmontplus/memory.json
  head/lib/libpmc/pmu-events/arch/x86/goldmontplus/other.json
  head/lib/libpmc/pmu-events/arch/x86/goldmontplus/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/goldmontplus/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/cache.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/hsw-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/memory.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/other.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/uncore.json
  head/lib/libpmc/pmu-events/arch/x86/haswell/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/cache.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/hsx-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/memory.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/other.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-cache.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-interconnect.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-memory.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-power.json
  head/lib/libpmc/pmu-events/arch/x86/haswellx/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/cache.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/ivb-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/memory.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/other.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/uncore.json
  head/lib/libpmc/pmu-events/arch/x86/ivybridge/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/cache.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/ivt-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/memory.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/other.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-cache.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-interconnect.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-memory.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-power.json
  head/lib/libpmc/pmu-events/arch/x86/ivytown/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/cache.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/jkt-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/memory.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/other.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-cache.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-interconnect.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-memory.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-power.json
  head/lib/libpmc/pmu-events/arch/x86/jaketown/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/knightslanding/cache.json
  head/lib/libpmc/pmu-events/arch/x86/knightslanding/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/knightslanding/memory.json
  head/lib/libpmc/pmu-events/arch/x86/knightslanding/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/knightslanding/uncore-memory.json
  head/lib/libpmc/pmu-events/arch/x86/knightslanding/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/mapfile.csv
  head/lib/libpmc/pmu-events/arch/x86/nehalemep/cache.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemep/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemep/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemep/memory.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemep/other.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemep/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemep/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemex/cache.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemex/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemex/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemex/memory.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemex/other.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemex/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/nehalemex/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/cache.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/memory.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/other.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/snb-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/uncore.json
  head/lib/libpmc/pmu-events/arch/x86/sandybridge/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/silvermont/cache.json
  head/lib/libpmc/pmu-events/arch/x86/silvermont/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/silvermont/memory.json
  head/lib/libpmc/pmu-events/arch/x86/silvermont/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/silvermont/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/cache.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/memory.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/other.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/skl-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/uncore.json
  head/lib/libpmc/pmu-events/arch/x86/skylake/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/cache.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/memory.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/other.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/skx-metrics.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-memory.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-other.json
  head/lib/libpmc/pmu-events/arch/x86/skylakex/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/cache.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/memory.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/other.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/cache.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/memory.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/other.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/virtual-memory.json
  head/lib/libpmc/pmu-events/arch/x86/westmereex/cache.json
  head/lib/libpmc/pmu-events/arch/x86/westmereex/floating-point.json
  head/lib/libpmc/pmu-events/arch/x86/westmereex/frontend.json
  head/lib/libpmc/pmu-events/arch/x86/westmereex/memory.json
  head/lib/libpmc/pmu-events/arch/x86/westmereex/other.json
  head/lib/libpmc/pmu-events/arch/x86/westmereex/pipeline.json
  head/lib/libpmc/pmu-events/arch/x86/westmereex/virtual-memory.json
  head/lib/libpmc/pmu-events/jevents.c
  head/lib/libpmc/pmu-events/jevents.h
  head/lib/libpmc/pmu-events/jsmn.c
  head/lib/libpmc/pmu-events/jsmn.h
  head/lib/libpmc/pmu-events/json.c
  head/lib/libpmc/pmu-events/json.h
  head/lib/libpmc/pmu-events/list.h
  head/lib/libpmc/pmu-events/pmu-events.h
Modified:
  head/Makefile.inc1
  head/lib/libpmc/Makefile
  head/lib/libpmc/libpmc.c
  head/lib/libpmc/pmc.h
  head/lib/libpmc/pmclog.3
  head/lib/libpmc/pmclog.c
  head/lib/libpmc/pmclog.h
  head/lib/libpmcstat/Makefile
  head/lib/libpmcstat/libpmcstat.h
  head/lib/libpmcstat/libpmcstat_logging.c
  head/sys/dev/hwpmc/hwpmc_core.c
  head/sys/dev/hwpmc/hwpmc_core.h
  head/sys/dev/hwpmc/hwpmc_logging.c
  head/sys/sys/pmc.h
  head/sys/sys/pmclog.h
  head/usr.sbin/pmcstat/pmcstat.8
  head/usr.sbin/pmcstat/pmcstat.c
  head/usr.sbin/pmcstat/pmcstat_log.c

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat May 26 18:12:50 2018	(r334242)
+++ head/Makefile.inc1	Sat May 26 19:26:19 2018	(r334243)
@@ -2031,7 +2031,7 @@ _libmagic=lib/libmagic
 .endif
 
 .if ${MACHINE_CPUARCH} == "amd64"
-_jevents=lib/libpmc/pmu-events
+_jevents=lib/libpmcstat/pmu-events
 .endif
 
 # kernel-toolchain skips _cleanobj, so handle cleaning up previous

Modified: head/lib/libpmc/Makefile
==============================================================================
--- head/lib/libpmc/Makefile	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmc/Makefile	Sat May 26 19:26:19 2018	(r334243)
@@ -3,30 +3,8 @@
 PACKAGE=lib${LIB}
 LIB=	pmc
 
-SRCS=	libpmc.c pmclog.c libpmc_pmu_util.c
+SRCS=	libpmc.c pmclog.c
 INCS=	pmc.h pmclog.h
-
-CFLAGS+= -I${.CURDIR}
-
-.if ${MACHINE_CPUARCH} == "amd64"
-
-.if ${MACHINE_CPUARCH} == "aarch64"
-EVENT_ARCH="arm64"
-.elif ${MACHINE_CPUARCH} == "amd64"
-EVENT_ARCH="x86"
-.elif ${MACHINE_CPUARCH} == "powerpc"
-EVENT_ARCH="powerpc"
-.endif
-
-JEVENTS= ${BTOOLSPATH:U.}/pmu-events/jevents
-# This file is built in a subdirectory so never try to rebuild
-# it here due to missing meta file.
-${JEVENTS}: .NOMETA
-
-libpmc_events.c: ${JEVENTS}
-	${JEVENTS} ${EVENT_ARCH} ${.CURDIR}/pmu-events/arch libpmc_events.c
-SRCS+= libpmc_events.c
-.endif
 
 MAN=	pmc.3
 MAN+=	pmc_allocate.3

Modified: head/lib/libpmc/libpmc.c
==============================================================================
--- head/lib/libpmc/libpmc.c	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmc/libpmc.c	Sat May 26 19:26:19 2018	(r334243)
@@ -2781,28 +2781,9 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode,
 
 	if (mode != PMC_MODE_SS && mode != PMC_MODE_TS &&
 	    mode != PMC_MODE_SC && mode != PMC_MODE_TC) {
-		return (EINVAL);
+		errno = EINVAL;
+		goto out;
 	}
-	bzero(&pmc_config, sizeof(pmc_config));
-	pmc_config.pm_cpu   = cpu;
-	pmc_config.pm_mode  = mode;
-	pmc_config.pm_flags = flags;
-	if (PMC_IS_SAMPLING_MODE(mode))
-		pmc_config.pm_caps |= PMC_CAP_INTERRUPT;
-	/*
-	 * Can we pull this straight from the pmu table?
-	 */
-	r = spec_copy = strdup(ctrspec);
-	ctrname = strsep(&r, ",");
-	if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) {
-		if (PMC_CALL(PMCALLOCATE, &pmc_config) < 0)
-			return (errno);
-		*pmcid = pmc_config.pm_pmcid;
-		return (0);
-	} else {
-		free(spec_copy);
-		spec_copy = NULL;
-	}
 
 	/* replace an event alias with the canonical event specifier */
 	if (pmc_mdep_event_aliases)
@@ -2852,8 +2833,15 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode,
 		goto out;
 	}
 
+	bzero(&pmc_config, sizeof(pmc_config));
 	pmc_config.pm_ev    = ev->pm_ev_code;
 	pmc_config.pm_class = pcd->pm_evc_class;
+	pmc_config.pm_cpu   = cpu;
+	pmc_config.pm_mode  = mode;
+	pmc_config.pm_flags = flags;
+
+	if (PMC_IS_SAMPLING_MODE(mode))
+		pmc_config.pm_caps |= PMC_CAP_INTERRUPT;
 
  	if (pcd->pm_evc_allocate_pmc(ev->pm_ev_code, r, &pmc_config) < 0) {
 		errno = EINVAL;

Modified: head/lib/libpmc/pmc.h
==============================================================================
--- head/lib/libpmc/pmc.h	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmc/pmc.h	Sat May 26 19:26:19 2018	(r334243)
@@ -112,14 +112,6 @@ const char	*pmc_name_of_state(enum pmc_state _ps);
 
 int	pmc_event_names_of_class(enum pmc_class _cl, const char ***_eventnames,
     int *_nevents);
-
-int pmc_pmu_enabled(void);
-void pmc_pmu_print_counters(void);
-void pmc_pmu_print_counter_desc(const char *);
-void pmc_pmu_print_counter_desc_long(const char *);
-uint64_t pmc_pmu_sample_rate_get(const char *);
-int pmc_pmu_pmcallocate(const char *, struct pmc_op_pmcallocate *);
-const char *pmu_event_get_by_idx(int idx);
 __END_DECLS
 
 #endif

Modified: head/lib/libpmc/pmclog.3
==============================================================================
--- head/lib/libpmc/pmclog.3	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmc/pmclog.3	Sat May 26 19:26:19 2018	(r334243)
@@ -82,14 +82,13 @@ struct pmclog_ev {
        struct timespec   pl_ts;		/* log entry timestamp */
        enum pmclog_type  pl_type;	/* log entry kind */
        union {				/* log entry data */
-		struct pmclog_ev_callchain   pl_cc;
 		struct pmclog_ev_closelog    pl_cl;
 		struct pmclog_ev_dropnotify  pl_d;
 		struct pmclog_ev_initialize  pl_i;
 		struct pmclog_ev_map_in      pl_mi;
 		struct pmclog_ev_map_out     pl_mo;
+		struct pmclog_ev_pcsample    pl_s;
 		struct pmclog_ev_pmcallocate pl_a;
-		struct pmclog_ev_pmcallocatedyn	pl_ad;
 		struct pmclog_ev_pmcattach   pl_t;
 		struct pmclog_ev_pmcdetach   pl_d;
 		struct pmclog_ev_proccsw     pl_c;
@@ -271,8 +270,8 @@ while (pmclog_read(parser, &ev) == 0) {
 	case PMCLOG_TYPE_PROCCSW:
 		--process a thread context switch record--
 		break;
-	case PMCLOG_TYPE_CALLCHAIN:
-		--process a callchain sample--
+	case PMCLOG_TYPE_PCSAMPLE:
+		--process a PC sample--
 		break;
 	--and so on--
 	}

Modified: head/lib/libpmc/pmclog.c
==============================================================================
--- head/lib/libpmc/pmclog.c	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmc/pmclog.c	Sat May 26 19:26:19 2018	(r334243)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
-#include <stdio.h>
 
 #include <machine/pmc_mdep.h>
 
@@ -279,7 +278,7 @@ pmclog_get_event(void *cookie, char **data, ssize_t *l
     struct pmclog_ev *ev)
 {
 	int evlen, pathlen;
-	uint32_t h, *le, npc, noop;
+	uint32_t h, *le, npc;
 	enum pmclog_parser_state e;
 	struct pmclog_parse_state *ps;
 
@@ -289,7 +288,6 @@ pmclog_get_event(void *cookie, char **data, ssize_t *l
 
 	if ((e = pmclog_get_record(ps,data,len)) == PL_STATE_ERROR) {
 		ev->pl_state = PMCLOG_ERROR;
-		printf("state error\n");
 		return -1;
 	}
 
@@ -303,7 +301,6 @@ pmclog_get_event(void *cookie, char **data, ssize_t *l
 	PMCLOG_READ32(le,h);
 
 	if (!PMCLOG_HEADER_CHECK_MAGIC(h)) {
-		printf("bad magic\n");
 		ps->ps_state = PL_STATE_ERROR;
 		ev->pl_state = PMCLOG_ERROR;
 		return -1;
@@ -363,20 +360,21 @@ pmclog_get_event(void *cookie, char **data, ssize_t *l
 		PMCLOG_READADDR(le,ev->pl_u.pl_mo.pl_start);
 		PMCLOG_READADDR(le,ev->pl_u.pl_mo.pl_end);
 		break;
+	case PMCLOG_TYPE_PCSAMPLE:
+		PMCLOG_READ32(le,ev->pl_u.pl_s.pl_pid);
+		PMCLOG_READADDR(le,ev->pl_u.pl_s.pl_pc);
+		PMCLOG_READ32(le,ev->pl_u.pl_s.pl_pmcid);
+		PMCLOG_READ32(le,ev->pl_u.pl_s.pl_usermode);
+		PMCLOG_READ32(le,ev->pl_u.pl_s.pl_tid);
+		break;
 	case PMCLOG_TYPE_PMCALLOCATE:
 		PMCLOG_READ32(le,ev->pl_u.pl_a.pl_pmcid);
 		PMCLOG_READ32(le,ev->pl_u.pl_a.pl_event);
 		PMCLOG_READ32(le,ev->pl_u.pl_a.pl_flags);
-		PMCLOG_READ32(le,noop);
-		ev->pl_u.pl_a.pl_evname = pmu_event_get_by_idx(ev->pl_u.pl_a.pl_event);
-		if (ev->pl_u.pl_a.pl_evname != NULL)
-			break;
-		else if ((ev->pl_u.pl_a.pl_evname =
+		if ((ev->pl_u.pl_a.pl_evname =
 		    _pmc_name_of_event(ev->pl_u.pl_a.pl_event, ps->ps_arch))
-		    == NULL) {
-			printf("unknown event\n");
+		    == NULL)
 			goto error;
-		}
 		break;
 	case PMCLOG_TYPE_PMCALLOCATEDYN:
 		PMCLOG_READ32(le,ev->pl_u.pl_ad.pl_pmcid);
@@ -403,16 +401,14 @@ pmclog_get_event(void *cookie, char **data, ssize_t *l
 	case PMCLOG_TYPE_PROCEXEC:
 		PMCLOG_GET_PATHLEN(pathlen,evlen,pmclog_procexec);
 		PMCLOG_READ32(le,ev->pl_u.pl_x.pl_pid);
-		PMCLOG_READ32(le,ev->pl_u.pl_x.pl_pmcid);
-		PMCLOG_READ32(le,noop);
 		PMCLOG_READADDR(le,ev->pl_u.pl_x.pl_entryaddr);
+		PMCLOG_READ32(le,ev->pl_u.pl_x.pl_pmcid);
 		PMCLOG_READSTRING(le,ev->pl_u.pl_x.pl_pathname,pathlen);
 		break;
 	case PMCLOG_TYPE_PROCEXIT:
 		PMCLOG_READ32(le,ev->pl_u.pl_e.pl_pmcid);
-		PMCLOG_READ32(le,ev->pl_u.pl_e.pl_pid);
-		PMCLOG_READ32(le,noop);
 		PMCLOG_READ64(le,ev->pl_u.pl_e.pl_value);
+		PMCLOG_READ32(le,ev->pl_u.pl_e.pl_pid);
 		break;
 	case PMCLOG_TYPE_PROCFORK:
 		PMCLOG_READ32(le,ev->pl_u.pl_f.pl_oldpid);
@@ -493,9 +489,8 @@ pmclog_read(void *cookie, struct pmclog_ev *ev)
 
 			ps->ps_len = nread;
 			ps->ps_data = ps->ps_buffer;
-		} else {
+		} else
 			return -1;
-		}
 	}
 
 	assert(ps->ps_len > 0);
@@ -503,6 +498,7 @@ pmclog_read(void *cookie, struct pmclog_ev *ev)
 
 	 /* Retrieve one event from the byte stream. */
 	retval = pmclog_get_event(ps, &ps->ps_data, &ps->ps_len, ev);
+
 	/*
 	 * If we need more data and we have a configured fd, try read
 	 * from it.

Modified: head/lib/libpmc/pmclog.h
==============================================================================
--- head/lib/libpmc/pmclog.h	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmc/pmclog.h	Sat May 26 19:26:19 2018	(r334243)
@@ -158,6 +158,7 @@ struct pmclog_ev {
 		struct pmclog_ev_initialize	pl_i;
 		struct pmclog_ev_map_in		pl_mi;
 		struct pmclog_ev_map_out	pl_mo;
+		struct pmclog_ev_pcsample	pl_s;
 		struct pmclog_ev_pmcallocate	pl_a;
 		struct pmclog_ev_pmcallocatedyn	pl_ad;
 		struct pmclog_ev_pmcattach	pl_t;

Modified: head/lib/libpmcstat/Makefile
==============================================================================
--- head/lib/libpmcstat/Makefile	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmcstat/Makefile	Sat May 26 19:26:19 2018	(r334243)
@@ -9,7 +9,30 @@ SRCS=	\
 	libpmcstat_logging.c	\
 	libpmcstat_process.c	\
 	libpmcstat_string.c	\
-	libpmcstat_symbol.c
+	libpmcstat_symbol.c	\
+	libpmcstat_pmu_util.c
 INCS=	libpmcstat.h
+
+CFLAGS+= -I${.CURDIR}
+
+.if ${MACHINE_CPUARCH} == "amd64" 
+
+.if ${MACHINE_CPUARCH} == "aarch64"
+EVENT_ARCH="arm64"
+.elif ${MACHINE_CPUARCH} == "amd64"
+EVENT_ARCH="x86"
+.elif ${MACHINE_CPUARCH} == "powerpc"
+EVENT_ARCH="powerpc"
+.endif
+
+JEVENTS= ${BTOOLSPATH:U.}/pmu-events/jevents
+# This file is built in a subdirectory so never try to rebuild
+# it here due to missing meta file.
+${JEVENTS}: .NOMETA
+
+libpmcstat_events.c: ${JEVENTS}
+	${JEVENTS} ${EVENT_ARCH} ${.CURDIR}/pmu-events/arch libpmcstat_events.c
+SRCS+= libpmcstat_events.c
+.endif
 
 .include <bsd.lib.mk>

Modified: head/lib/libpmcstat/libpmcstat.h
==============================================================================
--- head/lib/libpmcstat/libpmcstat.h	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmcstat/libpmcstat.h	Sat May 26 19:26:19 2018	(r334243)
@@ -382,6 +382,8 @@ int pmcstat_analyze_log(struct pmcstat_args *args,
 int pmcstat_open_log(const char *_p, int _mode);
 int pmcstat_close_log(struct pmcstat_args *args);
 
+uint64_t pmcstat_pmu_sample_rate_get(const char *);
+
 __END_DECLS
 
 #endif /* !_LIBPMCSTAT_H_ */

Modified: head/lib/libpmcstat/libpmcstat_logging.c
==============================================================================
--- head/lib/libpmcstat/libpmcstat_logging.c	Sat May 26 18:12:50 2018	(r334242)
+++ head/lib/libpmcstat/libpmcstat_logging.c	Sat May 26 19:26:19 2018	(r334243)
@@ -195,6 +195,7 @@ pmcstat_analyze_log(struct pmcstat_args *args,
     int *ps_samples_period)
 {
 	uint32_t cpu, cpuflags;
+	uintfptr_t pc;
 	pid_t pid;
 	struct pmcstat_image *image;
 	struct pmcstat_process *pp, *ppnew;
@@ -267,6 +268,44 @@ pmcstat_analyze_log(struct pmcstat_args *args,
 			    ev.pl_u.pl_mo.pl_end);
 			break;
 
+		case PMCLOG_TYPE_PCSAMPLE:
+			/*
+			 * Note: the `PCSAMPLE' log entry is not
+			 * generated by hpwmc(4) after version 2.
+			 */
+
+			/*
+			 * We bring in the gmon file for the image
+			 * currently associated with the PMC & pid
+			 * pair and increment the appropriate entry
+			 * bin inside this.
+			 */
+			pmcstat_stats->ps_samples_total++;
+			*ps_samples_period += 1;
+
+			pc = ev.pl_u.pl_s.pl_pc;
+			pp = pmcstat_process_lookup(ev.pl_u.pl_s.pl_pid,
+			    PMCSTAT_ALLOCATE);
+
+			/* Get PMC record. */
+			pmcr = pmcstat_lookup_pmcid(ev.pl_u.pl_s.pl_pmcid, pmcstat_mergepmc);
+			assert(pmcr != NULL);
+			pmcr->pr_samples++;
+
+			/*
+			 * Call the plugins processing
+			 * TODO: move pmcstat_process_find_map inside plugins
+			 */
+
+			if (plugins[args->pa_pplugin].pl_process != NULL)
+				plugins[args->pa_pplugin].pl_process(
+				    pp, pmcr, 1, &pc,
+				    pmcstat_process_find_map(pp, pc) != NULL, 0);
+			plugins[args->pa_plugin].pl_process(
+			    pp, pmcr, 1, &pc,
+			    pmcstat_process_find_map(pp, pc) != NULL, 0);
+			break;
+
 		case PMCLOG_TYPE_CALLCHAIN:
 			pmcstat_stats->ps_samples_total++;
 			*ps_samples_period += 1;
@@ -414,8 +453,8 @@ pmcstat_analyze_log(struct pmcstat_args *args,
 		return (PMCSTAT_RUNNING);
 
 	err(EX_DATAERR,
-	    "ERROR: event parsing failed state: %d type: %d (record %jd, offset 0x%jx)",
-	    ev.pl_state, ev.pl_type, (uintmax_t) ev.pl_count + 1, ev.pl_offset);
+	    "ERROR: event parsing failed (record %jd, offset 0x%jx)",
+	    (uintmax_t) ev.pl_count + 1, ev.pl_offset);
 }
 
 /*

Added: head/lib/libpmcstat/libpmcstat_pmu_util.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libpmcstat/libpmcstat_pmu_util.c	Sat May 26 19:26:19 2018	(r334243)
@@ -0,0 +1,164 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 2018, Matthew Macy
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#include <sys/types.h>
+#include <sys/errno.h>
+#include <sys/sysctl.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <string.h>
+#include <pmc.h>
+#include <pmclog.h>
+#include <libpmcstat.h>
+#include "pmu-events/pmu-events.h"
+
+#if defined(__amd64__)
+struct pmu_alias {
+	const char *pa_alias;
+	const char *pa_name;
+};
+static struct pmu_alias pmu_alias_table[] = {
+    { "UNHALTED_CORE_CYCLES", "CPU_CLK_UNHALTED.THREAD_P_ANY"},
+    { "UNHALTED-CORE-CYCLES", "CPU_CLK_UNHALTED.THREAD_P_ANY"},
+	{ "LLC_MISSES", "LONGEST_LAT_CACHE.MISS"},
+	{ "LLC-MISSES", "LONGEST_LAT_CACHE.MISS"},
+	{ "LLC_REFERENCE", "LONGEST_LAT_CACHE.REFERENCE"},
+	{ "LLC-REFERENCE", "LONGEST_LAT_CACHE.REFERENCE"},
+	{ "LLC_MISS_RHITM", "mem_load_l3_miss_retired.remote_hitm"},
+	{ "LLC-MISS-RHITM", "mem_load_l3_miss_retired.remote_hitm"},
+	{ "RESOURCE_STALL", "RESOURCE_STALLS.ANY"},
+	{ "RESOURCE_STALLS_ANY", "RESOURCE_STALLS.ANY"},
+	{ "BRANCH_INSTRUCTION_RETIRED", "BR_INST_RETIRED.ALL_BRANCHES"},
+	{ "BRANCH-INSTRUCTION-RETIRED", "BR_INST_RETIRED.ALL_BRANCHES"},
+	{ "BRANCH_MISSES_RETIRED", "BR_MISP_RETIRED.ALL_BRANCHES"},
+	{ "BRANCH-MISSES-RETIRED", "BR_MISP_RETIRED.ALL_BRANCHES"},
+	{ NULL, NULL },
+};
+
+static const char *
+pmu_alias_get(const char *name)
+{
+	struct pmu_alias *pa;
+
+	for (pa = pmu_alias_table; pa->pa_alias != NULL; pa++)
+		if (strcasecmp(name, pa->pa_alias) == 0)
+			return (pa->pa_name);
+	return (name);
+}
+
+struct pmu_event_desc {
+	uint32_t ped_umask;
+	uint32_t ped_event;
+	uint64_t ped_period;
+};
+
+static const struct pmu_events_map *
+pmu_events_map_get(void)
+{
+	size_t s;
+	char buf[64];
+	const struct pmu_events_map *pme;
+
+	if (sysctlbyname("kern.hwpmc.cpuid", (void *)NULL, &s,
+					 (void *)NULL, 0) == -1)
+		return (NULL);
+	if (sysctlbyname("kern.hwpmc.cpuid", buf, &s,
+					 (void *)NULL, 0) == -1)
+		return (NULL);
+	for (pme = pmu_events_map; pme->cpuid != NULL; pme++)
+		if (strcmp(buf, pme->cpuid) == 0)
+			return (pme);
+	return (NULL);
+}
+
+static const struct pmu_event *
+pmu_event_get(const char *event_name)
+{
+	const struct pmu_events_map *pme;
+	const struct pmu_event *pe;
+
+	if ((pme = pmu_events_map_get()) == NULL)
+		return (NULL);
+	for (pe = pme->table; pe->name || pe->desc || pe->event; pe++) {
+		if (pe->name == NULL)
+			continue;
+		if (strcasecmp(pe->name, event_name) == 0)
+			return (pe);
+	}
+	return (NULL);
+}
+
+static int
+pmu_parse_event(struct pmu_event_desc *ped, const char *eventin)
+{
+	char *event;
+	char *kvp, *key, *value;
+
+	if ((event = strdup(eventin)) == NULL)
+		return (ENOMEM);
+	bzero(ped, sizeof(*ped));
+	while ((kvp = strsep(&event, ",")) != NULL) {
+		key = strsep(&kvp, "=");
+		if (key == NULL)
+			abort();
+		value = kvp;
+		if (strcmp(key, "umask") == 0)
+			ped->ped_umask = strtol(value, NULL, 16);
+		if (strcmp(key, "event") == 0)
+			ped->ped_event = strtol(value, NULL, 16);
+		if (strcmp(key, "period") == 0)
+			ped->ped_period = strtol(value, NULL, 10);
+	}
+	free(event);
+	return (0);
+}
+
+uint64_t
+pmcstat_pmu_sample_rate_get(const char *event_name)
+{
+	const struct pmu_event *pe;
+	struct pmu_event_desc ped;
+
+	event_name = pmu_alias_get(event_name);
+	if ((pe = pmu_event_get(event_name)) == NULL)
+		return (DEFAULT_SAMPLE_COUNT);
+	if (pe->alias && (pe = pmu_event_get(pe->alias)) == NULL)
+		return (DEFAULT_SAMPLE_COUNT);
+	if (pe->event == NULL)
+		return (DEFAULT_SAMPLE_COUNT);
+	if (pmu_parse_event(&ped, pe->event))
+		return (DEFAULT_SAMPLE_COUNT);
+	return (ped.ped_period);
+}
+
+#else
+uint64_t pmcstat_pmu_sample_rate_get(const char *event_name __unused) { return (DEFAULT_SAMPLE_COUNT); }
+#endif

Copied and modified: head/lib/libpmcstat/pmu-events/Makefile (from r334242, head/lib/libpmc/pmu-events/Makefile)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/README (from r334242, head/lib/libpmc/pmu-events/README)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/branch.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/branch.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/bus.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/bus.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/other.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/armv8-recommended.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/armv8-recommended.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json (from r334242, head/lib/libpmc/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/arm64/mapfile.csv (from r334242, head/lib/libpmc/pmu-events/arch/arm64/mapfile.csv)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/mapfile.csv (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/mapfile.csv)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/marked.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/marked.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/other.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/pmc.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/pmc.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power8/translation.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power8/translation.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/marked.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/marked.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/other.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/pmc.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/pmc.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/powerpc/power9/translation.json (from r334242, head/lib/libpmc/pmu-events/arch/powerpc/power9/translation.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z10/basic.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z10/basic.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z10/crypto.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z10/crypto.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z10/extended.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z10/extended.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z13/basic.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z13/basic.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z13/crypto.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z13/crypto.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z13/extended.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z13/extended.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z14/basic.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z14/basic.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z14/crypto.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z14/crypto.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z14/extended.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z14/extended.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z196/basic.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z196/basic.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z196/crypto.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z196/crypto.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_z196/extended.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_z196/extended.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_zec12/basic.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_zec12/basic.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_zec12/crypto.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_zec12/crypto.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/cf_zec12/extended.json (from r334242, head/lib/libpmc/pmu-events/arch/s390/cf_zec12/extended.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/s390/mapfile.csv (from r334242, head/lib/libpmc/pmu-events/arch/s390/mapfile.csv)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/bonnell/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/bonnell/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/bonnell/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/bonnell/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/bonnell/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/bonnell/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/bonnell/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/bonnell/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/bdw-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/bdw-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/uncore.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/uncore.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwell/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwell/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/bdwde-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/bdwde-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/uncore-cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/uncore-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/uncore-power.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/uncore-power.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellde/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellde/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/bdx-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/bdx-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/uncore-cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/uncore-interconnect.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-interconnect.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/uncore-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/uncore-power.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/uncore-power.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/broadwellx/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/broadwellx/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmont/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmont/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmont/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmont/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmont/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmont/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmont/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/goldmontplus/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/goldmontplus/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/hsw-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/hsw-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/uncore.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/uncore.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswell/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswell/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/hsx-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/hsx-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/uncore-cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/uncore-interconnect.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-interconnect.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/uncore-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/uncore-power.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/uncore-power.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/haswellx/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/haswellx/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/ivb-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/ivb-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/uncore.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/uncore.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivybridge/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivybridge/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/ivt-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/ivt-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/uncore-cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/uncore-interconnect.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-interconnect.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/uncore-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/uncore-power.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/uncore-power.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/ivytown/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/ivytown/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/jkt-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/jkt-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/uncore-cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/uncore-interconnect.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-interconnect.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/uncore-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/uncore-power.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/uncore-power.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/jaketown/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/jaketown/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/uncore-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/uncore-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/knightslanding/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/knightslanding/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/mapfile.csv (from r334242, head/lib/libpmc/pmu-events/arch/x86/mapfile.csv)
==============================================================================
--- head/lib/libpmc/pmu-events/arch/x86/mapfile.csv	Sat May 26 18:12:50 2018	(r334242, copy source)
+++ head/lib/libpmcstat/pmu-events/arch/x86/mapfile.csv	Sat May 26 19:26:19 2018	(r334243)
@@ -23,10 +23,7 @@ GenuineIntel-6-1E,v2,nehalemep,core
 GenuineIntel-6-1F,v2,nehalemep,core
 GenuineIntel-6-1A,v2,nehalemep,core
 GenuineIntel-6-2E,v2,nehalemex,core
-GenuineIntel-6-4E,v24,skylake,core
-GenuineIntel-6-5E,v24,skylake,core
-GenuineIntel-6-8E,v24,skylake,core
-GenuineIntel-6-9E,v24,skylake,core
+GenuineIntel-6-[4589]E,v24,skylake,core
 GenuineIntel-6-37,v13,silvermont,core
 GenuineIntel-6-4D,v13,silvermont,core
 GenuineIntel-6-4C,v13,silvermont,core

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemep/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemep/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/nehalemex/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/nehalemex/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/snb-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/snb-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/uncore.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/uncore.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/sandybridge/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/sandybridge/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/silvermont/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/silvermont/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/silvermont/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/silvermont/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/silvermont/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/silvermont/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/skl-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/skl-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/uncore.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/uncore.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylake/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylake/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/skx-metrics.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/skx-metrics.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/uncore-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/uncore-other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/uncore-other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/skylakex/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/skylakex/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-dp/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-dp/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereep-sp/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereep-sp/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereex/cache.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/cache.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereex/floating-point.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/floating-point.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereex/frontend.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/frontend.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereex/memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereex/other.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/other.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereex/pipeline.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/pipeline.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/arch/x86/westmereex/virtual-memory.json (from r334242, head/lib/libpmc/pmu-events/arch/x86/westmereex/virtual-memory.json)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/jevents.c (from r334242, head/lib/libpmc/pmu-events/jevents.c)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/jevents.h (from r334242, head/lib/libpmc/pmu-events/jevents.h)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/jsmn.c (from r334242, head/lib/libpmc/pmu-events/jsmn.c)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/jsmn.h (from r334242, head/lib/libpmc/pmu-events/jsmn.h)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/json.c (from r334242, head/lib/libpmc/pmu-events/json.c)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/json.h (from r334242, head/lib/libpmc/pmu-events/json.h)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/list.h (from r334242, head/lib/libpmc/pmu-events/list.h)
==============================================================================

Copied and modified: head/lib/libpmcstat/pmu-events/pmu-events.h (from r334242, head/lib/libpmc/pmu-events/pmu-events.h)
==============================================================================

Modified: head/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_core.c	Sat May 26 18:12:50 2018	(r334242)
+++ head/sys/dev/hwpmc/hwpmc_core.c	Sat May 26 19:26:19 2018	(r334243)
@@ -548,6 +548,48 @@ iaf_initialize(struct pmc_mdep *md, int maxcpu, int np
  * Intel programmable PMCs.
  */
 
+/*
+ * Event descriptor tables.
+ *
+ * For each event id, we track:
+ *
+ * 1. The CPUs that the event is valid for.
+ *
+ * 2. If the event uses a fixed UMASK, the value of the umask field.
+ *    If the event doesn't use a fixed UMASK, a mask of legal bits
+ *    to check against.
+ */
+
+struct iap_event_descr {
+	enum pmc_event	iap_ev;
+	unsigned char	iap_evcode;
+	unsigned char	iap_umask;
+	unsigned int	iap_flags;
+};
+
+#define	IAP_F_CC	(1 << 0)	/* CPU: Core */
+#define	IAP_F_CC2	(1 << 1)	/* CPU: Core2 family */
+#define	IAP_F_CC2E	(1 << 2)	/* CPU: Core2 Extreme only */
+#define	IAP_F_CA	(1 << 3)	/* CPU: Atom */
+#define	IAP_F_I7	(1 << 4)	/* CPU: Core i7 */
+#define	IAP_F_I7O	(1 << 4)	/* CPU: Core i7 (old) */
+#define	IAP_F_WM	(1 << 5)	/* CPU: Westmere */
+#define	IAP_F_SB	(1 << 6)	/* CPU: Sandy Bridge */
+#define	IAP_F_IB	(1 << 7)	/* CPU: Ivy Bridge */
+#define	IAP_F_SBX	(1 << 8)	/* CPU: Sandy Bridge Xeon */
+#define	IAP_F_IBX	(1 << 9)	/* CPU: Ivy Bridge Xeon */
+#define	IAP_F_HW	(1 << 10)	/* CPU: Haswell */
+#define	IAP_F_CAS	(1 << 11)	/* CPU: Atom Silvermont */
+#define	IAP_F_HWX	(1 << 12)	/* CPU: Haswell Xeon */
+#define	IAP_F_BW	(1 << 13)	/* CPU: Broadwell */
+#define	IAP_F_BWX	(1 << 14)	/* CPU: Broadwell Xeon */
+#define	IAP_F_SL	(1 << 15)	/* CPU: Skylake */
+#define	IAP_F_SLX	(1 << 16)	/* CPU: Skylake Xeon AKA scalable */
+#define	IAP_F_FM	(1 << 18)	/* Fixed mask */
+
+#define	IAP_F_ALLCPUSCORE2					\
+    (IAP_F_CC | IAP_F_CC2 | IAP_F_CC2E | IAP_F_CA)
+
 /* Sub fields of UMASK that this event supports. */
 #define	IAP_M_CORE		(1 << 0) /* Core specificity */
 #define	IAP_M_AGENT		(1 << 1) /* Agent specificity */
@@ -570,6 +612,1403 @@ iaf_initialize(struct pmc_mdep *md, int maxcpu, int np
 #define	IAP_CORE_ALL		(0x3 << 14)
 #define	IAP_F_CMASK		0xFF000000
 
+static struct iap_event_descr iap_events[] = {
+#undef IAPDESCR
+#define	IAPDESCR(N,EV,UM,FLAGS) {					\
+	.iap_ev = PMC_EV_IAP_EVENT_##N,					\
+	.iap_evcode = (EV),						\
+	.iap_umask = (UM),						\
+	.iap_flags = (FLAGS)						\
+	}
+
+    IAPDESCR(02H_01H, 0x02, 0x01, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(02H_81H, 0x02, 0x81, IAP_F_FM | IAP_F_CA),
+
+    IAPDESCR(03H_00H, 0x03, 0x00, IAP_F_FM | IAP_F_CC),
+    IAPDESCR(03H_01H, 0x03, 0x01, IAP_F_FM | IAP_F_I7O | IAP_F_SB |
+	IAP_F_SBX | IAP_F_CAS),
+    IAPDESCR(03H_02H, 0x03, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
+	IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX | IAP_F_IBX | IAP_F_HW |
+	IAP_F_CAS | IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(03H_04H, 0x03, 0x04, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_I7O |
+	IAP_F_CAS),
+    IAPDESCR(03H_08H, 0x03, 0x08, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_SB |
+	IAP_F_SBX | IAP_F_CAS | IAP_F_IB | IAP_F_IBX | IAP_F_HW | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(03H_10H, 0x03, 0x10, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_SB |
+	IAP_F_SBX | IAP_F_CAS),
+    IAPDESCR(03H_20H, 0x03, 0x20, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_CAS),
+    IAPDESCR(03H_40H, 0x03, 0x40, IAP_F_FM | IAP_F_CAS),
+    IAPDESCR(03H_80H, 0x03, 0x80, IAP_F_FM | IAP_F_CAS),
+
+    IAPDESCR(04H_00H, 0x04, 0x00, IAP_F_FM | IAP_F_CC | IAP_F_CAS),
+    IAPDESCR(04H_01H, 0x04, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_I7O |
+	IAP_F_CAS),
+    IAPDESCR(04H_02H, 0x04, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_CAS),
+    IAPDESCR(04H_04H, 0x04, 0x04, IAP_F_FM | IAP_F_CAS),
+    IAPDESCR(04H_07H, 0x04, 0x07, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(04H_08H, 0x04, 0x08, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_CAS),
+    IAPDESCR(04H_10H, 0x04, 0x10, IAP_F_FM | IAP_F_CAS),
+    IAPDESCR(04H_20H, 0x04, 0x20, IAP_F_FM | IAP_F_CAS),
+    IAPDESCR(04H_40H, 0x04, 0x40, IAP_F_FM | IAP_F_CAS),
+    IAPDESCR(04H_80H, 0x04, 0x80, IAP_F_FM | IAP_F_CAS),
+
+    IAPDESCR(05H_00H, 0x05, 0x00, IAP_F_FM | IAP_F_CC),
+    IAPDESCR(05H_01H, 0x05, 0x01, IAP_F_FM | IAP_F_I7O | IAP_F_SB | IAP_F_IB |
+	IAP_F_SBX | IAP_F_IBX | IAP_F_HW | IAP_F_CAS | IAP_F_HWX |  IAP_F_BW |
+	IAP_F_BWX),
+    IAPDESCR(05H_02H, 0x05, 0x02, IAP_F_FM | IAP_F_I7O | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX | IAP_F_HW | IAP_F_CAS | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX),
+    IAPDESCR(05H_03H, 0x05, 0x03, IAP_F_FM | IAP_F_I7O | IAP_F_CAS),
+
+    IAPDESCR(06H_00H, 0x06, 0x00, IAP_F_FM | IAP_F_CC | IAP_F_CC2 |
+	IAP_F_CC2E | IAP_F_CA),
+    IAPDESCR(06H_01H, 0x06, 0x01, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(06H_02H, 0x06, 0x02, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(06H_04H, 0x06, 0x04, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(06H_08H, 0x06, 0x08, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(06H_0FH, 0x06, 0x0F, IAP_F_FM | IAP_F_I7O),
+
+    IAPDESCR(07H_00H, 0x07, 0x00, IAP_F_FM | IAP_F_CC | IAP_F_CC2),
+    IAPDESCR(07H_01H, 0x07, 0x01, IAP_F_FM | IAP_F_ALLCPUSCORE2 |
+	IAP_F_I7 | IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX | IAP_F_IBX |
+	IAP_F_HW | IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(07H_02H, 0x07, 0x02, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+    IAPDESCR(07H_03H, 0x07, 0x03, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+    IAPDESCR(07H_06H, 0x07, 0x06, IAP_F_FM | IAP_F_CA),
+    IAPDESCR(07H_08H, 0x07, 0x08, IAP_F_FM | IAP_F_CA | IAP_F_SB |
+	IAP_F_SBX),
+
+    IAPDESCR(08H_01H, 0x08, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
+	IAP_F_I7 | IAP_F_WM | IAP_F_SB | IAP_F_SBX | IAP_F_HW | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(08H_02H, 0x08, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
+	IAP_F_I7 | IAP_F_WM | IAP_F_SB | IAP_F_SBX | IAP_F_HW | IAP_F_HWX |
+        IAP_F_BW | IAP_F_BWX | IAP_F_SLX),
+    IAPDESCR(08H_04H, 0x08, 0x04, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
+	IAP_F_WM | IAP_F_SB | IAP_F_SBX | IAP_F_HW | IAP_F_HWX | IAP_F_SLX),
+    IAPDESCR(08H_05H, 0x08, 0x05, IAP_F_FM | IAP_F_CA),
+    IAPDESCR(08H_06H, 0x08, 0x06, IAP_F_FM | IAP_F_CA),
+    IAPDESCR(08H_07H, 0x08, 0x07, IAP_F_FM | IAP_F_CA),
+    IAPDESCR(08H_08H, 0x08, 0x08, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_SLX),
+    IAPDESCR(08H_09H, 0x08, 0x09, IAP_F_FM | IAP_F_CA),
+    IAPDESCR(08H_0EH, 0x08, 0x0E, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(08H_10H, 0x08, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_SBX | IAP_F_HW | IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(08H_20H, 0x08, 0x20, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_HW |
+        IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(08H_40H, 0x08, 0x40, IAP_F_FM | IAP_F_I7O | IAP_F_HW | IAP_F_HWX),
+    IAPDESCR(08H_60H, 0x08, 0x60, IAP_F_FM | IAP_F_HW | IAP_F_HWX),
+    IAPDESCR(08H_80H, 0x08, 0x80, IAP_F_FM | IAP_F_I7 | IAP_F_HW | IAP_F_HWX),
+    IAPDESCR(08H_81H, 0x08, 0x81, IAP_F_FM | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(08H_82H, 0x08, 0x82, IAP_F_FM | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(08H_84H, 0x08, 0x84, IAP_F_FM | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(08H_88H, 0x08, 0x88, IAP_F_FM | IAP_F_IB | IAP_F_IBX),
+
+    IAPDESCR(09H_01H, 0x09, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_I7O),
+    IAPDESCR(09H_02H, 0x09, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2 | IAP_F_I7O),
+    IAPDESCR(09H_04H, 0x09, 0x04, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(09H_08H, 0x09, 0x08, IAP_F_FM | IAP_F_I7O),
+
+    IAPDESCR(0BH_01H, 0x0B, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(0BH_02H, 0x0B, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(0BH_10H, 0x0B, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+
+    IAPDESCR(0CH_01H, 0x0C, 0x01, IAP_F_FM | IAP_F_CC2 | IAP_F_I7 |
+	IAP_F_WM | IAP_F_SL),
+    IAPDESCR(0CH_02H, 0x0C, 0x02, IAP_F_FM | IAP_F_CC2),
+    IAPDESCR(0CH_03H, 0x0C, 0x03, IAP_F_FM | IAP_F_CA),
+
+    IAPDESCR(0DH_01H, 0x0D, 0x01, IAP_F_FM | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(0DH_03H, 0x0D, 0x03, IAP_F_FM | IAP_F_SB | IAP_F_SBX | IAP_F_HW |
+       IAP_F_IB | IAP_F_IBX | IAP_F_HWX | IAP_F_BW | IAP_F_BWX),
+    IAPDESCR(0DH_40H, 0x0D, 0x40, IAP_F_FM | IAP_F_SB | IAP_F_SBX),
+    IAPDESCR(0DH_80H, 0x0D, 0x80, IAP_F_FM | IAP_F_SL | IAP_F_SLX),
+
+    IAPDESCR(0EH_01H, 0x0E, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX | IAP_F_HW | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(0EH_02H, 0x0E, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(0EH_10H, 0x0E, 0x10, IAP_F_FM | IAP_F_IB | IAP_F_IBX | IAP_F_HW |
+        IAP_F_HWX | IAP_F_BW | IAP_F_BWX),
+    IAPDESCR(0EH_20H, 0x0E, 0x20, IAP_F_FM | IAP_F_IB | IAP_F_IBX | IAP_F_HW |
+        IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(0EH_40H, 0x0E, 0x40, IAP_F_FM | IAP_F_IB | IAP_F_IBX | IAP_F_HW |
+        IAP_F_HWX | IAP_F_BW | IAP_F_BWX),
+
+    IAPDESCR(0FH_01H, 0x0F, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(0FH_02H, 0x0F, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(0FH_08H, 0x0F, 0x08, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(0FH_10H, 0x0F, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(0FH_20H, 0x0F, 0x20, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(0FH_80H, 0x0F, 0x80, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+
+    IAPDESCR(10H_00H, 0x10, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+    IAPDESCR(10H_01H, 0x10, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_I7 |
+	IAP_F_WM | IAP_F_SB | IAP_F_SBX | IAP_F_IB | IAP_F_IBX ),
+    IAPDESCR(10H_02H, 0x10, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(10H_04H, 0x10, 0x04, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(10H_08H, 0x10, 0x08, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(10H_10H, 0x10, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_SBX | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(10H_20H, 0x10, 0x20, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_SBX | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(10H_40H, 0x10, 0x40, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_SBX | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(10H_80H, 0x10, 0x80, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_SBX | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(10H_81H, 0x10, 0x81, IAP_F_FM | IAP_F_CA),
+
+    IAPDESCR(11H_00H, 0x11, 0x00, IAP_F_FM | IAP_F_CC | IAP_F_CC2),
+    IAPDESCR(11H_01H, 0x11, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_SB |
+	IAP_F_SBX | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(11H_02H, 0x11, 0x02, IAP_F_FM | IAP_F_SB | IAP_F_SBX | IAP_F_IB | IAP_F_IBX),
+    IAPDESCR(11H_81H, 0x11, 0x81, IAP_F_FM | IAP_F_CA),
+
+    IAPDESCR(12H_00H, 0x12, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+    IAPDESCR(12H_01H, 0x12, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(12H_02H, 0x12, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(12H_04H, 0x12, 0x04, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(12H_08H, 0x12, 0x08, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(12H_10H, 0x12, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(12H_20H, 0x12, 0x20, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(12H_40H, 0x12, 0x40, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(12H_81H, 0x12, 0x81, IAP_F_FM | IAP_F_CA),
+
+    IAPDESCR(13H_00H, 0x13, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+    IAPDESCR(13H_01H, 0x13, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(13H_02H, 0x13, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(13H_04H, 0x13, 0x04, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(13H_07H, 0x13, 0x07, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(13H_81H, 0x13, 0x81, IAP_F_FM | IAP_F_CA),
+
+    IAPDESCR(14H_00H, 0x14, 0x00, IAP_F_FM | IAP_F_CC | IAP_F_CC2),
+    IAPDESCR(14H_01H, 0x14, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_I7 |
+	 IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX | IAP_F_IBX |
+	 IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(14H_02H, 0x14, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+
+    IAPDESCR(17H_01H, 0x17, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_SBX),
+
+    IAPDESCR(18H_00H, 0x18, 0x00, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
+    IAPDESCR(18H_01H, 0x18, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+
+    IAPDESCR(19H_00H, 0x19, 0x00, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
+    IAPDESCR(19H_01H, 0x19, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
+	IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(19H_02H, 0x19, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
+
+    IAPDESCR(1DH_01H, 0x1D, 0x01, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(1DH_02H, 0x1D, 0x02, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(1DH_04H, 0x1D, 0x04, IAP_F_FM | IAP_F_I7O),
+
+    IAPDESCR(1EH_01H, 0x1E, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+
+    IAPDESCR(20H_01H, 0x20, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(21H, 0x21, IAP_M_CORE, IAP_F_ALLCPUSCORE2),
+    IAPDESCR(22H, 0x22, IAP_M_CORE, IAP_F_CC2),
+    IAPDESCR(23H, 0x23, IAP_M_CORE, IAP_F_ALLCPUSCORE2),
+
+    IAPDESCR(24H, 0x24, IAP_M_CORE | IAP_M_PREFETCH, IAP_F_ALLCPUSCORE2),
+    IAPDESCR(24H_01H, 0x24, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX ),
+    IAPDESCR(24H_02H, 0x24, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(24H_03H, 0x24, 0x03, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_04H, 0x24, 0x04, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_08H, 0x24, 0x08, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_0CH, 0x24, 0x0C, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_10H, 0x24, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_20H, 0x24, 0x20, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_21H, 0x24, 0x21, IAP_F_FM | IAP_F_HW | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(24H_22H, 0x24, 0x22, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(24H_24H, 0x24, 0x24, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(24H_27H, 0x24, 0x27, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(24H_30H, 0x24, 0x30, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX | IAP_F_HW | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX),
+    IAPDESCR(24H_38H, 0x24, 0x38, IAP_F_FM | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(24H_3FH, 0x24, 0x3F, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(24H_40H, 0x24, 0x40, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_41H, 0x24, 0x41, IAP_F_FM | IAP_F_HW | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(24H_42H, 0x24, 0x42, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(24H_44H, 0x24, 0x44, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(24H_50H, 0x24, 0x50, IAP_F_FM | IAP_F_HW | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX),
+    IAPDESCR(24H_80H, 0x24, 0x80, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_AAH, 0x24, 0xAA, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(24H_C0H, 0x24, 0xC0, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(24H_D8H, 0x24, 0xD8, IAP_F_FM | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(24H_E1H, 0x24, 0xE1, IAP_F_FM | IAP_F_HW | IAP_F_HWX |
+	IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(24H_E2H, 0x24, 0xE2, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_BW |
+	IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(24H_E4H, 0x24, 0xE4, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_BW |
+	IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(24H_E7H, 0x24, 0xE7, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(24H_EFH, 0x24, 0xEF, IAP_F_FM | IAP_F_SL),
+    IAPDESCR(24H_F8H, 0x24, 0xF8, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_BW |
+	IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(24H_FFH, 0x24, 0xFF, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_HW |
+        IAP_F_HWX | IAP_F_SLX),
+
+    IAPDESCR(25H, 0x25, IAP_M_CORE, IAP_F_ALLCPUSCORE2),
+
+    IAPDESCR(26H, 0x26, IAP_M_CORE | IAP_M_PREFETCH, IAP_F_ALLCPUSCORE2),
+    IAPDESCR(26H_01H, 0x26, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_02H, 0x26, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_04H, 0x26, 0x04, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_08H, 0x26, 0x08, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_0FH, 0x26, 0x0F, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_10H, 0x26, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_20H, 0x26, 0x20, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_40H, 0x26, 0x40, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_80H, 0x26, 0x80, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_F0H, 0x26, 0xF0, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(26H_FFH, 0x26, 0xFF, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+
+    IAPDESCR(27H, 0x27, IAP_M_CORE | IAP_M_PREFETCH, IAP_F_ALLCPUSCORE2),
+    IAPDESCR(27H_01H, 0x27, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(27H_02H, 0x27, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(27H_04H, 0x27, 0x04, IAP_F_FM | IAP_F_I7O | IAP_F_SB |
+	IAP_F_SBX),
+    IAPDESCR(27H_08H, 0x27, 0x08, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(27H_0EH, 0x27, 0x0E, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(27H_0FH, 0x27, 0x0F, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(27H_10H, 0x27, 0x10, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(27H_20H, 0x27, 0x20, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(27H_40H, 0x27, 0x40, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(27H_50H, 0x27, 0x50, IAP_F_FM | IAP_F_HW | IAP_F_HWX | IAP_F_BW | IAP_F_BWX),
+    IAPDESCR(27H_80H, 0x27, 0x80, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(27H_E0H, 0x27, 0xE0, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+    IAPDESCR(27H_F0H, 0x27, 0xF0, IAP_F_FM | IAP_F_I7 | IAP_F_WM),
+
+    IAPDESCR(28H, 0x28, IAP_M_CORE | IAP_M_MESI, IAP_F_ALLCPUSCORE2),
+    IAPDESCR(28H_01H, 0x28, 0x01, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_IB |
+	IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(28H_02H, 0x28, 0x02, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SBX),
+    IAPDESCR(28H_04H, 0x28, 0x04, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(28H_07H, 0x28, 0x07, IAP_F_FM | IAP_F_SLX),
+    IAPDESCR(28H_08H, 0x28, 0x08, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_SB |
+	IAP_F_IB | IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(28H_0FH, 0x28, 0x0F, IAP_F_FM | IAP_F_I7 | IAP_F_WM | IAP_F_IB |
+	IAP_F_SBX | IAP_F_IBX),
+    IAPDESCR(28H_18H, 0x28, 0x18, IAP_F_SLX),
+    IAPDESCR(28H_20H, 0x28, 0x20, IAP_F_SLX),
+    IAPDESCR(28H_40H, 0x28, 0x40, IAP_F_SLX),
+
+    IAPDESCR(29H, 0x29, IAP_M_CORE | IAP_M_MESI, IAP_F_CC),
+    IAPDESCR(29H, 0x29, IAP_M_CORE | IAP_M_MESI | IAP_M_PREFETCH,
+	IAP_F_CA | IAP_F_CC2),
+    IAPDESCR(2AH, 0x2A, IAP_M_CORE | IAP_M_MESI, IAP_F_ALLCPUSCORE2),
+    IAPDESCR(2BH, 0x2B, IAP_M_CORE | IAP_M_MESI, IAP_F_CA | IAP_F_CC2),
+
+    IAPDESCR(2EH, 0x2E, IAP_M_CORE | IAP_M_MESI | IAP_M_PREFETCH,
+	IAP_F_ALLCPUSCORE2),
+    IAPDESCR(2EH_01H, 0x2E, 0x01, IAP_F_FM | IAP_F_WM),
+    IAPDESCR(2EH_02H, 0x2E, 0x02, IAP_F_FM | IAP_F_WM),
+    IAPDESCR(2EH_41H, 0x2E, 0x41, IAP_F_FM | IAP_F_ALLCPUSCORE2 | IAP_F_I7 |
+	IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX | IAP_F_IBX | IAP_F_HW |
+	IAP_F_CAS | IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(2EH_4FH, 0x2E, 0x4F, IAP_F_FM | IAP_F_ALLCPUSCORE2 | IAP_F_I7 |
+	IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX | IAP_F_IBX | IAP_F_HW |
+	IAP_F_CAS | IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+
+    IAPDESCR(30H, 0x30, IAP_M_CORE | IAP_M_MESI | IAP_M_PREFETCH,
+	IAP_F_ALLCPUSCORE2),
+    IAPDESCR(30H_00H, 0x30, 0x00, IAP_F_FM | IAP_F_CAS),
+    IAPDESCR(31H_00H, 0x31, 0x00, IAP_F_FM | IAP_F_CAS),
+    IAPDESCR(32H, 0x32, IAP_M_CORE | IAP_M_MESI | IAP_M_PREFETCH, IAP_F_CC),
+    IAPDESCR(32H, 0x32, IAP_M_CORE, IAP_F_CA | IAP_F_CC2),
+
+    IAPDESCR(3AH, 0x3A, IAP_M_TRANSITION, IAP_F_CC),
+    IAPDESCR(3AH_00H, 0x3A, 0x00, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
+
+    IAPDESCR(3BH_C0H, 0x3B, 0xC0, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+
+    IAPDESCR(3CH_00H, 0x3C, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2 |
+	IAP_F_I7 | IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX | IAP_F_IBX |
+	IAP_F_HW | IAP_F_CAS | IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(3CH_01H, 0x3C, 0x01, IAP_F_FM | IAP_F_ALLCPUSCORE2 |
+	IAP_F_I7 | IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX | IAP_F_IBX |
+	IAP_F_HW | IAP_F_CAS | IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL |
+	IAP_F_SLX),
+    IAPDESCR(3CH_02H, 0x3C, 0x02, IAP_F_FM | IAP_F_ALLCPUSCORE2 | IAP_F_SL |
+	IAP_F_SLX),
+
+    IAPDESCR(3DH_01H, 0x3D, 0x01, IAP_F_FM | IAP_F_I7O),
+
+    IAPDESCR(40H, 0x40, IAP_M_MESI, IAP_F_CC | IAP_F_CC2),
+    IAPDESCR(40H_01H, 0x40, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(40H_02H, 0x40, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(40H_04H, 0x40, 0x04, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(40H_08H, 0x40, 0x08, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(40H_0FH, 0x40, 0x0F, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(40H_21H, 0x40, 0x21, IAP_F_FM | IAP_F_CA),
+
+    IAPDESCR(41H, 0x41, IAP_M_MESI, IAP_F_CC | IAP_F_CC2),
+    IAPDESCR(41H_01H, 0x41, 0x01, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(41H_02H, 0x41, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(41H_04H, 0x41, 0x04, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(41H_08H, 0x41, 0x08, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(41H_0FH, 0x41, 0x0F, IAP_F_FM | IAP_F_I7O),
+    IAPDESCR(41H_22H, 0x41, 0x22, IAP_F_FM | IAP_F_CA),
+
+    IAPDESCR(42H, 0x42, IAP_M_MESI, IAP_F_ALLCPUSCORE2),
+    IAPDESCR(42H_01H, 0x42, 0x01, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(42H_02H, 0x42, 0x02, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(42H_04H, 0x42, 0x04, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(42H_08H, 0x42, 0x08, IAP_F_FM | IAP_F_I7),
+    IAPDESCR(42H_10H, 0x42, 0x10, IAP_F_FM | IAP_F_CA | IAP_F_CC2),
+
+    IAPDESCR(43H_01H, 0x43, 0x01, IAP_F_FM | IAP_F_ALLCPUSCORE2 |
+	IAP_F_I7),
+    IAPDESCR(43H_02H, 0x43, 0x02, IAP_F_FM | IAP_F_CA |
+	IAP_F_CC2 | IAP_F_I7),
+
+    IAPDESCR(44H_02H, 0x44, 0x02, IAP_F_FM | IAP_F_CC),
+
+    IAPDESCR(45H_0FH, 0x45, 0x0F, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+
+    IAPDESCR(46H_00H, 0x46, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+    IAPDESCR(47H_00H, 0x47, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+
+    IAPDESCR(48H_00H, 0x48, 0x00, IAP_F_FM | IAP_F_ALLCPUSCORE2),
+    IAPDESCR(48H_01H, 0x48, 0x01, IAP_F_FM | IAP_F_SB | IAP_F_IB |
+	IAP_F_SBX | IAP_F_IBX | IAP_F_HW | IAP_F_HWX | IAP_F_BW | IAP_F_BWX |
+	IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(48H_02H, 0x48, 0x02, IAP_F_FM | IAP_F_I7O | IAP_F_SL | IAP_F_SLX),
+
+    IAPDESCR(49H_00H, 0x49, 0x00, IAP_F_FM | IAP_F_CC),
+    IAPDESCR(49H_01H, 0x49, 0x01, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
+	IAP_F_I7 | IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX  | IAP_F_IBX |
+	IAP_F_HW | IAP_F_HWX | IAP_F_BW | IAP_F_BWX | IAP_F_SL | IAP_F_SLX),
+    IAPDESCR(49H_02H, 0x49, 0x02, IAP_F_FM | IAP_F_CA | IAP_F_CC2 |
+	IAP_F_I7 | IAP_F_WM | IAP_F_SB | IAP_F_IB | IAP_F_SBX | IAP_F_IBX |

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***