From: Gustavo Sousa <gustavo.sousa@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Gustavo Sousa <gustavo.sousa@intel.com>
Subject: [PATCH 1/6] drm/xe/rtp: Write kunit test cases specific for rule matching
Date: Wed, 14 Jan 2026 19:49:51 -0300 [thread overview]
Message-ID: <20260114-rtp-rule-parser-v1-1-fa9029586bff@intel.com> (raw)
In-Reply-To: <20260114-rtp-rule-parser-v1-0-fa9029586bff@intel.com>
The kunit test cases for the RTP framework are currently separated into
those that validate xe_rtp_process_to_sr() and those that validate
xe_rtp_process(). In both of them, we also have mixed stuff to validate
rule matching functionality, which should rather be done in a separate
test case group.
Let's create such a group, specific for validating rule matching, and
also add an initial set of cases. In an upcoming change, we will do a
cleanup of the other groups by migrating those cases intended for rule
matching to this new group.
Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
---
drivers/gpu/drm/xe/tests/xe_rtp.c | 38 +++++++++
drivers/gpu/drm/xe/tests/xe_rtp_test.c | 141 +++++++++++++++++++++++++++++++++
drivers/gpu/drm/xe/tests/xe_rtp_test.h | 24 ++++++
drivers/gpu/drm/xe/xe_rtp.c | 55 +++++++++----
4 files changed, 242 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/xe/tests/xe_rtp.c b/drivers/gpu/drm/xe/tests/xe_rtp.c
new file mode 100644
index 000000000000..b3a8b75936d1
--- /dev/null
+++ b/drivers/gpu/drm/xe/tests/xe_rtp.c
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0 AND MIT
+/*
+ * Copyright © 2026 Intel Corporation
+ */
+
+#include "tests/xe_rtp_test.h"
+
+#include <kunit/visibility.h>
+
+/**
+ * xe_rtp_rule_matches - Check if a set of RTP rule set match against the
+ * device/GT/hwe
+ * @xe: The xe device
+ * @gt: The GT struct (may be NULL)
+ * @hwe: The hw_engine (may be NULL)
+ * @rules: The array of rules to match against
+ * @n_rules: Number of items in @rules
+ * @err: Pointer (may be NULL) to set error number.
+ *
+ * This parses the set of rules and check if they match against the passed
+ * parameters.
+ *
+ * If passed, @err is updated with a non-zero negative error number or zero if
+ * no errors were found during the parsing/evaluation of rules.
+ *
+ * Returns true if there is a match and false if there is no match or if an
+ * error was found.
+ */
+bool xe_rtp_rule_matches(const struct xe_device *xe,
+ struct xe_gt *gt,
+ struct xe_hw_engine *hwe,
+ const struct xe_rtp_rule *rules,
+ unsigned int n_rules,
+ int *err)
+{
+ return rule_matches_with_err(xe, gt, hwe, rules, n_rules, err);
+}
+EXPORT_SYMBOL_IF_KUNIT(xe_rtp_rule_matches);
diff --git a/drivers/gpu/drm/xe/tests/xe_rtp_test.c b/drivers/gpu/drm/xe/tests/xe_rtp_test.c
index d2255a59e58f..c3fea547da32 100644
--- a/drivers/gpu/drm/xe/tests/xe_rtp_test.c
+++ b/drivers/gpu/drm/xe/tests/xe_rtp_test.c
@@ -19,6 +19,7 @@
#include "xe_pci_test.h"
#include "xe_reg_sr.h"
#include "xe_rtp.h"
+#include "xe_rtp_test.h"
#define REGULAR_REG1 XE_REG(1)
#define REGULAR_REG2 XE_REG(2)
@@ -31,6 +32,14 @@
#undef XE_REG_MCR
#define XE_REG_MCR(...) XE_REG(__VA_ARGS__, .mcr = 1)
+struct rtp_rules_test_case {
+ const char *name;
+ bool expected_match;
+ int expected_err;
+ const struct xe_rtp_rule *rules;
+ u8 n_rules;
+};
+
struct rtp_to_sr_test_case {
const char *name;
struct xe_reg expected_reg;
@@ -60,6 +69,130 @@ static bool match_no(const struct xe_device *xe, const struct xe_gt *gt,
return false;
}
+static const struct rtp_rules_test_case rtp_rules_cases[] = {
+ /*
+ * Single rules.
+ *
+ * TODO: Include other types of rules as well: GRAPHICS_VERSION(),
+ * MEDIA_VERSION(), etc.
+ */
+ {
+ .name = "no",
+ .expected_match = false,
+ XE_RTP_RULES(FUNC(match_no)),
+ },
+ {
+ .name = "yes",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_yes)),
+ },
+
+ /* Conjunctions with 2 operands. */
+ {
+ .name = "no-and-no",
+ .expected_match = false,
+ XE_RTP_RULES(FUNC(match_no), FUNC(match_no)),
+ },
+ {
+ .name = "no-and-yes",
+ .expected_match = false,
+ XE_RTP_RULES(FUNC(match_no), FUNC(match_yes)),
+ },
+ {
+ .name = "yes-and-no",
+ .expected_match = false,
+ XE_RTP_RULES(FUNC(match_yes), FUNC(match_no)),
+ },
+ {
+ .name = "yes-and-yes",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_yes), FUNC(match_yes)),
+ },
+
+ /* Disjunctions with 2 operands. */
+ {
+ .name = "no-or-no",
+ .expected_match = false,
+ XE_RTP_RULES(FUNC(match_no), OR, FUNC(match_no)),
+ },
+ {
+ .name = "no-or-yes",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_no), OR, FUNC(match_yes)),
+ },
+ {
+ .name = "yes-or-no",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_yes), OR, FUNC(match_no)),
+ },
+ {
+ .name = "yes-or-yes",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_yes), OR, FUNC(match_yes)),
+ },
+
+ /* Conjunction and disjunctions. */
+ {
+ .name = "no-yes-or-no-yes",
+ .expected_match = false,
+ XE_RTP_RULES(FUNC(match_no), FUNC(match_yes), OR,
+ FUNC(match_yes), FUNC(match_no)),
+ },
+ {
+ .name = "no-yes-or-yes-yes",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_no), FUNC(match_yes), OR,
+ FUNC(match_yes), FUNC(match_yes)),
+ },
+ {
+ .name = "yes-yes-or-no-yes",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_yes), FUNC(match_yes), OR,
+ FUNC(match_no), FUNC(match_yes)),
+ },
+ {
+ .name = "yes-yes-or-yes-yes",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_yes), FUNC(match_yes), OR,
+ FUNC(match_yes), FUNC(match_yes)),
+ },
+ {
+ .name = "no-no-or-yes-or-no",
+ .expected_match = true,
+ XE_RTP_RULES(FUNC(match_no), FUNC(match_no), OR,
+ FUNC(match_yes), OR,
+ FUNC(match_no)),
+ },
+
+ /* Syntax errors. */
+ {
+ .name = "or",
+ .expected_match = false,
+ .expected_err = -EINVAL,
+ XE_RTP_RULES(OR),
+ },
+ {
+ .name = "or-anything",
+ .expected_match = false,
+ .expected_err = -EINVAL,
+ XE_RTP_RULES(OR, FUNC(match_yes)),
+ },
+};
+
+static void xe_rtp_rules_tests(struct kunit *test)
+{
+ const struct rtp_rules_test_case *param = test->param_value;
+ struct xe_device *xe = test->priv;
+ struct xe_gt *gt = xe_device_get_root_tile(xe)->primary_gt;
+ int err;
+ bool match;
+
+ match = xe_rtp_rule_matches(xe, gt, NULL, param->rules, param->n_rules, &err);
+
+ KUNIT_EXPECT_EQ(test, match, param->expected_match);
+ KUNIT_EXPECT_EQ(test, err, param->expected_err);
+}
+
static const struct rtp_to_sr_test_case rtp_to_sr_cases[] = {
{
.name = "coalesce-same-reg",
@@ -488,6 +621,13 @@ static void xe_rtp_process_tests(struct kunit *test)
KUNIT_EXPECT_EQ(test, active, param->expected_active);
}
+static void rtp_rules_desc(const struct rtp_rules_test_case *t, char *desc)
+{
+ strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE);
+}
+
+KUNIT_ARRAY_PARAM(rtp_rules, rtp_rules_cases, rtp_rules_desc);
+
static void rtp_to_sr_desc(const struct rtp_to_sr_test_case *t, char *desc)
{
strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE);
@@ -533,6 +673,7 @@ static void xe_rtp_test_exit(struct kunit *test)
}
static struct kunit_case xe_rtp_tests[] = {
+ KUNIT_CASE_PARAM(xe_rtp_rules_tests, rtp_rules_gen_params),
KUNIT_CASE_PARAM(xe_rtp_process_to_sr_tests, rtp_to_sr_gen_params),
KUNIT_CASE_PARAM(xe_rtp_process_tests, rtp_gen_params),
{}
diff --git a/drivers/gpu/drm/xe/tests/xe_rtp_test.h b/drivers/gpu/drm/xe/tests/xe_rtp_test.h
new file mode 100644
index 000000000000..0579c1522424
--- /dev/null
+++ b/drivers/gpu/drm/xe/tests/xe_rtp_test.h
@@ -0,0 +1,24 @@
+/* SPDX-License-Identifier: GPL-2.0 AND MIT */
+/*
+ * Copyright © 2026 Intel Corporation
+ */
+
+#ifndef _XE_RTP_TEST_H_
+#define _XE_RTP_TEST_H_
+
+#include <linux/types.h>
+#include <kunit/test.h>
+
+struct xe_device;
+struct xe_gt;
+struct xe_hw_engine;
+struct xe_rtp_rule;
+
+bool xe_rtp_rule_matches(const struct xe_device *xe,
+ struct xe_gt *gt,
+ struct xe_hw_engine *hwe,
+ const struct xe_rtp_rule *rules,
+ unsigned int n_rules,
+ int *err);
+
+#endif
diff --git a/drivers/gpu/drm/xe/xe_rtp.c b/drivers/gpu/drm/xe/xe_rtp.c
index ed509b1c8cfc..e955df6c22ca 100644
--- a/drivers/gpu/drm/xe/xe_rtp.c
+++ b/drivers/gpu/drm/xe/xe_rtp.c
@@ -30,16 +30,20 @@ static bool has_samedia(const struct xe_device *xe)
return xe->info.media_verx100 >= 1300;
}
-static bool rule_matches(const struct xe_device *xe,
- struct xe_gt *gt,
- struct xe_hw_engine *hwe,
- const struct xe_rtp_rule *rules,
- unsigned int n_rules)
+static bool rule_matches_with_err(const struct xe_device *xe,
+ struct xe_gt *gt,
+ struct xe_hw_engine *hwe,
+ const struct xe_rtp_rule *rules,
+ unsigned int n_rules,
+ int *err)
{
const struct xe_rtp_rule *r;
unsigned int i, rcount = 0;
bool match;
+ if (err)
+ *err = 0;
+
for (r = rules, i = 0; i < n_rules; r = &rules[++i]) {
switch (r->match_type) {
case XE_RTP_MATCH_OR:
@@ -58,14 +62,14 @@ static bool rule_matches(const struct xe_device *xe,
break;
case XE_RTP_MATCH_GRAPHICS_VERSION:
if (drm_WARN_ON(&xe->drm, !gt))
- return false;
+ goto error;
match = xe->info.graphics_verx100 == r->ver_start &&
(!has_samedia(xe) || !xe_gt_is_media_type(gt));
break;
case XE_RTP_MATCH_GRAPHICS_VERSION_RANGE:
if (drm_WARN_ON(&xe->drm, !gt))
- return false;
+ goto error;
match = xe->info.graphics_verx100 >= r->ver_start &&
xe->info.graphics_verx100 <= r->ver_end &&
@@ -73,13 +77,13 @@ static bool rule_matches(const struct xe_device *xe,
break;
case XE_RTP_MATCH_GRAPHICS_VERSION_ANY_GT:
if (drm_WARN_ON(&xe->drm, !gt))
- return false;
+ goto error;
match = xe->info.graphics_verx100 == r->ver_start;
break;
case XE_RTP_MATCH_GRAPHICS_STEP:
if (drm_WARN_ON(&xe->drm, !gt))
- return false;
+ goto error;
match = xe->info.step.graphics >= r->step_start &&
xe->info.step.graphics < r->step_end &&
@@ -87,14 +91,14 @@ static bool rule_matches(const struct xe_device *xe,
break;
case XE_RTP_MATCH_MEDIA_VERSION:
if (drm_WARN_ON(&xe->drm, !gt))
- return false;
+ goto error;
match = xe->info.media_verx100 == r->ver_start &&
(!has_samedia(xe) || xe_gt_is_media_type(gt));
break;
case XE_RTP_MATCH_MEDIA_VERSION_RANGE:
if (drm_WARN_ON(&xe->drm, !gt))
- return false;
+ goto error;
match = xe->info.media_verx100 >= r->ver_start &&
xe->info.media_verx100 <= r->ver_end &&
@@ -102,7 +106,7 @@ static bool rule_matches(const struct xe_device *xe,
break;
case XE_RTP_MATCH_MEDIA_STEP:
if (drm_WARN_ON(&xe->drm, !gt))
- return false;
+ goto error;
match = xe->info.step.media >= r->step_start &&
xe->info.step.media < r->step_end &&
@@ -110,7 +114,7 @@ static bool rule_matches(const struct xe_device *xe,
break;
case XE_RTP_MATCH_MEDIA_VERSION_ANY_GT:
if (drm_WARN_ON(&xe->drm, !gt))
- return false;
+ goto error;
match = xe->info.media_verx100 == r->ver_start;
break;
@@ -122,13 +126,13 @@ static bool rule_matches(const struct xe_device *xe,
break;
case XE_RTP_MATCH_ENGINE_CLASS:
if (drm_WARN_ON(&xe->drm, !hwe))
- return false;
+ goto error;
match = hwe->class == r->engine_class;
break;
case XE_RTP_MATCH_NOT_ENGINE_CLASS:
if (drm_WARN_ON(&xe->drm, !hwe))
- return false;
+ goto error;
match = hwe->class != r->engine_class;
break;
@@ -160,9 +164,24 @@ static bool rule_matches(const struct xe_device *xe,
done:
if (drm_WARN_ON(&xe->drm, !rcount))
- return false;
+ goto error;
return true;
+
+error:
+ if (err)
+ *err = -EINVAL;
+
+ return false;
+}
+
+static bool rule_matches(const struct xe_device *xe,
+ struct xe_gt *gt,
+ struct xe_hw_engine *hwe,
+ const struct xe_rtp_rule *rules,
+ unsigned int n_rules)
+{
+ return rule_matches_with_err(xe, gt, hwe, rules, n_rules, NULL);
}
static void rtp_add_sr_entry(const struct xe_rtp_action *action,
@@ -385,3 +404,7 @@ bool xe_rtp_match_has_flat_ccs(const struct xe_device *xe,
{
return xe->info.has_flat_ccs;
}
+
+#if IS_ENABLED(CONFIG_DRM_XE_KUNIT_TEST)
+#include "tests/xe_rtp.c"
+#endif
--
2.52.0
next prev parent reply other threads:[~2026-01-14 22:50 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-14 22:49 [PATCH 0/6] drm/xe/rtp: Miscellaneous improvements to rule matching Gustavo Sousa
2026-01-14 22:49 ` Gustavo Sousa [this message]
2026-01-14 22:57 ` [PATCH 1/6] drm/xe/rtp: Write kunit test cases specific for " Gustavo Sousa
2026-02-10 22:03 ` Matt Roper
2026-01-14 22:49 ` [PATCH 2/6] drm/xe/rtp: Drop rule matching cases from rtp_to_sr_cases and rtp_cases Gustavo Sousa
2026-02-10 22:06 ` Matt Roper
2026-01-14 22:49 ` [PATCH 3/6] drm/xe/rtp: Do not break parsing when missing context Gustavo Sousa
2026-02-10 22:20 ` Matt Roper
2026-04-29 19:45 ` Gustavo Sousa
2026-01-14 22:49 ` [PATCH 4/6] drm/xe/rtp: Extract rule_match_item() Gustavo Sousa
2026-02-10 22:24 ` Matt Roper
2026-01-14 22:49 ` [PATCH 5/6] drm/xe/rtp: Fully parse the ruleset Gustavo Sousa
2026-02-10 22:34 ` Matt Roper
2026-04-30 13:33 ` Gustavo Sousa
2026-01-14 22:49 ` [PATCH 6/6] drm/xe/rtp: Implement a structured parser for rule matching Gustavo Sousa
2026-01-14 22:56 ` ✗ CI.checkpatch: warning for drm/xe/rtp: Miscellaneous improvements to " Patchwork
2026-01-14 22:57 ` ✓ CI.KUnit: success " Patchwork
2026-01-14 23:30 ` ✓ Xe.CI.BAT: " Patchwork
2026-01-15 4:53 ` ✗ Xe.CI.Full: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260114-rtp-rule-parser-v1-1-fa9029586bff@intel.com \
--to=gustavo.sousa@intel.com \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox