From: Matt Roper <matthew.d.roper@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: matthew.d.roper@intel.com,
Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Subject: [PATCH i-g-t] tests/xe_compute: Don't require ccs_mode on every GT
Date: Fri, 22 Mar 2024 15:19:08 -0700 [thread overview]
Message-ID: <20240322221908.857024-1-matthew.d.roper@intel.com> (raw)
On platforms with standalone media, we expect some GTs to have CCS
engines (meaning ccs_mode can be tested if there's more than one CCS),
but the media GT will never have any CCS engines and will never expose
ccs_mode. Move the igt_require() out of the loop so that we don't
declare the whole test a skip upon encountering the media GT when the
test already executed successfully on the primary GT.
Cc: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
tests/intel/xe_compute.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/intel/xe_compute.c b/tests/intel/xe_compute.c
index 42f42ca0c..fffcfa08e 100644
--- a/tests/intel/xe_compute.c
+++ b/tests/intel/xe_compute.c
@@ -51,13 +51,15 @@ test_ccs_mode(int num_gt)
{
struct drm_xe_engine_class_instance *hwe;
u32 gt, m, ccs_mode, vm, q, num_slices;
- int fd, gt_fd;
+ int fd, gt_fd, num_gt_with_ccs_mode = 0;
for (gt = 0; gt < num_gt; gt++) {
- igt_require(get_num_cslices(gt, &num_slices));
+ if (get_num_cslices(gt, &num_slices) == 0)
+ continue;
gt_fd = gt_sysfs_open(gt);
igt_assert(igt_sysfs_printf(gt_fd, "ccs_mode", "%u", 0) < 0);
+ num_gt_with_ccs_mode++;
for (m = 1; m <= num_slices; m++) {
/* compute slices are to be equally distributed among enabled engines */
if (num_slices % m) {
@@ -105,6 +107,8 @@ test_ccs_mode(int num_gt)
close(gt_fd);
}
+
+ igt_require(num_gt_with_ccs_mode > 0);
}
/**
--
2.43.0
next reply other threads:[~2024-03-22 22:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-22 22:19 Matt Roper [this message]
2024-03-23 0:59 ` ✓ CI.xeBAT: success for tests/xe_compute: Don't require ccs_mode on every GT Patchwork
2024-03-23 1:10 ` ✓ Fi.CI.BAT: " Patchwork
2024-03-23 22:57 ` ✗ Fi.CI.IGT: failure " Patchwork
2024-03-27 14:14 ` [PATCH i-g-t] " Gustavo Sousa
2024-03-27 23:47 ` Matt Roper
2024-03-28 2:02 ` Gustavo Sousa
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=20240322221908.857024-1-matthew.d.roper@intel.com \
--to=matthew.d.roper@intel.com \
--cc=igt-dev@lists.freedesktop.org \
--cc=niranjana.vishwanathapura@intel.com \
/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