gem_wsim: Fix calibration for default and virtual engine

PATCH In review Tvrtko Ursulin 3 participants 4 messages Mar 4, 2020 – Mar 5, 2020

lore

Share & tools

lore

Tvrtko Ursulin

author

2020-03-04 13:24 UTC #0 lore raw

PATCH 1/1 gem_wsim: Fix calibration for default and virtual engine

From: Tvrtko Ursulin <[email protected]>

When providing engine calibrations on the command line, we need to apply the one given for RCS to DEFAULT as well.

Also when load balancing is used we need to get calibration from one of the real engines from the map which should provide a better match.

Signed-off-by Tvrtko Ursulin <[email protected]>

---
 benchmarks/gem_wsim.c | 50 +++++++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 14 deletions(-)

benchmarks/gem_wsim.c +36 ~~-14~~

index aaf3a16198df..a1bbcef031bb 100644
@@ -111,8 +111,12 @@ struct bond {
 	enum intel_engine_id master;
 };
 
+struct workload;
+
 struct w_step
 {
+	struct workload *wrk;
+
 	/* Workload step metadata */
 	enum w_type type;
 	unsigned int context;

@@ -1140,17 +1144,37 @@ static unsigned int get_duration(struct workload *wrk, struct w_step *w)
 		       (dur->max + 1 - dur->min);
 }
 
-static unsigned long get_bb_sz(unsigned int duration, enum intel_engine_id engine)
+static struct ctx *
+__get_ctx(struct workload *wrk, const struct w_step *w)
 {
-	return ALIGN(duration * engine_calib_map[engine] * sizeof(uint32_t) /
-		nop_calibration_us, sizeof(uint32_t));
+	return &wrk->ctx_list[w->context * 2];
+}
+
+static unsigned long
+get_bb_sz(const struct w_step *w, unsigned int duration)
+{
+	enum intel_engine_id engine = w->engine;
+	struct ctx *ctx = __get_ctx(w->wrk, w);
+	unsigned long d;
+
+	if (ctx->engine_map && engine == DEFAULT)
+		/* Assume first engine calibration. */
+		engine = ctx->engine_map[0];
+
+	igt_assert(engine_calib_map[engine]);
+	d = ALIGN(duration * engine_calib_map[engine] * sizeof(uint32_t) /
+		  nop_calibration_us,
+		  sizeof(uint32_t));
+	igt_assert(d);
+
+	return d;
 }
 
 static void
 init_bb(struct w_step *w, unsigned int flags)
 {
 	const unsigned int arb_period =
-			get_bb_sz(w->preempt_us, w->engine) / sizeof(uint32_t);
+			get_bb_sz(w, w->preempt_us) / sizeof(uint32_t);
 	const unsigned int mmap_len = ALIGN(w->bb_sz, 4096);
 	unsigned int i;
 	uint32_t *ptr;

@@ -1295,12 +1319,6 @@ find_engine_in_map(struct ctx *ctx, enum intel_engine_id engine)
 	return 0;
 }
 
-static struct ctx *
-__get_ctx(struct workload *wrk, struct w_step *w)
-{
-	return &wrk->ctx_list[w->context * 2];
-}
-
 static void
 eb_update_flags(struct workload *wrk, struct w_step *w,
 		enum intel_engine_id engine, unsigned int flags)

@@ -1377,10 +1395,10 @@ alloc_step_batch(struct workload *wrk, struct w_step *w, unsigned int flags)
 
 	if (w->unbound_duration)
 		/* nops + MI_ARB_CHK + MI_BATCH_BUFFER_START */
-		w->bb_sz = max(PAGE_SIZE, get_bb_sz(w->preempt_us, w->engine)) +
+		w->bb_sz = max(PAGE_SIZE, get_bb_sz(w, w->preempt_us)) +
 			   (1 + 3) * sizeof(uint32_t);
 	else
-		w->bb_sz = get_bb_sz(w->duration.max, w->engine);
+		w->bb_sz = get_bb_sz(w, w->duration.max);
 
 	w->bb_handle = w->obj[j].handle = gem_create(fd, w->bb_sz + (w->unbound_duration ? 4096 : 0));
 	init_bb(w, flags);

@@ -1568,6 +1586,8 @@ prepare_workload(unsigned int id, struct workload *wrk, unsigned int flags)
 		int ctx = w->context * 2 + 1; /* Odd slots are special. */
 		int delta;
 
+		w->wrk = wrk;
+
 		if (ctx <= max_ctx)
 			continue;

@@ -2681,7 +2701,7 @@ do_eb(struct workload *wrk, struct w_step *w, enum intel_engine_id engine,
 	w->eb.batch_start_offset =
 		w->unbound_duration ?
 		0 :
-		ALIGN(w->bb_sz - get_bb_sz(get_duration(wrk, w), w->engine),
+		ALIGN(w->bb_sz - get_bb_sz(w, get_duration(wrk, w)),
 		      2 * sizeof(uint32_t));
 
 	for (i = 0; i < w->fence_deps.nr; i++) {

@@ -3331,6 +3351,8 @@ int main(int argc, char **argv)
 						goto err;
 					} else {
 						engine_calib_map[eng] = calib_val;
+						if (eng == RCS)
+							engine_calib_map[DEFAULT] = calib_val;
 						has_nop_calibration = true;
 					}
 				} else {

@@ -3444,7 +3466,7 @@ int main(int argc, char **argv)
 		bool missing = false;
 
 		for (i = 0; i < NUM_ENGINES; i++) {
-			if (i == DEFAULT || i == VCS)
+			if (i == VCS)
 				continue;
 
 			if (!engine_calib_map[i]) {

Signature · 6 lines

2.20.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2020-03-04 16:15 UTC #1 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for gem_wsim: Fix calibration for default and virtual engine

== Series Details ==

Series: gem_wsim: Fix calibration for default and virtual engine
URL : https://patchwork.freedesktop.org/series/74267/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8065 -> IGTPW_4257
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/index.html

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in IGTPW_4257:

### IGT changes ###

#### Suppressed ####

The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.

* igt@i915_selftest@live@active:
- {fi-tgl-dsi}: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/fi-tgl-dsi/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/fi-tgl-dsi/igt@i915_selftest@[email protected]

Known issues
------------

Here are the changes found in IGTPW_4257 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@prime_self_import@basic-llseek-size:
- fi-tgl-y: [PASS][3] -> [DMESG-WARN][4] ([CI#94] / [i915#402]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/fi-tgl-y/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/fi-tgl-y/igt@[email protected]

#### Possible fixes ####

* igt@kms_addfb_basic@addfb25-modifier-no-flag:
- fi-tgl-y: [DMESG-WARN][5] ([CI#94] / [i915#402]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/fi-tgl-y/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/fi-tgl-y/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][7] ([fdo#111096] / [i915#323]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/fi-kbl-7500u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/fi-kbl-7500u/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[CI#94]: https://gitlab.freedesktop.org/gfx-ci/i915-infra/issues/94
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402

Participating hosts (45 -> 46)
------------------------------

Additional (8): fi-byt-j1900 fi-glk-dsi fi-gdg-551 fi-ivb-3770 fi-elk-e7500 fi-skl-lmem fi-kbl-7560u fi-bsw-nick
Missing (7): fi-icl-1065g7 fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-ctg-p8600 fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_5491 -> IGTPW_4257

CI-20190529: 20190529
CI_DRM_8065: e50ed1b1ef982f7648ca558f1cfd16ad3190e094 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4257: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/index.html
IGT_5491: d52794b426ae16630cc1e0354ae435ec98f6174b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/index.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Chris Wilson

Reviewed-by

2020-03-04 17:15 UTC #2 lore raw

Re: [igt-dev] ✓ Fi.CI.BAT: success for gem_wsim: Fix calibration for default and virtual engine

Quoting Patchwork (2020-03-04 16:15:30)

Quoted 11 lines

== Series Details ==
Series: gem_wsim: Fix calibration for default and virtual engine
URL : https://patchwork.freedesktop.org/series/74267/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_8065 -> IGTPW_4257
====================================================

Quoted 6 lines

Summary
-------
**SUCCESS**
No regressions found.

Your script went from fail to working, and the changelog made sense (even if I did object to saying rcs was default ;),

Reviewed-by Chris Wilson <[email protected]>

-Chris
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Patchwork

2020-03-05 12:45 UTC #3 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for gem_wsim: Fix calibration for default and virtual engine

In reply to Tvrtko Ursulin

== Series Details ==

Series: gem_wsim: Fix calibration for default and virtual engine
URL : https://patchwork.freedesktop.org/series/74267/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8065_full -> IGTPW_4257_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/index.html

Known issues
------------

Here are the changes found in IGTPW_4257_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#112080]) +16 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb7/igt@[email protected]

* igt@gem_exec_schedule@implicit-both-bsd1:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276] / [i915#677])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb8/igt@[email protected]

* igt@gem_exec_schedule@implicit-write-read-bsd:
- shard-iclb: [PASS][5] -> [SKIP][6] ([i915#677])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb7/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb2/igt@[email protected]

* igt@gem_exec_schedule@preempt-hang-bsd1:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#109276]) +11 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb8/igt@[email protected]

* igt@gem_exec_schedule@preempt-other-bsd:
- shard-iclb: [PASS][9] -> [SKIP][10] ([fdo#112146]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb6/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb4/igt@[email protected]

* igt@gem_workarounds@suspend-resume:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#180]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-apl8/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-apl4/igt@[email protected]
- shard-kbl: [PASS][13] -> [INCOMPLETE][14] ([fdo#103665])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-kbl3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-kbl4/igt@[email protected]

* igt@i915_pm_rps@waitboost:
- shard-iclb: [PASS][23] -> [FAIL][24] ([i915#413])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb6/igt@[email protected]

* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [PASS][25] -> [FAIL][26] ([i915#96])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-hsw6/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-hsw5/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
- shard-hsw: [PASS][27] -> [INCOMPLETE][28] ([i915#61])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-hsw6/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-hsw8/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [PASS][29] -> [DMESG-WARN][30] ([i915#180]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-kbl3/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-kbl2/igt@[email protected]

* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][31] -> [SKIP][32] ([fdo#109441]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb6/igt@kms_psr@psr2_primary_page_flip.html

* igt@kms_setmode@basic:
- shard-hsw: [PASS][33] -> [FAIL][34] ([i915#31])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-hsw8/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-hsw7/igt@[email protected]

#### Possible fixes ####

* igt@gem_ctx_isolation@rcs0-s3:
- shard-kbl: [DMESG-WARN][35] ([i915#180]) -> [PASS][36] +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-kbl1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-kbl2/igt@[email protected]

* igt@gem_exec_schedule@pi-distinct-iova-bsd:
- shard-iclb: [SKIP][37] ([i915#677]) -> [PASS][38] +1 similar issue
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb8/igt@[email protected]

* igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [SKIP][39] ([fdo#109276]) -> [PASS][40] +12 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb8/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb2/igt@[email protected]

* igt@gem_exec_schedule@preemptive-hang-bsd:
- shard-iclb: [SKIP][41] ([fdo#112146]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb1/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb6/igt@[email protected]

* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][43] ([i915#644]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-glk2/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-glk1/igt@[email protected]
- shard-kbl: [FAIL][45] ([i915#644]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-kbl2/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-kbl6/igt@[email protected]

* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][47] ([i915#454]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb6/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb7/igt@[email protected]

* igt@kms_flip@flip-vs-suspend:
- shard-apl: [DMESG-WARN][49] ([i915#180]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-apl1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-apl7/igt@[email protected]

* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-glk: [FAIL][51] ([i915#899]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-glk4/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-glk7/igt@[email protected]

* igt@kms_psr@psr2_basic:
- shard-iclb: [SKIP][53] ([fdo#109441]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb4/igt@kms_psr@psr2_basic.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb2/igt@kms_psr@psr2_basic.html

* igt@perf_pmu@busy-check-all-vcs1:
- shard-iclb: [SKIP][55] ([fdo#112080]) -> [PASS][56] +6 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb5/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb4/igt@[email protected]

#### Warnings ####

* igt@gem_exec_schedule@pi-userfault-bsd:
- shard-iclb: [SKIP][57] ([i915#677]) -> [INCOMPLETE][58] ([i915#1381])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb4/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb5/igt@[email protected]

* igt@gem_exec_schedule@pi-userfault-bsd1:
- shard-iclb: [SKIP][59] ([fdo#109276]) -> [INCOMPLETE][60] ([i915#1381])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-iclb8/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-iclb2/igt@[email protected]

* igt@gem_userptr_blits@map-fixed-invalidate-overlap-busy-gup:
- shard-hsw: [DMESG-WARN][61] ([fdo#110789] / [fdo#111870]) -> [DMESG-WARN][62] ([fdo#111870])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-hsw5/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-hsw5/igt@[email protected]
- shard-snb: [DMESG-WARN][63] ([fdo#110789] / [fdo#111870] / [i915#478]) -> [DMESG-WARN][64] ([fdo#111870] / [i915#478])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8065/shard-snb6/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4257/shard-snb5/igt@[email protected]

Participating hosts (10 -> 8)
------------------------------

Missing (2): pig-skl-6260u pig-glk-j5005

Build changes
-------------

* CI: CI-20190529 -> None
* IGT: IGT_5491 -> IGTPW_4257
* Piglit: piglit_4509 -> None

== Logs ==