Use git submodule for libpfm.

travisdowns · Mar 11, 2018 · 5b6777a · 5b6777a
1 parent 9708c97
commit 5b6777a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "backward-cpp"]
 	path = backward-cpp
 	url = https://github.com/bombela/backward-cpp.git
+[submodule "libpfm4"]
+	path = libpfm4
+	url = https://git.code.sf.net/p/perfmon2/libpfm4
diff --git a/Makefile b/Makefile
@@ -10,8 +10,7 @@ CC ?= gcc
 ASM ?= nasm
 ASM_FLAGS ?= -DNASM_ENABLE_DEBUG=$(NASM_DEBUG) -w+all -l x86_methods.list
 
-PFM_VER ?= 4.8.0
-PFM_DIR ?= libpfm-$(PFM_VER)
+PFM_DIR ?= libpfm4
 PFM_LIBDIR ?= $(PFM_DIR)/lib
 
 GIT_VERSION := $(shell git describe --dirty --always)
@@ -95,11 +94,11 @@ insmod: libpfc
 	sudo insmod libpfc/pfc.ko
 
 $(PFM_LIBDIR)/libpfm.so:
-	tar xzf libpfm-4.8.0.tar.gz
 	$(MAKE) -C $(PFM_DIR) lib
 
 libpfm4-clean:
-	rm -rf $(PFM_DIR)
+	$(MAKE) -C $(PFM_DIR) clean
+
 
 
 LOCAL_MK = $(wildcard local.mk)

diff --git a/libpfm-4.8.0.tar.gz b/libpfm-4.8.0.tar.gz
diff --git a/libpfm4-support.cpp b/libpfm4-support.cpp
@@ -6,7 +6,7 @@
 #include <cstring>
 #include <vector>
 
-#include "libpfm-4.8.0/include/perfmon/pfmlib.h"
+#include "libpfm4/include/perfmon/pfmlib.h"
 
 #include "libpfm4-support.hpp"
 #include "context.hpp"