[i-g-t,06/21] gem_wsim: Use IGT uapi headers

Message ID	20190508121058.27038-7-tvrtko.ursulin@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <intel-gfx-bounces@lists.freedesktop.org> From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> To: igt-dev@lists.freedesktop.org Date: Wed, 8 May 2019 13:10:43 +0100 Message-Id: <20190508121058.27038-7-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20190508121058.27038-1-tvrtko.ursulin@linux.intel.com> References: <20190508121058.27038-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 06/21] gem_wsim: Use IGT uapi headers Precedence: list Cc: Intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	Media scalability tooling \| expand [i-g-t,00/21] Media scalability tooling [i-g-t,01/21] scripts/trace.pl: Fix after intel_engine_notify removal [i-g-t,02/21] headers: bump [i-g-t,03/21] trace.pl: Virtual engine support [i-g-t,04/21] trace.pl: Virtual engine preemption support [i-g-t,05/21] wsim/media-bench: i915 balancing [i-g-t,06/21] gem_wsim: Use IGT uapi headers [i-g-t,07/21] gem_wsim: Factor out common error handling [i-g-t,08/21] gem_wsim: More wsim_err [i-g-t,09/21] gem_wsim: Submit fence support [i-g-t,10/21] gem_wsim: Extract str to engine lookup [i-g-t,11/21] gem_wsim: Engine map support [i-g-t,12/21] gem_wsim: Save some lines by changing to implicit NULL checking [i-g-t,13/21] gem_wsim: Compact int command parsing with a macro [i-g-t,14/21] gem_wsim: Engine map load balance command [i-g-t,15/21] gem_wsim: Engine bond command [i-g-t,16/21] gem_wsim: Some more example workloads [i-g-t,17/21] gem_wsim: Infinite batch support [i-g-t,18/21] gem_wsim: Command line switch for specifying low slice count workloads [i-g-t,19/21] gem_wsim: Per context SSEU control [i-g-t,20/21] gem_wsim: Allow RCS virtual engine with SSEU control [i-g-t,21/21] tests/i915_query: Engine discovery tests

Message ID

20190508121058.27038-7-tvrtko.ursulin@linux.intel.com (mailing list archive)

State

New, archived

Headers

From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Date: Wed,  8 May 2019 13:10:43 +0100
Message-Id: <20190508121058.27038-7-tvrtko.ursulin@linux.intel.com>
In-Reply-To: <20190508121058.27038-1-tvrtko.ursulin@linux.intel.com>
References: <20190508121058.27038-1-tvrtko.ursulin@linux.intel.com>
MIME-Version: 1.0
Subject: [Intel-gfx] [PATCH i-g-t 06/21] gem_wsim: Use IGT uapi headers
Precedence: list
Cc: Intel-gfx@lists.freedesktop.org
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>

Series

Media scalability tooling | expand

Commit Message

Tvrtko Ursulin May 8, 2019, 12:10 p.m. UTC

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

We are moving towards bumping the uAPI headers more often instead of using
too much local struct/ioctl/param definitions since the latter are more
challenging for rebase and maintenance.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 benchmarks/gem_wsim.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Comments

Chris Wilson May 10, 2019, 1:15 p.m. UTC | #1

Quoting Tvrtko Ursulin (2019-05-08 13:10:43)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> We are moving towards bumping the uAPI headers more often instead of using
> too much local struct/ioctl/param definitions since the latter are more
> challenging for rebase and maintenance.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index 1084e95fa8df..609e64f3d9c8 100644
--- a/benchmarks/gem_wsim.c
+++ b/benchmarks/gem_wsim.c
@@ -41,7 +41,6 @@ 
 #include <limits.h>
 #include <pthread.h>
 
-
 #include "intel_chipset.h"
 #include "intel_reg.h"
 #include "drm.h"
@@ -57,9 +56,6 @@ 
 
 #include "ewma.h"
 
-#define LOCAL_I915_EXEC_FENCE_IN              (1<<16)
-#define LOCAL_I915_EXEC_FENCE_OUT             (1<<17)
-
 enum intel_engine_id {
 	RCS,
 	BCS,
@@ -864,7 +860,7 @@  eb_update_flags(struct w_step *w, enum intel_engine_id engine,
 
 	igt_assert(w->emit_fence <= 0);
 	if (w->emit_fence)
-		w->eb.flags |= LOCAL_I915_EXEC_FENCE_OUT;
+		w->eb.flags |= I915_EXEC_FENCE_OUT;
 }
 
 static struct drm_i915_gem_exec_object2 *
@@ -1993,16 +1989,16 @@  do_eb(struct workload *wrk, struct w_step *w, enum intel_engine_id engine,
 		igt_assert(tgt >= 0 && tgt < w->idx);
 		igt_assert(wrk->steps[tgt].emit_fence > 0);
 
-		w->eb.flags |= LOCAL_I915_EXEC_FENCE_IN;
+		w->eb.flags |= I915_EXEC_FENCE_IN;
 		w->eb.rsvd2 = wrk->steps[tgt].emit_fence;
 	}
 
-	if (w->eb.flags & LOCAL_I915_EXEC_FENCE_OUT)
+	if (w->eb.flags & I915_EXEC_FENCE_OUT)
 		gem_execbuf_wr(fd, &w->eb);
 	else
 		gem_execbuf(fd, &w->eb);
 
-	if (w->eb.flags & LOCAL_I915_EXEC_FENCE_OUT) {
+	if (w->eb.flags & I915_EXEC_FENCE_OUT) {
 		w->emit_fence = w->eb.rsvd2 >> 32;
 		igt_assert(w->emit_fence > 0);
 	}

[i-g-t,06/21] gem_wsim: Use IGT uapi headers

Commit Message

Comments

Patch