--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package libpfm4
This is a new upstream snapshot updating the event definitions for some
CPU models.
unblock libpfm4/4.10.1+git10-gd2a5b56-1
Andreas
diff --git a/Makefile b/Makefile
index 440249f..c928088 100644
--- a/Makefile
+++ b/Makefile
@@ -65,11 +65,14 @@ tar: clean
ln -s $$PWD ../$(PKG) && cd .. && $(TAR) -zcf $(TARBALL) $(PKG)/. &&
rm $(PKG)
@echo generated ../$(TARBALL)
-install:
- @echo installing in $(DESTDIR)
- @set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d $@ ; done
-
-install_examples:
+install-lib:
+ @echo installing in $(DESTDIR)$(PREFIX)
+ @$(MAKE) -C lib install
+install install-all:
+ @echo installing in $(DESTDIR)$(PREFIX)
+ @set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d install ; done
+install-examples install_examples:
+ @echo installing in $(DESTDIR)$(PREFIX)
@set -e ; for d in $(EXAMPLE_DIRS) ; do $(MAKE) -C $$d $@ ; done
tags:
@@ -79,6 +82,6 @@ tags:
static:
make all CONFIG_PFMLIB_SHARED=n
-.PHONY: all clean distclean depend tar install install_examples lib static
+.PHONY: all clean distclean depend tar install install-all install-lib
install-examples lib static install_examples
# DO NOT DELETE
diff --git a/config.mk b/config.mk
index cc9a6d9..daa982e 100644
--- a/config.mk
+++ b/config.mk
@@ -116,7 +116,7 @@ AGE=1
#
# Where should things (lib, headers, man) go in the end.
#
-PREFIX=/usr/local
+PREFIX?=/usr/local
LIBDIR=$(PREFIX)/lib
INCDIR=$(PREFIX)/include
MANDIR=$(PREFIX)/share/man
diff --git a/debian/changelog b/debian/changelog
index fed9f51..bae0b83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libpfm4 (4.10.1+git10-gd2a5b56-1) unstable; urgency=medium
+
+ * New upstream GIT snapshot.
+ - Update SKX and CLX event tables.
+
+ -- Andreas Beckmann <a...@debian.org> Sat, 18 May 2019 15:13:01 +0200
+
+libpfm4 (4.10.1+git9-gac95d19-1) unstable; urgency=medium
+
+ * New upstream GIT snapshot.
+ - Remove MERGE event from AMD Fam17h table.
+
+ -- Andreas Beckmann <a...@debian.org> Tue, 30 Apr 2019 01:46:05 +0200
+
libpfm4 (4.10.1+git6-g8f2208a-1) unstable; urgency=medium
* New upstream GIT snapshot.
diff --git a/debian/snapshot.sh b/debian/snapshot.sh
index 4c68d61..4d15f21 100755
--- a/debian/snapshot.sh
+++ b/debian/snapshot.sh
@@ -5,7 +5,8 @@ set -e
commit=${1:-libpfm4/master}
-gitver=$(git describe --tags ${commit})
+upsver=$(git describe --tags ${commit})
+gitver=$(git describe --match ${upsver%+git*} --tags ${commit})
gitver=${gitver#v}
tagver=${gitver%%-*}
gitver=${gitver#${tagver}-}
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..53fb7f6
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# this is a git snapshot
+hyphen-in-upstream-part-of-debian-changelog-version
diff --git a/docs/man3/pfm_get_os_event_encoding.3
b/docs/man3/pfm_get_os_event_encoding.3
index 6ec57be..c9cab18 100644
--- a/docs/man3/pfm_get_os_event_encoding.3
+++ b/docs/man3/pfm_get_os_event_encoding.3
@@ -64,7 +64,7 @@ in this field. The typical calling sequence looks as follows:
PFM_OS_NONE,
&e);
if (ret == PFM_SUCCESS) {
- printf("fstr=%s\n", fstr);
+ printf("fstr=%s\\n", fstr);
free(fstr);
}
.fi
diff --git a/examples/Makefile b/examples/Makefile
index 68d1081..fc5677a 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -51,7 +51,7 @@ clean:
distclean: clean
-install_examples: $(TARGETS)
+install-examples install_examples: $(TARGETS)
@echo installing: $(TARGETS)
-mkdir -p $(EXAMPLESDIR)
$(INSTALL) -m 755 $(TARGETS) $(EXAMPLESDIR)
@@ -59,4 +59,4 @@ install_examples: $(TARGETS)
#
# examples are installed as part of the RPM install, typically in
/usr/share/doc/libpfm-X.Y/
#
-.PHONY: install depend install_examples
+.PHONY: install depend install-example install_examples
diff --git a/lib/events/amd64_events_fam17h.h b/lib/events/amd64_events_fam17h.h
index b0db898..deadbed 100644
--- a/lib/events/amd64_events_fam17h.h
+++ b/lib/events/amd64_events_fam17h.h
@@ -953,13 +953,6 @@ static const amd64_entry_t amd64_fam17h_pe[]={
.numasks = LIBPFM_ARRAY_SIZE(amd64_fam17h_tablewalker_allocation),
.umasks = amd64_fam17h_tablewalker_allocation,
},
- { .name = "MERGE",
- .desc = "Merge two counters together. This event must be programmed on
the odd performance counter",
- .modmsk = AMD64_FAM17H_ATTRS,
- .code = 0xfff,
- .flags = 0,
- .ngrp = 0,
- },
{ .name = "L1_BTB_CORRECTION",
.desc = "TBD",
.modmsk = AMD64_FAM17H_ATTRS,
diff --git a/lib/events/intel_skl_events.h b/lib/events/intel_skl_events.h
index 4e1b355..20c8b7a 100644
--- a/lib/events/intel_skl_events.h
+++ b/lib/events/intel_skl_events.h
@@ -309,6 +309,12 @@ static const intel_x86_umask_t skl_itlb_misses[]={
.uequiv = "WALK_DURATION",
.uflags = INTEL_X86_NCOMBO,
},
+ { .uname = "WALK_ACTIVE",
+ .udesc = "Cycles when at least one page walker is busy with a page walk
request. EPT page walks are excluded",
+ .ucode = 0x1000 | (1 << INTEL_X86_CMASK_BIT), /* cnt=1 */
+ .uequiv = "WALK_PENDING:c=1",
+ .uflags = INTEL_X86_NCOMBO,
+ },
{ .uname = "STLB_HIT",
.udesc = "Number of cache load STLB hits. No page walk",
.ucode = 0x2000,
@@ -886,6 +892,12 @@ static const intel_x86_umask_t
skl_mem_load_l3_miss_retired[]={
.umodel = PFM_PMU_INTEL_CLX,
.uflags = INTEL_X86_NCOMBO | INTEL_X86_PEBS,
},
+ { .uname = "REMOTE_PMM",
+ .udesc = "Retired load instructions with remote persistent memory as the
data source which missed all caches",
+ .ucode = 0x1000,
+ .umodel = PFM_PMU_INTEL_CLX,
+ .uflags = INTEL_X86_NCOMBO | INTEL_X86_PEBS,
+ },
};
static const intel_x86_umask_t skl_mem_load_retired[]={
@@ -930,6 +942,12 @@ static const intel_x86_umask_t skl_mem_load_retired[]={
.uequiv = "HIT_LFB",
.uflags = INTEL_X86_NCOMBO | INTEL_X86_PEBS,
},
+ { .uname = "LOCAL_PMM",
+ .udesc = "Retired load instructions with local persistent memory as the
data source where the request missed all the caches",
+ .umodel = PFM_PMU_INTEL_CLX,
+ .ucode = 0x8000,
+ .uflags = INTEL_X86_NCOMBO | INTEL_X86_PEBS,
+ },
};
static const intel_x86_umask_t skl_mem_trans_retired[]={
@@ -2245,12 +2263,12 @@ static const intel_x86_umask_t skl_sw_prefetch[]={
},
{ .uname = "T1_T2",
.udesc = "Number prefetch.t1 or prefetch.t2 instructions executed",
- .ucode = 0x4000,
+ .ucode = 0x400,
.uflags= INTEL_X86_NCOMBO,
},
{ .uname = "PREFETCHW",
.udesc = "Number prefetch.w instructions executed",
- .ucode = 0x8000,
+ .ucode = 0x800,
.uflags= INTEL_X86_NCOMBO,
},
};
diff --git a/perf_examples/Makefile b/perf_examples/Makefile
index 816d5ea..cfe522e 100644
--- a/perf_examples/Makefile
+++ b/perf_examples/Makefile
@@ -72,7 +72,7 @@ clean:
distclean: clean
-install_examples: $(TARGETS)
+install-examples install_examples: $(TARGETS)
@echo installing: $(TARGETS)
-mkdir -p $(EXAMPLESDIR)
$(INSTALL) -m 755 $(TARGETS) $(EXAMPLESDIR)
@@ -80,4 +80,4 @@ install_examples: $(TARGETS)
#
# examples are installed as part of the RPM install, typically in
/usr/share/doc/libpfm-X.Y/
#
-.PHONY: install depend install_examples
+.PHONY: install depend install_examples install-examples
--- End Message ---
