diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2017-09-13 17:38:16 +0100 |
---|---|---|
committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2017-11-22 11:17:48 +0000 |
commit | a688deceae195aec863d8de45bdaefb251927c89 (patch) | |
tree | 80f916af851ea53ad295a525efa58e8661e176d1 | |
parent | 42ee3f94f2c5c3258930c22da7c1b497dd635346 (diff) |
intel-gpu-overlay: Move local perf implementation to a library
Idea is to avoid duplication across multiple users in
upcoming patches.
v2: Commit message and use a separate library instead of piggy-
backing to libintel_tools. (Chris Wilson)
v3: Add Petri's meson build recipe.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r-- | lib/Makefile.am | 6 | ||||
-rw-r--r-- | lib/igt_perf.c (renamed from overlay/perf.c) | 2 | ||||
-rw-r--r-- | lib/igt_perf.h (renamed from overlay/perf.h) | 2 | ||||
-rw-r--r-- | lib/meson.build | 4 | ||||
-rw-r--r-- | overlay/Makefile.am | 6 | ||||
-rw-r--r-- | overlay/gem-interrupts.c | 3 | ||||
-rw-r--r-- | overlay/gpu-freq.c | 3 | ||||
-rw-r--r-- | overlay/gpu-perf.c | 3 | ||||
-rw-r--r-- | overlay/gpu-top.c | 3 | ||||
-rw-r--r-- | overlay/meson.build | 2 | ||||
-rw-r--r-- | overlay/power.c | 3 | ||||
-rw-r--r-- | overlay/rc6.c | 3 |
12 files changed, 27 insertions, 13 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 9c511dc0..c3c4a7e3 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,7 +7,11 @@ include Makefile.sources libintel_tools_la_SOURCES = $(lib_source_list) -noinst_LTLIBRARIES = libintel_tools.la +libigt_perf_la_SOURCES = \ + igt_perf.c \ + igt_perf.h + +noinst_LTLIBRARIES = libintel_tools.la libigt_perf.la noinst_HEADERS = check-ndebug.h if BUILD_VC4 diff --git a/overlay/perf.c b/lib/igt_perf.c index b8fdc675..45cccff0 100644 --- a/overlay/perf.c +++ b/lib/igt_perf.c @@ -3,7 +3,7 @@ #include <unistd.h> #include <stdlib.h> -#include "perf.h" +#include "igt_perf.h" uint64_t i915_type_id(void) { diff --git a/overlay/perf.h b/lib/igt_perf.h index c44e65f9..a80b311c 100644 --- a/overlay/perf.h +++ b/lib/igt_perf.h @@ -1,6 +1,8 @@ #ifndef I915_PERF_H #define I915_PERF_H +#include <stdint.h> + #include <linux/perf_event.h> #define I915_SAMPLE_BUSY 0 diff --git a/lib/meson.build b/lib/meson.build index 253548dc..1b55943b 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -179,4 +179,8 @@ lib_igt = declare_dependency(link_with : lib_igt_build, igt_deps = [ lib_igt ] + lib_deps +lib_igt_perf = static_library('igt_perf', + ['igt_perf.c'] +) + subdir('tests') diff --git a/overlay/Makefile.am b/overlay/Makefile.am index 39fbcc4e..cefde2d0 100644 --- a/overlay/Makefile.am +++ b/overlay/Makefile.am @@ -4,8 +4,8 @@ endif AM_CPPFLAGS = -I. AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \ - $(CAIRO_CFLAGS) $(OVERLAY_CFLAGS) $(WERROR_CFLAGS) -LDADD = $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(OVERLAY_LIBS) + $(CAIRO_CFLAGS) $(OVERLAY_CFLAGS) $(WERROR_CFLAGS) -I$(srcdir)/../lib +LDADD = $(DRM_LIBS) $(PCIACCESS_LIBS) $(CAIRO_LIBS) $(OVERLAY_LIBS) $(top_builddir)/lib/libigt_perf.la intel_gpu_overlay_SOURCES = \ chart.h \ @@ -29,8 +29,6 @@ intel_gpu_overlay_SOURCES = \ igfx.c \ overlay.h \ overlay.c \ - perf.h \ - perf.c \ power.h \ power.c \ rc6.h \ diff --git a/overlay/gem-interrupts.c b/overlay/gem-interrupts.c index 0150a1d0..7ba54fcd 100644 --- a/overlay/gem-interrupts.c +++ b/overlay/gem-interrupts.c @@ -31,9 +31,10 @@ #include <string.h> #include <ctype.h> +#include "igt_perf.h" + #include "gem-interrupts.h" #include "debugfs.h" -#include "perf.h" static int perf_open(void) { diff --git a/overlay/gpu-freq.c b/overlay/gpu-freq.c index 321c9388..7f29b1aa 100644 --- a/overlay/gpu-freq.c +++ b/overlay/gpu-freq.c @@ -28,9 +28,10 @@ #include <string.h> #include <stdio.h> +#include "igt_perf.h" + #include "gpu-freq.h" #include "debugfs.h" -#include "perf.h" static int perf_i915_open(int config, int group) { diff --git a/overlay/gpu-perf.c b/overlay/gpu-perf.c index f557b9f0..3d4a9be9 100644 --- a/overlay/gpu-perf.c +++ b/overlay/gpu-perf.c @@ -34,7 +34,8 @@ #include <fcntl.h> #include <errno.h> -#include "perf.h" +#include "igt_perf.h" + #include "gpu-perf.h" #include "debugfs.h" diff --git a/overlay/gpu-top.c b/overlay/gpu-top.c index 891a7ea7..06f489df 100644 --- a/overlay/gpu-top.c +++ b/overlay/gpu-top.c @@ -31,7 +31,8 @@ #include <errno.h> #include <assert.h> -#include "perf.h" +#include "igt_perf.h" + #include "igfx.h" #include "gpu-top.h" diff --git a/overlay/meson.build b/overlay/meson.build index a92ef895..ffc011cc 100644 --- a/overlay/meson.build +++ b/overlay/meson.build @@ -10,7 +10,6 @@ gpu_overlay_src = [ 'gpu-freq.c', 'igfx.c', 'overlay.c', - 'perf.c', 'power.c', 'rc6.c', ] @@ -56,5 +55,6 @@ if xrandr.found() and cairo.found() include_directories : inc, c_args : gpu_overlay_cflags, dependencies : gpu_overlay_deps, + link_with : lib_igt_perf, install : true) endif diff --git a/overlay/power.c b/overlay/power.c index 2f1521b8..84d860ca 100644 --- a/overlay/power.c +++ b/overlay/power.c @@ -31,7 +31,8 @@ #include <time.h> #include <errno.h> -#include "perf.h" +#include "igt_perf.h" + #include "power.h" #include "debugfs.h" diff --git a/overlay/rc6.c b/overlay/rc6.c index d7047c2f..3175bb22 100644 --- a/overlay/rc6.c +++ b/overlay/rc6.c @@ -31,8 +31,9 @@ #include <time.h> #include <errno.h> +#include "igt_perf.h" + #include "rc6.h" -#include "perf.h" static int perf_i915_open(int config, int group) { |