[igt-dev] [PATCH i-g-t v2] tests/i915/gem_ctx_exec: Skip test for RCS+CCS

* [igt-dev] [PATCH i-g-t v2] tests/i915/gem_ctx_exec: Skip test for RCS+CCS
@ 2022-01-05 10:10 priyanka.dandamudi
  2022-01-05 11:20 ` [igt-dev] ✓ Fi.CI.BAT: success for tests/i915/gem_ctx_exec: Skip test for RCS+CCS (rev2) Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: priyanka.dandamudi @ 2022-01-05 10:10 UTC (permalink / raw)
  To: igt-dev, arjun.melkaveri, priyanka.dandamudi, ashutosh.dixit,
	John.C.Harrison, saurabhg.gupta

From: Priyanka Dandamudi <priyanka.dandamudi@intel.com>

The test tries to submit non-preemptible spinners to all engines,
causes a hang and expects the non-preemptible spinners to survive
but fails to do for RCS+CCS.
So, updated the code to skip nohangcheck subtest for a platform with RCS+CCS.

Signed-off-by: Priyanka Dandamudi <priyanka.dandamudi@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Melkaveri, Arjun <arjun.melkaveri@intel.com>
---
 tests/i915/gem_ctx_exec.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/i915/gem_ctx_exec.c b/tests/i915/gem_ctx_exec.c
index a1270a88..7b2aa390 100644
--- a/tests/i915/gem_ctx_exec.c
+++ b/tests/i915/gem_ctx_exec.c
@@ -276,6 +276,8 @@ static void nohangcheck_hostile(int i915)
 	int err = 0;
 	int dir;
 	uint64_t ahnd;
+	bool rcs0 = false;
+	bool ccs0 = false;
 
 	/*
 	 * Even if the user disables hangcheck during their context,
@@ -292,6 +294,20 @@ static void nohangcheck_hostile(int i915)
 	ahnd = get_reloc_ahnd(i915, ctx->id);
 
 	igt_require(__enable_hangcheck(dir, false));
+	/* Skips for RCS+CCS combination when nopreemption batch submitted*/
+	for_each_ctx_engine (i915, ctx, e) {
+		if (rcs0 && ccs0)
+			break;
+		else if (!rcs0) {
+			if (e->class == I915_ENGINE_CLASS_RENDER)
+				rcs0 = true;
+		}
+		else if (!ccs0) {
+			if (e->class == I915_ENGINE_CLASS_COMPUTE)
+				ccs0 = true;
+		}
+	}
+	igt_require(!(rcs0 && ccs0));
 
 	for_each_ctx_engine(i915, ctx, e) {
 		igt_spin_t *spin;
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread