On 14 September 2016 at 15:19, Robert Bragg robert@sixbynine.org wrote:
This adds 'compute', 'compute extended', 'memory reads', 'memory writes' and 'sampler balance' metric sets for Haswell.
The code is auto generated from an XML description of metric sets, currently maintained in gputop, ref:
gputop-data/oa-*.xml scripts/i915-perf-kernelgen.py
$ make -C gputop-data -f Makefile.xml
Signed-off-by: Robert Bragg robert@sixbynine.org
drivers/gpu/drm/i915/i915_oa_hsw.c | 559 ++++++++++++++++++++++++++++++++++++- 1 file changed, 558 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_oa_hsw.c b/drivers/gpu/drm/i915/i915_oa_hsw.c index 656334d..7906a26 100644 --- a/drivers/gpu/drm/i915/i915_oa_hsw.c +++ b/drivers/gpu/drm/i915/i915_oa_hsw.c @@ -30,9 +30,14 @@
enum metric_set_id { METRIC_SET_ID_RENDER_BASIC = 1,
METRIC_SET_ID_COMPUTE_BASIC,METRIC_SET_ID_COMPUTE_EXTENDED,METRIC_SET_ID_MEMORY_READS,METRIC_SET_ID_MEMORY_WRITES,METRIC_SET_ID_SAMPLER_BALANCE,};
-int i915_oa_n_builtin_metric_sets_hsw = 1; +int i915_oa_n_builtin_metric_sets_hsw = 6;
You didn't fancy having a METRIC_SET_ID_MAX?
Reviewed-by: Matthew Auld matthew.auld@intel.com