Moved PerfJITeventListener as an LLVM Patch

JuliaLang · Jul 12, 2018 · 7780444 · 7780444
1 parent 931b127
commit 7780444
Show file tree

Hide file tree

Showing 8 changed files with 690 additions and 493 deletions.
diff --git a/Make.inc b/Make.inc
@@ -73,7 +73,7 @@ endif
 USE_OPROFILE_JITEVENTS ?= 0
 
 # Set to 1 to enable profiling with perf
-USE_PERF_JITEVENTS ?= 0 
+USE_PERF_JITEVENTS ?= 0
 
 # libc++ is standard on OS X 10.9, but not for earlier releases
 USE_LIBCPP := 0

diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -98,6 +98,10 @@ ifeq ($(USE_OPROFILE_JITEVENTS), 1)
 LLVM_CMAKE += -DLLVM_USE_OPROFILE:BOOL=ON
 endif # USE_OPROFILE_JITEVENTS
 
+ifeq ($(USE_PERF_JITEVENTS), 1)
+	LLVM_CMAKE += -DLLVM_USE_PERF:BOOL=ON
+endif # USE_PERF_JITEVENTS
+
 ifeq ($(BUILD_LLDB),1)
 ifeq ($(USECLANG),0)
 LLVM_CXXFLAGS += -std=c++0x
@@ -495,6 +499,8 @@ $(eval $(call LLVM_PATCH,llvm-rL332694)) # remove for 7.0
 $(eval $(call LLVM_PATCH,llvm-rL327898)) # remove for 7.0
 $(eval $(call LLVM_PATCH,llvm-6.0-DISABLE_ABI_CHECKS))
 $(eval $(call LLVM_PATCH,llvm-OProfile-line-num)) # In #27466, to be upstreamed
+$(eval $(call LLVM_PATCH,llvm-OProfile-line-num))
+$(eval $(call LLVM_PATCH,llvm-D44892-Perf-integration))
 endif # LLVM_VER
 
 # Remove hardcoded OS X requirements in compilter-rt cmake build