[PATCH i-g-t v5 21/24] tests/intel: Add more tests to Performance subcategory

[Katarzyna Piecielska]

Tag tests/intel/perf.c & tests/intel/perf_pmu.c as performance.

v2: Make Sub-category/Functionality/Feature unique values. (Kamil)

Signed-off-by: Katarzyna Piecielska <katarzyna.piecielska at intel.com>
Cc: Ashutosh Dixit <ashutosh.dixit at intel.com>
Cc: Mauro Carvalho Chehab <mauro.chehab at linux.intel.com>
Cc: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Cc: Chris Wilson <chris.p.wilson at intel.com>
Reviewed-by: Mauro Carvalho Chehab <mauro.chehab at linux.intel.com>
---
 tests/intel/gem_ctx_freq.c |  2 +-
 tests/intel/perf.c         | 33 +++++++++++++++++----------------
 tests/intel/perf_pmu.c     | 19 ++++++++++---------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/tests/intel/gem_ctx_freq.c b/tests/intel/gem_ctx_freq.c
index 8c0d7db3c..6caaf4a1a 100644
--- a/tests/intel/gem_ctx_freq.c
+++ b/tests/intel/gem_ctx_freq.c
@@ -40,7 +40,7 @@
 /**
  * TEST: gem ctx freq
  * Category: Server
- * Feature: context
+ * Feature: context feature
  * Functionality: frequency management
  * Run type: FULL
  * Sub-category: Performance
diff --git a/tests/intel/perf.c b/tests/intel/perf.c
index e5d3fbd0e..44a0acf8d 100644
--- a/tests/intel/perf.c
+++ b/tests/intel/perf.c
@@ -52,6 +52,7 @@
  * Test category: Perf
  * Functionality: oa
  * Sub-category: Performance
+ * Category: Desktop client
  * Run type: FULL
  *
  * SUBTEST: blocking
@@ -70,44 +71,44 @@
  * Description: Test the i915 perf metrics streaming interface
  *
  * SUBTEST: enable-disable
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: gen12-group-concurrent-oa-buffer-read
  * Description: Verify concurrent reads from OA buffers in different groups
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: gen12-group-exclusive-stream-ctx-handle
  * Description: Verify exclusivity of perf streams with ctx handle
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: gen12-group-exclusive-stream-sample-oa
  * Description: Verify exclusivity of perf streams with sample oa option
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: gen12-invalid-class-instance
  * Description: Verify invalid class instance
  *
  * SUBTEST: gen12-mi-rpc
  * Description: Test MI REPORT PERF COUNT for Gen 12
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: gen12-oa-tlb-invalidate
  * Description: Test OA TLB invalidate
  *
  * SUBTEST: gen12-unprivileged-single-ctx-counters
  * Description: Measure performance for a specific context using OAR in Gen 12
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: gen8-unprivileged-single-ctx-counters
- * Feature: oa, obsolete
+ * Feature: oa perf, obsolete
  *
  * SUBTEST: global-sseu-config
  * Description: Verify specifying SSEU opening parameters
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: global-sseu-config-invalid
  * Description: Verify invalid SSEU opening parameters
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: i915-ref-count
  * Description: Test the i915 perf metrics streaming interface
@@ -134,7 +135,7 @@
  * Description: Test the i915 perf metrics streaming interface
  *
  * SUBTEST: mi-rpc
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: missing-sample-flags
  * Description: Test the i915 perf metrics streaming interface
@@ -143,19 +144,19 @@
  * Description: Test the i915 perf metrics streaming interface
  *
  * SUBTEST: non-system-wide-paranoid
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: non-zero-reason
  * Description: Test that reason field in OA reports is never 0 on Gen8+
  *
  * SUBTEST: oa-exponents
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: oa-formats
  * Description: Test the i915 perf metrics streaming interface
  *
  * SUBTEST: per-context-mode-unprivileged
- * Feature: oa, obsolete
+ * Feature: oa perf, obsolete
  *
  * SUBTEST: polling
  * Description: Test polled read with default hrtimer frequency
@@ -167,20 +168,20 @@
  * Description: Test polled read with buffer size smaller than available data
  *
  * SUBTEST: rc6-disable
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: short-reads
  * Description: Test the i915 perf metrics streaming interface
  *
  * SUBTEST: stress-open-close
  * Description: Stress tests opening & closing the i915-perf stream in a busy loop
- * Feature: oa
+ * Feature: oa perf
  *
  * SUBTEST: sysctl-defaults
  * Description: Test the i915 perf metrics streaming interface
  *
  * SUBTEST: unprivileged-single-ctx-counters
- * Feature: oa, obsolete
+ * Feature: oa perf, obsolete
  *
  * SUBTEST: whitelisted-registers-userspace-config
  * Description: Test the i915 perf metrics streaming interface
diff --git a/tests/intel/perf_pmu.c b/tests/intel/perf_pmu.c
index 718a3ed37..220d41748 100644
--- a/tests/intel/perf_pmu.c
+++ b/tests/intel/perf_pmu.c
@@ -52,9 +52,10 @@
 /**
  * TEST: perf pmu
  * Description: Test the i915 pmu perf interface
- * Feature: i915 pmu perf interface, pmu
+ * Feature: i915 pmu perf interface, pmu feature
  * Test category: Perf
  * Sub-category: Performance
+ * Category: Desktop client
  * Functionality: pmu
  * Run type: FULL
  *
@@ -107,10 +108,10 @@
  * Description: Test the i915 pmu perf interface
  *
  * SUBTEST: event-wait
- * Feature: obsolete, pmu
+ * Feature: obsolete, pmu feature
  *
  * SUBTEST: faulting-read
- * Feature: pmu
+ * Feature: pmu feature
  *
  * SUBTEST: frequency
  * Description: Read requested freq and actual frequency via PMU within specified time interval for any given workload changes
@@ -159,22 +160,22 @@
  *
  * SUBTEST: pmu-read
  * Description: Verify i915 pmu dir exists and read all events
- * Feature: pmu
+ * Feature: pmu feature
  *
  * SUBTEST: rc6
- * Feature: pmu
+ * Feature: pmu feature
  *
  * SUBTEST: rc6-all-gts
- * Feature: pmu
+ * Feature: pmu feature
  *
  * SUBTEST: rc6-suspend
- * Feature: pmu
+ * Feature: pmu feature
  *
  * SUBTEST: render-node-busy
- * Feature: pmu
+ * Feature: pmu feature
  *
  * SUBTEST: render-node-busy-idle
- * Feature: pmu
+ * Feature: pmu feature
  *
  * SUBTEST: semaphore-busy
  * Description: Test the i915 pmu perf interface
-- 
2.34.1