From 3aa1cda9feb007e18ce28fe898a6439ed319c5e7 Mon Sep 17 00:00:00 2001 From: Max Rottenkolber Date: Wed, 27 Jun 2018 15:01:16 +0200 Subject: [PATCH 1/2] lib.pmu_x86: fix regression introduced in 4a40691fb --- src/lib/pmu_x86.dasl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/pmu_x86.dasl b/src/lib/pmu_x86.dasl index 9d8c6102d0..086f2dad06 100644 --- a/src/lib/pmu_x86.dasl +++ b/src/lib/pmu_x86.dasl @@ -199,7 +199,7 @@ if vendor == "GenuineIntel" then -- All available counters are globally enabled -- (IA32_PERF_GLOBAL_CTRL). writemsr(cpu, 0x38f, bit.bor(bit.lshift(0x3ULL, 32), - bit.lshift(1ULL, pmu_x86.ngeneral) - 1)) + bit.lshift(1ULL, ngeneral) - 1)) -- Enable all fixed-function counters (IA32_FIXED_CTR_CTRL) writemsr(cpu, 0x38d, 0x333) return {"instructions", "cycles", "ref_cycles"}, 0 From 1aa69e74782e4b50a96f66ccda278cd61ad82202 Mon Sep 17 00:00:00 2001 From: Max Rottenkolber Date: Wed, 27 Jun 2018 15:03:12 +0200 Subject: [PATCH 2/2] Makefile.vita: INCLUDE missing lib.pmu* components --- src/Makefile.vita | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.vita b/src/Makefile.vita index 06fc7cc861..258f07ef7b 100644 --- a/src/Makefile.vita +++ b/src/Makefile.vita @@ -7,7 +7,7 @@ INCLUDE = *.* core arch jit syscall pf \ program/vita program/top program/trace program/ps program/pci_bind INCLUDE_TEST = $(INCLUDE) \ - lib/pmu.* apps/basic apps/test apps/packet_filter apps/ipv4 \ + lib/pmu* apps/basic apps/test apps/packet_filter apps/ipv4 \ lib/pcap apps/pcap \ program/snsh program/snabbmark \ lib/virtio apps/vhost apps/ipsec apps/ipv6 \