All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t 07/27] gem_wsim: Use IGT uapi headers
Date: Mon, 20 May 2019 15:47:19 +0100	[thread overview]
Message-ID: <20190520144739.13111-8-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20190520144739.13111-1-tvrtko.ursulin@linux.intel.com>

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>
---
 benchmarks/gem_wsim.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index afb53f4114d2..b91dbdec2cce 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,
@@ -863,7 +859,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 *
@@ -2016,16 +2012,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);
 	}
-- 
2.20.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Intel-gfx@lists.freedesktop.org,
	Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Subject: [igt-dev] [PATCH i-g-t 07/27] gem_wsim: Use IGT uapi headers
Date: Mon, 20 May 2019 15:47:19 +0100	[thread overview]
Message-ID: <20190520144739.13111-8-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20190520144739.13111-1-tvrtko.ursulin@linux.intel.com>

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>
---
 benchmarks/gem_wsim.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index afb53f4114d2..b91dbdec2cce 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,
@@ -863,7 +859,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 *
@@ -2016,16 +2012,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);
 	}
-- 
2.20.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

  parent reply	other threads:[~2019-05-20 14:47 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-20 14:47 [PATCH i-g-t 00/27] Media scalability tooling Tvrtko Ursulin
2019-05-20 14:47 ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 01/27] scripts/trace.pl: Fix after intel_engine_notify removal Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 02/27] trace.pl: Ignore signaling on non i915 fences Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-21  7:57   ` Chris Wilson
2019-05-21  7:57     ` Chris Wilson
2019-05-21 13:22     ` Tvrtko Ursulin
2019-05-21 13:22       ` Tvrtko Ursulin
2019-05-21 15:29       ` Chris Wilson
2019-05-21 15:29         ` Chris Wilson
2019-05-20 14:47 ` [PATCH i-g-t 03/27] headers: bump Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 04/27] trace.pl: Virtual engine support Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 05/27] trace.pl: Virtual engine preemption support Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 06/27] wsim/media-bench: i915 balancing Tvrtko Ursulin
2019-05-20 14:47   ` [Intel-gfx] " Tvrtko Ursulin
2019-05-20 14:47 ` Tvrtko Ursulin [this message]
2019-05-20 14:47   ` [igt-dev] [PATCH i-g-t 07/27] gem_wsim: Use IGT uapi headers Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 08/27] gem_wsim: Factor out common error handling Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 09/27] gem_wsim: More wsim_err Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 10/27] gem_wsim: Submit fence support Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 11/27] gem_wsim: Extract str to engine lookup Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 12/27] gem_wsim: Engine map support Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-21  8:14   ` Chris Wilson
2019-05-21  8:14     ` Chris Wilson
2019-05-21  8:29     ` Tvrtko Ursulin
2019-05-21  8:29       ` Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 13/27] gem_wsim: Save some lines by changing to implicit NULL checking Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 14/27] gem_wsim: Compact int command parsing with a macro Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 15/27] gem_wsim: Engine map load balance command Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 16/27] gem_wsim: Engine bond command Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 17/27] gem_wsim: Some more example workloads Tvrtko Ursulin
2019-05-20 14:47   ` [Intel-gfx] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 18/27] gem_wsim: Infinite batch support Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 19/27] gem_wsim: Command line switch for specifying low slice count workloads Tvrtko Ursulin
2019-05-20 14:47   ` [Intel-gfx] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 20/27] gem_wsim: Per context SSEU control Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 21/27] gem_wsim: Allow RCS virtual engine with " Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 22/27] tests/i915_query: Engine discovery tests Tvrtko Ursulin
2019-05-20 14:47   ` [Intel-gfx] " Tvrtko Ursulin
2019-05-22  8:23   ` [igt-dev] " Andi Shyti
2019-05-22  8:23     ` Andi Shyti
2019-05-20 14:47 ` [PATCH i-g-t 23/27] gem_wsim: Consolidate engine assignments into helpers Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 24/27] gem_wsim: Discover engines Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-21 13:54   ` Andi Shyti
2019-05-21 13:54     ` Andi Shyti
2019-05-20 14:47 ` [PATCH i-g-t 25/27] gem_wsim: Support Icelake parts Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 26/27] gem_wsim: Fix prng usage Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-20 14:47 ` [PATCH i-g-t 27/27] gem_wsim: Allow random seed control Tvrtko Ursulin
2019-05-20 14:47   ` [igt-dev] " Tvrtko Ursulin
2019-05-21  9:22 ` [igt-dev] ✓ Fi.CI.BAT: success for Media scalability tooling (rev6) Patchwork
2019-05-21 13:10 ` [igt-dev] ✓ Fi.CI.IGT: " 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=20190520144739.13111-8-tvrtko.ursulin@linux.intel.com \
    --to=tvrtko.ursulin@linux.intel.com \
    --cc=Intel-gfx@lists.freedesktop.org \
    --cc=igt-dev@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.