summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.mk2
-rw-r--r--benchmarks/Android.mk36
-rw-r--r--benchmarks/Makefile.am6
-rw-r--r--benchmarks/Makefile.sources5
4 files changed, 43 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 8aeb2d4d..681d1145 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1,2 @@
-include $(call all-named-subdir-makefiles, lib tests tools)
+include $(call all-named-subdir-makefiles, lib tests tools benchmarks)
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
new file mode 100644
index 00000000..5bb8ef50
--- /dev/null
+++ b/benchmarks/Android.mk
@@ -0,0 +1,36 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(LOCAL_PATH)/Makefile.sources
+
+#================#
+
+define add_benchmark
+ include $(CLEAR_VARS)
+
+ LOCAL_SRC_FILES := $1.c
+
+ LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
+ LOCAL_CFLAGS += -DANDROID -UNDEBUG -include "check-ndebug.h"
+ LOCAL_CFLAGS += -std=c99
+ # FIXME: drop once Bionic correctly annotates "noreturn" on pthread_exit
+ LOCAL_CFLAGS += -Wno-error=return-type
+ # Excessive complaining for established cases. Rely on the Linux version warnings.
+ LOCAL_CFLAGS += -Wno-sign-compare
+
+ LOCAL_MODULE := $1
+ LOCAL_MODULE_TAGS := optional
+
+ LOCAL_STATIC_LIBRARIES := libintel_gpu_tools
+
+ LOCAL_SHARED_LIBRARIES := libpciaccess \
+ libdrm \
+ libdrm_intel
+
+ include $(BUILD_EXECUTABLE)
+endef
+
+#================#
+
+benchmark_list := $(bin_PROGRAMS)
+
+$(foreach item,$(benchmark_list),$(eval $(call add_benchmark,$(item))))
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index e2ad7845..86f755a0 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -1,9 +1,5 @@
-bin_PROGRAMS = \
- intel_upload_blit_large \
- intel_upload_blit_large_gtt \
- intel_upload_blit_large_map \
- intel_upload_blit_small
+include Makefile.sources
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/lib
AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(CAIRO_CFLAGS)
diff --git a/benchmarks/Makefile.sources b/benchmarks/Makefile.sources
new file mode 100644
index 00000000..f9da579b
--- /dev/null
+++ b/benchmarks/Makefile.sources
@@ -0,0 +1,5 @@
+bin_PROGRAMS = \
+ intel_upload_blit_large \
+ intel_upload_blit_large_gtt \
+ intel_upload_blit_large_map \
+ intel_upload_blit_small