Merge PR snabbco#42 (lib.pmu fixes for snabbco#40) into master

eugeneia · Jun 27, 2018 · c2dd7ea · c2dd7ea
2 parents 275d95b + 17fd901
commit c2dd7ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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 \

diff --git 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