Skip to content

Commit

Permalink
drm/i915/perf: Add 'render basic' Gen8+ OA unit configs
Browse files Browse the repository at this point in the history
Adds a static OA unit, MUX, B Counter + Flex EU configurations for basic
render metrics on Broadwell, Cherryview, Skylake and Broxton. These are
auto generated from an XML description of metric sets, currently
maintained in gputop, ref:

 https://github.com/rib/gputop
 > gputop-data/oa-*.xml
 > scripts/i915-perf-kernelgen.py

 $ make -C gputop-data -f Makefile.xml WHITELIST=RenderBasic

v2: add newlines to debug messages + fix comment (Matthew Auld)

Signed-off-by: Robert Bragg <robert@sixbynine.org>
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
  • Loading branch information
Robert Bragg authored and Ben Widawsky committed Jun 14, 2017
1 parent 3f488d9 commit 5182f64
Show file tree
Hide file tree
Showing 14 changed files with 1,876 additions and 3 deletions.
8 changes: 7 additions & 1 deletion drivers/gpu/drm/i915/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,13 @@ i915-y += i915_vgpu.o

# perf code
i915-y += i915_perf.o \
i915_oa_hsw.o
i915_oa_hsw.o \
i915_oa_bdw.o \
i915_oa_chv.o \
i915_oa_sklgt2.o \
i915_oa_sklgt3.o \
i915_oa_sklgt4.o \
i915_oa_bxt.o

ifeq ($(CONFIG_DRM_I915_GVT),y)
i915-y += intel_gvt.o
Expand Down
6 changes: 4 additions & 2 deletions drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -2417,12 +2417,14 @@ struct drm_i915_private {

int metrics_set;

const struct i915_oa_reg *mux_regs[1];
int mux_regs_lens[1];
const struct i915_oa_reg *mux_regs[2];
int mux_regs_lens[2];
int n_mux_configs;

const struct i915_oa_reg *b_counter_regs;
int b_counter_regs_len;
const struct i915_oa_reg *flex_regs;
int flex_regs_len;

struct {
struct i915_vma *vma;
Expand Down
Loading

0 comments on commit 5182f64

Please sign in to comment.