[PATCH v2] lib/igt_sysfs: update igt_sysfs_engines to run dynamic tests with its associated engine class.
sai.gowtham.ch at intel.com
sai.gowtham.ch at intel.com
Wed Aug 14 09:01:52 UTC 2024
From: Sai Gowtham Ch <sai.gowtham.ch at intel.com>
Correlate updates in sysfs engines queried and the work load submitted
to a engine, enhancing igt_sysfs_engines so that each update in sysfs
engine will corelates to it corresponding engine class.
Signed-off-by: Sai Gowtham Ch <sai.gowtham.ch at intel.com>
Reviewed-by: Janga Rahul Kumar <janga.rahul.kumar at intel.com>
---
lib/igt_sysfs.c | 39 +++++++++++++++++++++++++---
lib/igt_sysfs.h | 4 +--
tests/intel/xe_exec_queue_property.c | 7 ++---
tests/intel/xe_sysfs_defaults.c | 5 ++--
tests/intel/xe_sysfs_scheduler.c | 10 ++++---
5 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c
index 2863e22b5..aec0bb53d 100644
--- a/lib/igt_sysfs.c
+++ b/lib/igt_sysfs.c
@@ -1210,6 +1210,32 @@ void igt_sysfs_rw_attr_verify(igt_sysfs_rw_attr_t *rw)
igt_assert(!ret);
}
+/**
+ * xe_get_engine_class:
+ * @name: de_d_name that we get from igt_sysfs_engine.
+ *
+ * It returns engine class corresponding to the engine dir from igt_sysfs_engines.
+ *
+ */
+static uint16_t xe_get_engine_class(char *name)
+{
+ uint16_t class;
+
+ if (strcmp(name, "rcs") == 0) {
+ class = DRM_XE_ENGINE_CLASS_RENDER;
+ } else if (strcmp(name, "bcs") == 0) {
+ class = DRM_XE_ENGINE_CLASS_COPY;
+ } else if (strcmp(name, "vcs") == 0) {
+ class = DRM_XE_ENGINE_CLASS_VIDEO_DECODE;
+ } else if (strcmp(name, "vecs") == 0) {
+ class = DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE;
+ } else if (strcmp(name, "ccs") == 0) {
+ class = DRM_XE_ENGINE_CLASS_COMPUTE;
+ }
+
+ return class;
+}
+
/**
* igt_sysfs_engines:
* @xe: fd of the device
@@ -1220,11 +1246,12 @@ void igt_sysfs_rw_attr_verify(igt_sysfs_rw_attr_t *rw)
* It iterates over sysfs/engines and runs a dynamic engine test.
*
*/
-void igt_sysfs_engines(int xe, int engines, const char **property,
- void (*test)(int, int, const char **))
+void igt_sysfs_engines(int xe, int engines, int gt, bool all, const char **property,
+ void (*test)(int, int, const char **, uint16_t, int))
{
struct dirent *de;
DIR *dir;
+ uint16_t class;
lseek(engines, 0, SEEK_SET);
@@ -1251,7 +1278,13 @@ void igt_sysfs_engines(int xe, int engines, const char **property,
igt_require(fstatat(engine_fd, property[2], &st, 0) == 0);
}
errno = 0;
- test(xe, engine_fd, property);
+
+ if (all) {
+ class = xe_get_engine_class(de->d_name);
+ test(xe, engine_fd, property, class, gt);
+ } else {
+ test(xe, engine_fd, property, 0, 0);
+ }
}
close(engine_fd);
}
diff --git a/lib/igt_sysfs.h b/lib/igt_sysfs.h
index 27031a015..2a1e3b1bf 100644
--- a/lib/igt_sysfs.h
+++ b/lib/igt_sysfs.h
@@ -163,8 +163,8 @@ typedef struct igt_sysfs_rw_attr {
void igt_sysfs_rw_attr_verify(igt_sysfs_rw_attr_t *rw);
-void igt_sysfs_engines(int xe, int engines, const char **property,
- void (*test)(int, int, const char **));
+void igt_sysfs_engines(int xe, int engines, int gt, bool all, const char **property,
+ void (*test)(int, int, const char **, uint16_t, int));
char *xe_sysfs_gt_path(int xe_device, int gt, char *path, int pathlen);
int xe_sysfs_gt_open(int xe_device, int gt);
diff --git a/tests/intel/xe_exec_queue_property.c b/tests/intel/xe_exec_queue_property.c
index 3edab0af5..25a7e7abb 100644
--- a/tests/intel/xe_exec_queue_property.c
+++ b/tests/intel/xe_exec_queue_property.c
@@ -64,7 +64,8 @@ static void test_set_property(int xe, int property_name,
&exec_queue_id), err_val);
}
-static void test_property_min_max(int xe, int engine, const char **property)
+static void test_property_min_max(int xe, int engine, const char **property,
+ uint16_t class, int gt)
{
unsigned int max;
unsigned int min;
@@ -198,7 +199,7 @@ igt_main
{
static const struct {
const char *name;
- void (*fn)(int, int, const char **);
+ void (*fn)(int, int, const char **, uint16_t, int);
} tests[] = {{"property-min-max", test_property_min_max}, {} };
const char *property[][3] = { {"timeslice_duration_us", "timeslice_duration_min", "timeslice_duration_max"},
@@ -257,7 +258,7 @@ igt_main
engines_fd = openat(gt_fd, "engines", O_RDONLY);
igt_require(engines_fd != -1);
- igt_sysfs_engines(xe, engines_fd, property[i], t->fn);
+ igt_sysfs_engines(xe, engines_fd, 0, 0, property[i], t->fn);
close(engines_fd);
close(gt_fd);
}
diff --git a/tests/intel/xe_sysfs_defaults.c b/tests/intel/xe_sysfs_defaults.c
index 1777158d5..393e56651 100644
--- a/tests/intel/xe_sysfs_defaults.c
+++ b/tests/intel/xe_sysfs_defaults.c
@@ -28,7 +28,8 @@
#include "xe_drm.h"
#include "xe/xe_query.h"
-static void test_defaults(int xe, int engine, const char **property)
+static void test_defaults(int xe, int engine, const char **property,
+ uint16_t class, int gt)
{
struct dirent *de;
uint64_t property_value;
@@ -81,7 +82,7 @@ igt_main
engines_fd = openat(gt_fd, "engines", O_RDONLY);
igt_require(engines_fd != -1);
- igt_sysfs_engines(xe, engines_fd, NULL, test_defaults);
+ igt_sysfs_engines(xe, engines_fd, 0, 0, NULL, test_defaults);
close(engines_fd);
close(gt_fd);
diff --git a/tests/intel/xe_sysfs_scheduler.c b/tests/intel/xe_sysfs_scheduler.c
index 979ce95d2..947dbdbc9 100644
--- a/tests/intel/xe_sysfs_scheduler.c
+++ b/tests/intel/xe_sysfs_scheduler.c
@@ -37,7 +37,8 @@
#include "xe_drm.h"
#include "xe/xe_query.h"
-static void test_invalid(int xe, int engine, const char **property)
+static void test_invalid(int xe, int engine, const char **property,
+ uint16_t class, int gt)
{
unsigned int saved, set;
unsigned int min, max;
@@ -57,7 +58,8 @@ static void test_invalid(int xe, int engine, const char **property)
igt_assert_eq(set, saved);
}
-static void test_min_max(int xe, int engine, const char **property)
+static void test_min_max(int xe, int engine, const char **property,
+ uint16_t class, int gt)
{
unsigned int default_max, max;
unsigned int default_min, min;
@@ -113,7 +115,7 @@ igt_main
{
static const struct {
const char *name;
- void (*fn)(int, int, const char **);
+ void (*fn)(int, int, const char **, uint16_t, int);
} tests[] = {
{ "invalid", test_invalid },
{ "min-max", test_min_max },
@@ -150,7 +152,7 @@ igt_main
engines_fd = openat(gt_fd, "engines", O_RDONLY);
igt_require(engines_fd != -1);
- igt_sysfs_engines(xe, engines_fd, property[i], t->fn);
+ igt_sysfs_engines(xe, engines_fd, 0, 0, property[i], t->fn);
close(engines_fd);
close(gt_fd);
}
--
2.39.1
More information about the igt-dev
mailing list