Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>,
	Jonathan Cavitt <jonathan.cavitt@intel.com>,
	Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH v3 5/7] drm/xe/tests: Convert xe_migrate live tests
Date: Sat, 20 Jul 2024 16:25:26 +0200	[thread overview]
Message-ID: <20240720142528.530-6-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20240720142528.530-1-michal.wajdeczko@intel.com>

Convert xe_migrate live tests to parameterized style.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
v2: rebase/simplify kunit_skip() messages
---
 drivers/gpu/drm/xe/tests/xe_migrate.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/xe/tests/xe_migrate.c b/drivers/gpu/drm/xe/tests/xe_migrate.c
index 48bf7e831014..4344a1724029 100644
--- a/drivers/gpu/drm/xe/tests/xe_migrate.c
+++ b/drivers/gpu/drm/xe/tests/xe_migrate.c
@@ -6,6 +6,7 @@
 #include <kunit/test.h>
 #include <kunit/visibility.h>
 
+#include "tests/xe_kunit_helpers.h"
 #include "tests/xe_pci_test.h"
 
 #include "xe_pci.h"
@@ -355,7 +356,9 @@ static int migrate_test_run_device(struct xe_device *xe)
 
 static void xe_migrate_sanity_kunit(struct kunit *test)
 {
-	xe_call_for_each_device(migrate_test_run_device);
+	struct xe_device *xe = test->priv;
+
+	migrate_test_run_device(xe);
 }
 
 static struct dma_fence *blt_copy(struct xe_tile *tile,
@@ -731,13 +734,12 @@ static int validate_ccs_test_run_device(struct xe_device *xe)
 	int id;
 
 	if (!xe_device_has_flat_ccs(xe)) {
-		kunit_info(test, "Skipping non-flat-ccs device.\n");
+		kunit_skip(test, "non-flat-ccs device\n");
 		return 0;
 	}
 
 	if (!(GRAPHICS_VER(xe) >= 20 && IS_DGFX(xe))) {
-		kunit_info(test, "Skipping non-xe2 discrete device %s.\n",
-			   dev_name(xe->drm.dev));
+		kunit_skip(test, "non-xe2 discrete device\n");
 		return 0;
 	}
 
@@ -753,12 +755,14 @@ static int validate_ccs_test_run_device(struct xe_device *xe)
 
 static void xe_validate_ccs_kunit(struct kunit *test)
 {
-	xe_call_for_each_device(validate_ccs_test_run_device);
+	struct xe_device *xe = test->priv;
+
+	validate_ccs_test_run_device(xe);
 }
 
 static struct kunit_case xe_migrate_tests[] = {
-	KUNIT_CASE(xe_migrate_sanity_kunit),
-	KUNIT_CASE(xe_validate_ccs_kunit),
+	KUNIT_CASE_PARAM(xe_migrate_sanity_kunit, xe_pci_live_device_gen_param),
+	KUNIT_CASE_PARAM(xe_validate_ccs_kunit, xe_pci_live_device_gen_param),
 	{}
 };
 
@@ -766,5 +770,6 @@ VISIBLE_IF_KUNIT
 struct kunit_suite xe_migrate_test_suite = {
 	.name = "xe_migrate",
 	.test_cases = xe_migrate_tests,
+	.init = xe_kunit_helper_xe_device_live_test_init,
 };
 EXPORT_SYMBOL_IF_KUNIT(xe_migrate_test_suite);
-- 
2.43.0


  parent reply	other threads:[~2024-07-20 14:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-20 14:25 [PATCH v3 0/7] Convert live tests to parameterized style Michal Wajdeczko
2024-07-20 14:25 ` [PATCH v3 1/7] drm/xe: Introduce const cast helper Michal Wajdeczko
2024-07-21  2:46   ` Lucas De Marchi
2024-07-20 14:25 ` [PATCH v3 2/7] drm/xe/tests: Add helpers for use in live tests Michal Wajdeczko
2024-07-20 14:25 ` [PATCH v3 3/7] drm/xe/tests: Convert xe_bo " Michal Wajdeczko
2024-07-20 14:25 ` [PATCH v3 4/7] drm/xe/tests: Convert xe_dma_buf " Michal Wajdeczko
2024-07-20 14:25 ` Michal Wajdeczko [this message]
2024-07-20 14:25 ` [PATCH v3 6/7] drm/xe/tests: Convert xe_mocs " Michal Wajdeczko
2024-07-20 14:25 ` [PATCH v3 7/7] drm/xe/tests: Skip xe_mocs live tests on VF device Michal Wajdeczko
2024-07-20 14:31 ` ✓ CI.Patch_applied: success for Convert live tests to parameterized style (rev3) Patchwork
2024-07-20 14:31 ` ✓ CI.checkpatch: " Patchwork
2024-07-20 14:32 ` ✓ CI.KUnit: " Patchwork
2024-07-20 14:44 ` ✓ CI.Build: " Patchwork
2024-07-20 14:46 ` ✓ CI.Hooks: " Patchwork
2024-07-20 14:48 ` ✓ CI.checksparse: " Patchwork
2024-07-20 15:09 ` ✗ CI.BAT: failure " Patchwork
2024-07-22  9:58   ` Michal Wajdeczko
2024-07-20 16:13 ` ✗ CI.FULL: " Patchwork
2024-07-22 10:05   ` Michal Wajdeczko
2024-07-23  4:27 ` ✓ CI.BAT: success " 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=20240720142528.530-6-michal.wajdeczko@intel.com \
    --to=michal.wajdeczko@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=jonathan.cavitt@intel.com \
    --cc=lucas.demarchi@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