* [igt-dev] [PATCH i-g-t 0/2] Add render copy tests on TGL
@ 2019-09-16 16:40 Zbigniew Kempczyński
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* " Zbigniew Kempczyński
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Zbigniew Kempczyński @ 2019-09-16 16:40 UTC (permalink / raw)
To: igt-dev; +Cc: Lucas De Marchi
Patch adds basic render copy tests on TGL.
Cc: Katarzyna Dec <katarzyna.dec@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Kalamarz, Lukasz (1):
lib/rendercopy/tgl: Add support for gem_render_* tests on TGL
Zbigniew Kempczyński (1):
HAX: run render copy tests in BAT
lib/i915/shaders/ps/gen12p1_render_copy.asm | 16 +++++++++++
lib/intel_batchbuffer.c | 2 ++
lib/rendercopy.h | 5 ++++
lib/rendercopy_gen9.c | 30 +++++++++++++++++++++
tests/intel-ci/fast-feedback.testlist | 8 ++++++
5 files changed, 61 insertions(+)
create mode 100644 lib/i915/shaders/ps/gen12p1_render_copy.asm
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* tests on TGL
2019-09-16 16:40 [igt-dev] [PATCH i-g-t 0/2] Add render copy tests on TGL Zbigniew Kempczyński
@ 2019-09-16 16:40 ` Zbigniew Kempczyński
2019-09-16 19:43 ` Caz Yokoyama
2019-09-17 1:56 ` Ashutosh Dixit
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 2/2] HAX: run render copy tests in BAT Zbigniew Kempczyński
` (2 subsequent siblings)
3 siblings, 2 replies; 8+ messages in thread
From: Zbigniew Kempczyński @ 2019-09-16 16:40 UTC (permalink / raw)
To: igt-dev
From: "Kalamarz, Lukasz" <lukasz.kalamarz@intel.com>
Previous generations didn't use SWSB dependency tracking.
For that reason shader was adopted to handle that on TGL.
FIXME: Some tests still have to be fixed, currently working:
gem_render_copy @linear @x-tiled @y-tiled @yf-tiled
gem_render_copy_redux
gem_render_linear_blits @basic
gem_render_tiled_blits @basic
Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Katarzyna Dec <katarzyna.dec@intel.com>
Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
---
lib/i915/shaders/ps/gen12p1_render_copy.asm | 16 +++++++++++
lib/intel_batchbuffer.c | 2 ++
lib/rendercopy.h | 5 ++++
lib/rendercopy_gen9.c | 30 +++++++++++++++++++++
4 files changed, 53 insertions(+)
create mode 100644 lib/i915/shaders/ps/gen12p1_render_copy.asm
diff --git a/lib/i915/shaders/ps/gen12p1_render_copy.asm b/lib/i915/shaders/ps/gen12p1_render_copy.asm
new file mode 100644
index 00000000..d293ab1b
--- /dev/null
+++ b/lib/i915/shaders/ps/gen12p1_render_copy.asm
@@ -0,0 +1,16 @@
+L0:
+(W) mad (8|M0) acc0.0<1>:nf r6.3<0;0>:f r2.0<8;1>:f r6.0<0>:f
+(W) mad (8|M0) r113.0<1>:f acc0.0<8;1>:nf r3.0<8;1>:f r6.1<0>:f
+(W) mad (8|M0) acc0.0<1>:nf r6.3<0;0>:f r4.0<8;1>:f r6.0<0>:f
+(W) mad (8|M0) r114.0<1>:f acc0.0<8;1>:nf r5.0<8;1>:f r6.1<0>:f
+(W) mad (8|M0) acc0.0<1>:nf r6.7<0;0>:f r2.0<8;1>:f r6.4<0>:f
+(W) mad (8|M0) r115.0<1>:f acc0.0<8;1>:nf r3.0<8;1>:f r6.5<0>:f
+(W) mad (8|M0) acc0.0<1>:nf r6.7<0;0>:f r4.0<8;1>:f r6.4<0>:f
+(W) mad (8|M0) r116.0<1>:f acc0.0<8;1>:nf r5.0<8;1>:f r6.5<0>:f
+(W) send.smpl (16|M0) r12 r113 null 0x0 0x8840001 {@1, $0} // wr:4+0, rd:8, fc: 0x40001
+ mov (16|M0) r113.0<1>:f r12.0<8;8,1>:f {$0.dst}
+ mov (16|M0) r115.0<1>:f r14.0<8;8,1>:f
+ mov (16|M0) r117.0<1>:f r16.0<8;8,1>:f
+ mov (16|M0) r119.0<1>:f r18.0<8;8,1>:f
+(W) send.rc (16|M0) null r113 null 0x0 0x10031000 {EOT, @1} // wr:8+0, rd:0, Render Target Write msc:16, to #0
+L224:
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index 07de5cbb..163ec4ac 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -844,6 +844,8 @@ igt_render_copyfunc_t igt_get_render_copyfunc(int devid)
copy = gen9_render_copyfunc;
else if (IS_GEN11(devid))
copy = gen11_render_copyfunc;
+ else if (IS_TIGERLAKE(devid))
+ copy = gen12p1_render_copyfunc;
return copy;
}
diff --git a/lib/rendercopy.h b/lib/rendercopy.h
index 35c28dd9..ffe4c4c1 100644
--- a/lib/rendercopy.h
+++ b/lib/rendercopy.h
@@ -23,6 +23,11 @@ static inline void emit_vertex_normalized(struct intel_batchbuffer *batch,
OUT_BATCH(u.ui);
}
+void gen12p1_render_copyfunc(struct intel_batchbuffer *batch,
+ drm_intel_context *context,
+ const struct igt_buf *src, unsigned src_x, unsigned src_y,
+ unsigned width, unsigned height,
+ const struct igt_buf *dst, unsigned dst_x, unsigned dst_y);
void gen11_render_copyfunc(struct intel_batchbuffer *batch,
drm_intel_context *context,
const struct igt_buf *src, unsigned src_x, unsigned src_y,
diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
index 259a3ca2..fffcd003 100644
--- a/lib/rendercopy_gen9.c
+++ b/lib/rendercopy_gen9.c
@@ -101,6 +101,24 @@ static const uint32_t ps_kernel_gen11[][4] = {
#endif
};
+/* see lib/i915/shaders/ps/gen12p1_render_copy.asm */
+static const uint32_t gen12p1_render_copy[][4] = {
+ { 0x8003005b, 0x200002f0, 0x0a0a0664, 0x06040205 },
+ { 0x8003005b, 0x71040fa8, 0x0a0a2001, 0x06240305 },
+ { 0x8003005b, 0x200002f0, 0x0a0a0664, 0x06040405 },
+ { 0x8003005b, 0x72040fa8, 0x0a0a2001, 0x06240505 },
+ { 0x8003005b, 0x200002f0, 0x0a0a06e4, 0x06840205 },
+ { 0x8003005b, 0x73040fa8, 0x0a0a2001, 0x06a40305 },
+ { 0x8003005b, 0x200002f0, 0x0a0a06e4, 0x06840405 },
+ { 0x8003005b, 0x74040fa8, 0x0a0a2001, 0x06a40505 },
+ { 0x80049031, 0x0c440000, 0x20027124, 0x01000000 },
+ { 0x00042061, 0x71050aa0, 0x00460c05, 0x00000000 },
+ { 0x00040061, 0x73050aa0, 0x00460e05, 0x00000000 },
+ { 0x00040061, 0x75050aa0, 0x00461005, 0x00000000 },
+ { 0x00040061, 0x77050aa0, 0x00461205, 0x00000000 },
+ { 0x80040131, 0x00000004, 0x50007144, 0x00c40000 },
+};
+
/* AUB annotation support */
#define MAX_ANNOTATIONS 33
struct annotations_context {
@@ -1089,3 +1107,15 @@ void gen11_render_copyfunc(struct intel_batchbuffer *batch,
width, height, dst, dst_x, dst_y, ps_kernel_gen11,
sizeof(ps_kernel_gen11));
}
+
+void gen12p1_render_copyfunc(struct intel_batchbuffer *batch,
+ drm_intel_context *context,
+ const struct igt_buf *src, unsigned src_x, unsigned src_y,
+ unsigned width, unsigned height,
+ const struct igt_buf *dst, unsigned dst_x, unsigned dst_y)
+
+{
+ _gen9_render_copyfunc(batch, context, src, src_x, src_y,
+ width, height, dst, dst_x, dst_y, gen12p1_render_copy,
+ sizeof(gen12p1_render_copy));
+}
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [igt-dev] [PATCH i-g-t 2/2] HAX: run render copy tests in BAT
2019-09-16 16:40 [igt-dev] [PATCH i-g-t 0/2] Add render copy tests on TGL Zbigniew Kempczyński
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* " Zbigniew Kempczyński
@ 2019-09-16 16:40 ` Zbigniew Kempczyński
2019-09-16 18:23 ` [igt-dev] ✓ Fi.CI.BAT: success for Add render copy tests on TGL Patchwork
2019-09-16 23:42 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 8+ messages in thread
From: Zbigniew Kempczyński @ 2019-09-16 16:40 UTC (permalink / raw)
To: igt-dev
---
tests/intel-ci/fast-feedback.testlist | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist
index e78e7fd0..d1db1e16 100644
--- a/tests/intel-ci/fast-feedback.testlist
+++ b/tests/intel-ci/fast-feedback.testlist
@@ -85,6 +85,14 @@ igt@gem_mmap_gtt@basic-write-gtt-no-prefault
igt@gem_mmap_gtt@basic-write-no-prefault
igt@gem_mmap_gtt@basic-write-read
igt@gem_mmap_gtt@basic-write-read-distinct
+igt@gem_render_copy@linear
+igt@gem_render_copy@x-tiled
+igt@gem_render_copy@y-tiled
+igt@gem_render_copy@yf-tiled
+igt@gem_render_copy_redux@normal
+igt@gem_render_copy_redux@interruptible
+igt@gem_render_copy_redux@flink
+igt@gem_render_copy_redux@flink-interruptible
igt@gem_render_linear_blits@basic
igt@gem_render_tiled_blits@basic
igt@gem_ringfill@basic-default
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for Add render copy tests on TGL
2019-09-16 16:40 [igt-dev] [PATCH i-g-t 0/2] Add render copy tests on TGL Zbigniew Kempczyński
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* " Zbigniew Kempczyński
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 2/2] HAX: run render copy tests in BAT Zbigniew Kempczyński
@ 2019-09-16 18:23 ` Patchwork
2019-09-16 23:42 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
3 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2019-09-16 18:23 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev
== Series Details ==
Series: Add render copy tests on TGL
URL : https://patchwork.freedesktop.org/series/66769/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6902 -> IGTPW_3464
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/66769/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_3464 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: [PASS][1] -> [INCOMPLETE][2] ([fdo#107718])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-blb-e6850/igt@gem_exec_suspend@basic-s4-devices.html
* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [PASS][3] -> [DMESG-FAIL][4] ([fdo#111108])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
#### Possible fixes ####
* igt@gem_basic@bad-close:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6] +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-icl-u3/igt@gem_basic@bad-close.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-icl-u3/igt@gem_basic@bad-close.html
* igt@gem_ctx_create@basic-files:
- fi-bxt-dsi: [INCOMPLETE][7] ([fdo#103927]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-bxt-dsi/igt@gem_ctx_create@basic-files.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-bxt-dsi/igt@gem_ctx_create@basic-files.html
* igt@gem_ctx_switch@rcs0:
- fi-icl-u2: [INCOMPLETE][9] ([fdo#107713]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-icl-u2/igt@gem_ctx_switch@rcs0.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-icl-u2/igt@gem_ctx_switch@rcs0.html
- {fi-icl-guc}: [INCOMPLETE][11] ([fdo#107713]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-icl-guc/igt@gem_ctx_switch@rcs0.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-icl-guc/igt@gem_ctx_switch@rcs0.html
* igt@gem_render_linear_blits@basic:
- {fi-tgl-u}: [SKIP][13] ([fdo#111564]) -> [PASS][14] +1 similar issue
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-tgl-u/igt@gem_render_linear_blits@basic.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-tgl-u/igt@gem_render_linear_blits@basic.html
* igt@gem_render_tiled_blits@basic:
- {fi-tgl-u2}: [SKIP][15] ([fdo#111564]) -> [PASS][16] +1 similar issue
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-tgl-u2/igt@gem_render_tiled_blits@basic.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-tgl-u2/igt@gem_render_tiled_blits@basic.html
* igt@i915_module_load@reload-no-display:
- {fi-icl-u4}: [DMESG-WARN][17] ([fdo#105602]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-icl-u4/igt@i915_module_load@reload-no-display.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-icl-u4/igt@i915_module_load@reload-no-display.html
* igt@i915_selftest@live_reset:
- {fi-icl-dsi}: [INCOMPLETE][19] ([fdo#107713]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-icl-dsi/igt@i915_selftest@live_reset.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-icl-dsi/igt@i915_selftest@live_reset.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][21] ([fdo#111407]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#111564]: https://bugs.freedesktop.org/show_bug.cgi?id=111564
[fdo#111600]: https://bugs.freedesktop.org/show_bug.cgi?id=111600
Participating hosts (56 -> 49)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5185 -> IGTPW_3464
CI-20190529: 20190529
CI_DRM_6902: e4f20f2795ecceb54918a57067cb5638d5cd2360 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3464: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/
IGT_5185: f02123bfa6ec6baf8ca67459cf4d8b4ea588ca08 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* tests on TGL
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* " Zbigniew Kempczyński
@ 2019-09-16 19:43 ` Caz Yokoyama
2019-09-17 1:56 ` Ashutosh Dixit
1 sibling, 0 replies; 8+ messages in thread
From: Caz Yokoyama @ 2019-09-16 19:43 UTC (permalink / raw)
To: Zbigniew Kempczyński, igt-dev
On Mon, 2019-09-16 at 18:40 +0200, Zbigniew Kempczyński wrote:
> From: "Kalamarz, Lukasz" <lukasz.kalamarz@intel.com>
>
> Previous generations didn't use SWSB dependency tracking.
> For that reason shader was adopted to handle that on TGL.
>
> FIXME: Some tests still have to be fixed, currently working:
> gem_render_copy @linear @x-tiled @y-tiled @yf-tiled
> gem_render_copy_redux
> gem_render_linear_blits @basic
> gem_render_tiled_blits @basic
> Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Katarzyna Dec <katarzyna.dec@intel.com>
> Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
> ---
> lib/i915/shaders/ps/gen12p1_render_copy.asm | 16 +++++++++++
> lib/intel_batchbuffer.c | 2 ++
> lib/rendercopy.h | 5 ++++
> lib/rendercopy_gen9.c | 30
> +++++++++++++++++++++
> 4 files changed, 53 insertions(+)
> create mode 100644 lib/i915/shaders/ps/gen12p1_render_copy.asm
>
> diff --git a/lib/i915/shaders/ps/gen12p1_render_copy.asm
> b/lib/i915/shaders/ps/gen12p1_render_copy.asm
> new file mode 100644
> index 00000000..d293ab1b
> --- /dev/null
> +++ b/lib/i915/shaders/ps/gen12p1_render_copy.asm
> @@ -0,0 +1,16 @@
> +L0:
> +(W) mad
> (8|M0) acc0.0<1>:nf r6.3<0;0>:f r2.0<8;1>:f
> r6.0<0>:f
> +(W) mad
> (8|M0) r113.0<1>:f acc0.0<8;1>:nf r3.0<8;1>:f
> r6.1<0>:f
> +(W) mad
> (8|M0) acc0.0<1>:nf r6.3<0;0>:f r4.0<8;1>:f
> r6.0<0>:f
> +(W) mad
> (8|M0) r114.0<1>:f acc0.0<8;1>:nf r5.0<8;1>:f
> r6.1<0>:f
> +(W) mad
> (8|M0) acc0.0<1>:nf r6.7<0;0>:f r2.0<8;1>:f
> r6.4<0>:f
> +(W) mad
> (8|M0) r115.0<1>:f acc0.0<8;1>:nf r3.0<8;1>:f
> r6.5<0>:f
> +(W) mad
> (8|M0) acc0.0<1>:nf r6.7<0;0>:f r4.0<8;1>:f
> r6.4<0>:f
> +(W) mad
> (8|M0) r116.0<1>:f acc0.0<8;1>:nf r5.0<8;1>:f
> r6.5<0>:f
> +(W) send.smpl
> (16|M0) r12 r113 null 0x0 0x8840001 {@1,
> $0} // wr:4+0, rd:8, fc: 0x40001
> + mov
> (16|M0) r113.0<1>:f r12.0<8;8,1>:f {
> $0.dst}
> + mov (16|M0) r115.0<1>:f r14.0<8;8,1>:f
> + mov (16|M0) r117.0<1>:f r16.0<8;8,1>:f
> + mov (16|M0) r119.0<1>:f r18.0<8;8,1>:f
> +(W) send.rc
> (16|M0) null r113 null 0x0 0x10031000
> {EOT, @1} // wr:8+0, rd:0, Render Target Write msc:16, to #0
> +L224:
> diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
> index 07de5cbb..163ec4ac 100644
> --- a/lib/intel_batchbuffer.c
> +++ b/lib/intel_batchbuffer.c
> @@ -844,6 +844,8 @@ igt_render_copyfunc_t igt_get_render_copyfunc(int
> devid)
> copy = gen9_render_copyfunc;
> else if (IS_GEN11(devid))
> copy = gen11_render_copyfunc;
> + else if (IS_TIGERLAKE(devid))
As someone suggested, IS_GEN12(devid) will be better.
> + copy = gen12p1_render_copyfunc;
>
> return copy;
> }
> diff --git a/lib/rendercopy.h b/lib/rendercopy.h
> index 35c28dd9..ffe4c4c1 100644
> --- a/lib/rendercopy.h
> +++ b/lib/rendercopy.h
> @@ -23,6 +23,11 @@ static inline void emit_vertex_normalized(struct
> intel_batchbuffer *batch,
> OUT_BATCH(u.ui);
> }
>
> +void gen12p1_render_copyfunc(struct intel_batchbuffer *batch,
> + drm_intel_context *context,
> + const struct igt_buf *src, unsigned src_x,
> unsigned src_y,
> + unsigned width, unsigned height,
> + const struct igt_buf *dst, unsigned dst_x,
> unsigned dst_y);
> void gen11_render_copyfunc(struct intel_batchbuffer *batch,
> drm_intel_context *context,
> const struct igt_buf *src, unsigned src_x,
> unsigned src_y,
> diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
> index 259a3ca2..fffcd003 100644
> --- a/lib/rendercopy_gen9.c
> +++ b/lib/rendercopy_gen9.c
> @@ -101,6 +101,24 @@ static const uint32_t ps_kernel_gen11[][4] = {
> #endif
> };
>
> +/* see lib/i915/shaders/ps/gen12p1_render_copy.asm */
> +static const uint32_t gen12p1_render_copy[][4] = {
> + { 0x8003005b, 0x200002f0, 0x0a0a0664, 0x06040205 },
> + { 0x8003005b, 0x71040fa8, 0x0a0a2001, 0x06240305 },
> + { 0x8003005b, 0x200002f0, 0x0a0a0664, 0x06040405 },
> + { 0x8003005b, 0x72040fa8, 0x0a0a2001, 0x06240505 },
> + { 0x8003005b, 0x200002f0, 0x0a0a06e4, 0x06840205 },
> + { 0x8003005b, 0x73040fa8, 0x0a0a2001, 0x06a40305 },
> + { 0x8003005b, 0x200002f0, 0x0a0a06e4, 0x06840405 },
> + { 0x8003005b, 0x74040fa8, 0x0a0a2001, 0x06a40505 },
> + { 0x80049031, 0x0c440000, 0x20027124, 0x01000000 },
> + { 0x00042061, 0x71050aa0, 0x00460c05, 0x00000000 },
> + { 0x00040061, 0x73050aa0, 0x00460e05, 0x00000000 },
> + { 0x00040061, 0x75050aa0, 0x00461005, 0x00000000 },
> + { 0x00040061, 0x77050aa0, 0x00461205, 0x00000000 },
> + { 0x80040131, 0x00000004, 0x50007144, 0x00c40000 },
> +};
> +
> /* AUB annotation support */
> #define MAX_ANNOTATIONS 33
> struct annotations_context {
> @@ -1089,3 +1107,15 @@ void gen11_render_copyfunc(struct
> intel_batchbuffer *batch,
> width, height, dst, dst_x, dst_y,
> ps_kernel_gen11,
> sizeof(ps_kernel_gen11));
> }
> +
> +void gen12p1_render_copyfunc(struct intel_batchbuffer *batch,
> + drm_intel_context *context,
> + const struct igt_buf *src, unsigned src_x,
> unsigned src_y,
> + unsigned width, unsigned height,
> + const struct igt_buf *dst, unsigned dst_x,
> unsigned dst_y)
> +
> +{
> + _gen9_render_copyfunc(batch, context, src, src_x, src_y,
> + width, height, dst, dst_x, dst_y,
> gen12p1_render_copy,
> + sizeof(gen12p1_render_copy));
> +}
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for Add render copy tests on TGL
2019-09-16 16:40 [igt-dev] [PATCH i-g-t 0/2] Add render copy tests on TGL Zbigniew Kempczyński
` (2 preceding siblings ...)
2019-09-16 18:23 ` [igt-dev] ✓ Fi.CI.BAT: success for Add render copy tests on TGL Patchwork
@ 2019-09-16 23:42 ` Patchwork
3 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2019-09-16 23:42 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev
== Series Details ==
Series: Add render copy tests on TGL
URL : https://patchwork.freedesktop.org/series/66769/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6902_full -> IGTPW_3464_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/66769/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_3464_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_schedule@preempt-other-bsd1:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#109276]) +14 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb4/igt@gem_exec_schedule@preempt-other-bsd1.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb6/igt@gem_exec_schedule@preempt-other-bsd1.html
* igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#111325]) +8 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb7/igt@gem_exec_schedule@preempt-other-chain-bsd.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb2/igt@gem_exec_schedule@preempt-other-chain-bsd.html
* igt@gem_mmap_gtt@hang:
- shard-iclb: [PASS][5] -> [FAIL][6] ([fdo#109677])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb1/igt@gem_mmap_gtt@hang.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb7/igt@gem_mmap_gtt@hang.html
* igt@i915_suspend@debugfs-reader:
- shard-apl: [PASS][7] -> [DMESG-WARN][8] ([fdo#108566]) +5 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-apl3/igt@i915_suspend@debugfs-reader.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-apl6/igt@i915_suspend@debugfs-reader.html
* igt@kms_cursor_crc@pipe-b-cursor-128x42-sliding:
- shard-kbl: [PASS][9] -> [FAIL][10] ([fdo#103232])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-kbl3/igt@kms_cursor_crc@pipe-b-cursor-128x42-sliding.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-kbl1/igt@kms_cursor_crc@pipe-b-cursor-128x42-sliding.html
- shard-apl: [PASS][11] -> [FAIL][12] ([fdo#103232])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-apl1/igt@kms_cursor_crc@pipe-b-cursor-128x42-sliding.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-apl5/igt@kms_cursor_crc@pipe-b-cursor-128x42-sliding.html
* igt@kms_cursor_legacy@cursor-vs-flip-legacy:
- shard-hsw: [PASS][13] -> [FAIL][14] ([fdo#103355])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-hsw5/igt@kms_cursor_legacy@cursor-vs-flip-legacy.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-hsw6/igt@kms_cursor_legacy@cursor-vs-flip-legacy.html
* igt@kms_flip@dpms-vs-vblank-race:
- shard-apl: [PASS][15] -> [FAIL][16] ([fdo#111609])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-apl1/igt@kms_flip@dpms-vs-vblank-race.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-apl3/igt@kms_flip@dpms-vs-vblank-race.html
* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-hsw: [PASS][17] -> [INCOMPLETE][18] ([fdo#103540])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-hsw1/igt@kms_flip@flip-vs-suspend-interruptible.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-hsw4/igt@kms_flip@flip-vs-suspend-interruptible.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-pwrite:
- shard-iclb: [PASS][19] -> [FAIL][20] ([fdo#103167]) +5 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-pwrite.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-shrfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-gtt:
- shard-iclb: [PASS][21] -> [INCOMPLETE][22] ([fdo#106978] / [fdo#107713])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb7/igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-gtt.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb7/igt@kms_frontbuffer_tracking@psr-rgb565-draw-mmap-gtt.html
* igt@kms_psr@psr2_basic:
- shard-iclb: [PASS][23] -> [SKIP][24] ([fdo#109441]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb2/igt@kms_psr@psr2_basic.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb7/igt@kms_psr@psr2_basic.html
#### Possible fixes ####
* igt@gem_exec_schedule@preempt-bsd1:
- shard-iclb: [SKIP][25] ([fdo#109276]) -> [PASS][26] +16 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb5/igt@gem_exec_schedule@preempt-bsd1.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb4/igt@gem_exec_schedule@preempt-bsd1.html
* igt@gem_exec_schedule@preempt-other-bsd:
- shard-iclb: [SKIP][27] ([fdo#111325]) -> [PASS][28] +4 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb2/igt@gem_exec_schedule@preempt-other-bsd.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb3/igt@gem_exec_schedule@preempt-other-bsd.html
* igt@gem_pipe_control_store_loop@fresh-buffer:
- shard-apl: [INCOMPLETE][29] ([fdo#103927]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-apl4/igt@gem_pipe_control_store_loop@fresh-buffer.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-apl7/igt@gem_pipe_control_store_loop@fresh-buffer.html
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- shard-iclb: [INCOMPLETE][31] ([fdo#107713]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb7/igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb1/igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b.html
* igt@kms_flip@flip-vs-panning-vs-hang:
- shard-hsw: [INCOMPLETE][33] ([fdo#103540]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-hsw1/igt@kms_flip@flip-vs-panning-vs-hang.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-hsw5/igt@kms_flip@flip-vs-panning-vs-hang.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
- shard-iclb: [FAIL][35] ([fdo#103167]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite:
- shard-glk: [FAIL][37] ([fdo#103167]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-glk4/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-glk9/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- shard-apl: [DMESG-WARN][39] ([fdo#108566]) -> [PASS][40] +3 similar issues
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-apl6/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-apl5/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html
* igt@kms_plane_lowres@pipe-a-tiling-y:
- shard-iclb: [FAIL][41] ([fdo#103166]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-y.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb1/igt@kms_plane_lowres@pipe-a-tiling-y.html
* igt@kms_psr@psr2_sprite_plane_onoff:
- shard-iclb: [SKIP][43] ([fdo#109441]) -> [PASS][44] +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb4/igt@kms_psr@psr2_sprite_plane_onoff.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb2/igt@kms_psr@psr2_sprite_plane_onoff.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][45] ([fdo#99912]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-apl5/igt@kms_setmode@basic.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-apl1/igt@kms_setmode@basic.html
- shard-kbl: [FAIL][47] ([fdo#99912]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-kbl2/igt@kms_setmode@basic.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-kbl7/igt@kms_setmode@basic.html
* igt@perf@short-reads:
- shard-glk: [FAIL][49] ([fdo#103183]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-glk6/igt@perf@short-reads.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-glk9/igt@perf@short-reads.html
#### Warnings ####
* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: [SKIP][51] ([fdo#109276]) -> [FAIL][52] ([fdo#111330])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6902/shard-iclb8/igt@gem_mocs_settings@mocs-settings-bsd2.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/shard-iclb2/igt@gem_mocs_settings@mocs-settings-bsd2.html
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103183]: https://bugs.freedesktop.org/show_bug.cgi?id=103183
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109677]: https://bugs.freedesktop.org/show_bug.cgi?id=109677
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#111609]: https://bugs.freedesktop.org/show_bug.cgi?id=111609
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (9 -> 6)
------------------------------
Missing (3): pig-skl-6260u shard-skl pig-glk-j5005
Build changes
-------------
* CI: CI-20190529 -> None
* IGT: IGT_5185 -> IGTPW_3464
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_6902: e4f20f2795ecceb54918a57067cb5638d5cd2360 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3464: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/
IGT_5185: f02123bfa6ec6baf8ca67459cf4d8b4ea588ca08 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3464/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* tests on TGL
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* " Zbigniew Kempczyński
2019-09-16 19:43 ` Caz Yokoyama
@ 2019-09-17 1:56 ` Ashutosh Dixit
2019-09-17 3:53 ` Kempczynski, Zbigniew
1 sibling, 1 reply; 8+ messages in thread
From: Ashutosh Dixit @ 2019-09-17 1:56 UTC (permalink / raw)
To: Zbigniew Kempczyński; +Cc: igt-dev
On Mon, 16 Sep 2019 09:40:13 -0700, Zbigniew Kempczyński wrote:
>
> From: "Kalamarz, Lukasz" <lukasz.kalamarz@intel.com>
>
> Previous generations didn't use SWSB dependency tracking.
> For that reason shader was adopted to handle that on TGL.
>
> FIXME: Some tests still have to be fixed, currently working:
> gem_render_copy @linear @x-tiled @y-tiled @yf-tiled
> gem_render_copy_redux
> gem_render_linear_blits @basic
> gem_render_tiled_blits @basic
> Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
> Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> Cc: Katarzyna Dec <katarzyna.dec@intel.com>
> Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
> ---
> lib/i915/shaders/ps/gen12p1_render_copy.asm | 16 +++++++++++
> lib/intel_batchbuffer.c | 2 ++
> lib/rendercopy.h | 5 ++++
> lib/rendercopy_gen9.c | 30 +++++++++++++++++++++
> 4 files changed, 53 insertions(+)
> create mode 100644 lib/i915/shaders/ps/gen12p1_render_copy.asm
>
> diff --git a/lib/i915/shaders/ps/gen12p1_render_copy.asm b/lib/i915/shaders/ps/gen12p1_render_copy.asm
> new file mode 100644
> index 00000000..d293ab1b
> --- /dev/null
> +++ b/lib/i915/shaders/ps/gen12p1_render_copy.asm
nit: I think this name for the file is fine but just to point out that
previous .asm's have names starting in blit...
> @@ -0,0 +1,16 @@
> +L0:
> +(W) mad (8|M0) acc0.0<1>:nf r6.3<0;0>:f r2.0<8;1>:f r6.0<0>:f
> +(W) mad (8|M0) r113.0<1>:f acc0.0<8;1>:nf r3.0<8;1>:f r6.1<0>:f
> +(W) mad (8|M0) acc0.0<1>:nf r6.3<0;0>:f r4.0<8;1>:f r6.0<0>:f
> +(W) mad (8|M0) r114.0<1>:f acc0.0<8;1>:nf r5.0<8;1>:f r6.1<0>:f
> +(W) mad (8|M0) acc0.0<1>:nf r6.7<0;0>:f r2.0<8;1>:f r6.4<0>:f
> +(W) mad (8|M0) r115.0<1>:f acc0.0<8;1>:nf r3.0<8;1>:f r6.5<0>:f
> +(W) mad (8|M0) acc0.0<1>:nf r6.7<0;0>:f r4.0<8;1>:f r6.4<0>:f
> +(W) mad (8|M0) r116.0<1>:f acc0.0<8;1>:nf r5.0<8;1>:f r6.5<0>:f
> +(W) send.smpl (16|M0) r12 r113 null 0x0 0x8840001 {@1, $0} // wr:4+0, rd:8, fc: 0x40001
> + mov (16|M0) r113.0<1>:f r12.0<8;8,1>:f {$0.dst}
> + mov (16|M0) r115.0<1>:f r14.0<8;8,1>:f
> + mov (16|M0) r117.0<1>:f r16.0<8;8,1>:f
> + mov (16|M0) r119.0<1>:f r18.0<8;8,1>:f
> +(W) send.rc (16|M0) null r113 null 0x0 0x10031000 {EOT, @1} // wr:8+0, rd:0, Render Target Write msc:16, to #0
> +L224:
> diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
> index 07de5cbb..163ec4ac 100644
> --- a/lib/intel_batchbuffer.c
> +++ b/lib/intel_batchbuffer.c
> @@ -844,6 +844,8 @@ igt_render_copyfunc_t igt_get_render_copyfunc(int devid)
> copy = gen9_render_copyfunc;
> else if (IS_GEN11(devid))
> copy = gen11_render_copyfunc;
> + else if (IS_TIGERLAKE(devid))
> + copy = gen12p1_render_copyfunc;
>
> return copy;
> }
> diff --git a/lib/rendercopy.h b/lib/rendercopy.h
> index 35c28dd9..ffe4c4c1 100644
> --- a/lib/rendercopy.h
> +++ b/lib/rendercopy.h
> @@ -23,6 +23,11 @@ static inline void emit_vertex_normalized(struct intel_batchbuffer *batch,
> OUT_BATCH(u.ui);
> }
>
> +void gen12p1_render_copyfunc(struct intel_batchbuffer *batch,
> + drm_intel_context *context,
> + const struct igt_buf *src, unsigned src_x, unsigned src_y,
> + unsigned width, unsigned height,
> + const struct igt_buf *dst, unsigned dst_x, unsigned dst_y);
> void gen11_render_copyfunc(struct intel_batchbuffer *batch,
> drm_intel_context *context,
> const struct igt_buf *src, unsigned src_x, unsigned src_y,
> diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
> index 259a3ca2..fffcd003 100644
> --- a/lib/rendercopy_gen9.c
> +++ b/lib/rendercopy_gen9.c
> @@ -101,6 +101,24 @@ static const uint32_t ps_kernel_gen11[][4] = {
> #endif
> };
>
> +/* see lib/i915/shaders/ps/gen12p1_render_copy.asm */
> +static const uint32_t gen12p1_render_copy[][4] = {
nit: once again the name seems fine to me but according to previous
convention this should be named ps_kernel_gen12p1[][].
> + { 0x8003005b, 0x200002f0, 0x0a0a0664, 0x06040205 },
> + { 0x8003005b, 0x71040fa8, 0x0a0a2001, 0x06240305 },
> + { 0x8003005b, 0x200002f0, 0x0a0a0664, 0x06040405 },
> + { 0x8003005b, 0x72040fa8, 0x0a0a2001, 0x06240505 },
> + { 0x8003005b, 0x200002f0, 0x0a0a06e4, 0x06840205 },
> + { 0x8003005b, 0x73040fa8, 0x0a0a2001, 0x06a40305 },
> + { 0x8003005b, 0x200002f0, 0x0a0a06e4, 0x06840405 },
> + { 0x8003005b, 0x74040fa8, 0x0a0a2001, 0x06a40505 },
> + { 0x80049031, 0x0c440000, 0x20027124, 0x01000000 },
> + { 0x00042061, 0x71050aa0, 0x00460c05, 0x00000000 },
> + { 0x00040061, 0x73050aa0, 0x00460e05, 0x00000000 },
> + { 0x00040061, 0x75050aa0, 0x00461005, 0x00000000 },
> + { 0x00040061, 0x77050aa0, 0x00461205, 0x00000000 },
> + { 0x80040131, 0x00000004, 0x50007144, 0x00c40000 },
> +};
> +
> /* AUB annotation support */
> #define MAX_ANNOTATIONS 33
> struct annotations_context {
> @@ -1089,3 +1107,15 @@ void gen11_render_copyfunc(struct intel_batchbuffer *batch,
> width, height, dst, dst_x, dst_y, ps_kernel_gen11,
> sizeof(ps_kernel_gen11));
> }
> +
> +void gen12p1_render_copyfunc(struct intel_batchbuffer *batch,
> + drm_intel_context *context,
> + const struct igt_buf *src, unsigned src_x, unsigned src_y,
> + unsigned width, unsigned height,
> + const struct igt_buf *dst, unsigned dst_x, unsigned dst_y)
> +
> +{
> + _gen9_render_copyfunc(batch, context, src, src_x, src_y,
> + width, height, dst, dst_x, dst_y, gen12p1_render_copy,
> + sizeof(gen12p1_render_copy));
> +}
> --
> 2.23.0
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* tests on TGL
2019-09-17 1:56 ` Ashutosh Dixit
@ 2019-09-17 3:53 ` Kempczynski, Zbigniew
0 siblings, 0 replies; 8+ messages in thread
From: Kempczynski, Zbigniew @ 2019-09-17 3:53 UTC (permalink / raw)
To: Dixit, Ashutosh; +Cc: igt-dev
On Mon, 2019-09-16 at 18:56 -0700, Ashutosh Dixit wrote:
> On Mon, 16 Sep 2019 09:40:13 -0700, Zbigniew Kempczyński wrote:
> >
> > From: "Kalamarz, Lukasz" <lukasz.kalamarz@intel.com>
> >
> > Previous generations didn't use SWSB dependency tracking.
> > For that reason shader was adopted to handle that on TGL.
> >
> > FIXME: Some tests still have to be fixed, currently working:
> > gem_render_copy @linear @x-tiled @y-tiled @yf-tiled
> > gem_render_copy_redux
> > gem_render_linear_blits @basic
> > gem_render_tiled_blits @basic
> > Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
> > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
> > Cc: Katarzyna Dec <katarzyna.dec@intel.com>
> > Reviewed-by: Katarzyna Dec <katarzyna.dec@intel.com>
> > ---
> > lib/i915/shaders/ps/gen12p1_render_copy.asm | 16 +++++++++++
> > lib/intel_batchbuffer.c | 2 ++
> > lib/rendercopy.h | 5 ++++
> > lib/rendercopy_gen9.c | 30 +++++++++++++++++++++
> > 4 files changed, 53 insertions(+)
> > create mode 100644 lib/i915/shaders/ps/gen12p1_render_copy.asm
> >
> > diff --git a/lib/i915/shaders/ps/gen12p1_render_copy.asm
> > b/lib/i915/shaders/ps/gen12p1_render_copy.asm
> > new file mode 100644
> > index 00000000..d293ab1b
> > --- /dev/null
> > +++ b/lib/i915/shaders/ps/gen12p1_render_copy.asm
>
> nit: I think this name for the file is fine but just to point out that
> previous .asm's have names starting in blit...
This shader file naming is very vague and it should be change imo.
>
> > @@ -0,0 +1,16 @@
> > +L0:
> > +(W) mad
> > (8|M0) acc0.0<1>:nf r6.3<0;0>:f r2.0<8;1>:f r6.
> > 0<0>:f
> > +(W) mad
> > (8|M0) r113.0<1>:f acc0.0<8;1>:nf r3.0<8;1>:f r6.
> > 1<0>:f
> > +(W) mad
> > (8|M0) acc0.0<1>:nf r6.3<0;0>:f r4.0<8;1>:f r6.
> > 0<0>:f
> > +(W) mad
> > (8|M0) r114.0<1>:f acc0.0<8;1>:nf r5.0<8;1>:f r6.
> > 1<0>:f
> > +(W) mad
> > (8|M0) acc0.0<1>:nf r6.7<0;0>:f r2.0<8;1>:f r6.
> > 4<0>:f
> > +(W) mad
> > (8|M0) r115.0<1>:f acc0.0<8;1>:nf r3.0<8;1>:f r6.
> > 5<0>:f
> > +(W) mad
> > (8|M0) acc0.0<1>:nf r6.7<0;0>:f r4.0<8;1>:f r6.
> > 4<0>:f
> > +(W) mad
> > (8|M0) r116.0<1>:f acc0.0<8;1>:nf r5.0<8;1>:f r6.
> > 5<0>:f
> > +(W) send.smpl
> > (16|M0) r12 r113 null 0x0 0x8840001 {@1, $0}
> > // wr:4+0, rd:8, fc: 0x40001
> > + mov
> > (16|M0) r113.0<1>:f r12.0<8;8,1>:f {$0.ds
> > t}
> > + mov (16|M0) r115.0<1>:f r14.0<8;8,1>:f
> > + mov (16|M0) r117.0<1>:f r16.0<8;8,1>:f
> > + mov (16|M0) r119.0<1>:f r18.0<8;8,1>:f
> > +(W) send.rc
> > (16|M0) null r113 null 0x0 0x10031000 {EOT, @1}
> > // wr:8+0, rd:0, Render Target Write msc:16, to #0
> > +L224:
> > diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
> > index 07de5cbb..163ec4ac 100644
> > --- a/lib/intel_batchbuffer.c
> > +++ b/lib/intel_batchbuffer.c
> > @@ -844,6 +844,8 @@ igt_render_copyfunc_t igt_get_render_copyfunc(int
> > devid)
> > copy = gen9_render_copyfunc;
> > else if (IS_GEN11(devid))
> > copy = gen11_render_copyfunc;
> > + else if (IS_TIGERLAKE(devid))
> > + copy = gen12p1_render_copyfunc;
> >
> > return copy;
> > }
> > diff --git a/lib/rendercopy.h b/lib/rendercopy.h
> > index 35c28dd9..ffe4c4c1 100644
> > --- a/lib/rendercopy.h
> > +++ b/lib/rendercopy.h
> > @@ -23,6 +23,11 @@ static inline void emit_vertex_normalized(struct
> > intel_batchbuffer *batch,
> > OUT_BATCH(u.ui);
> > }
> >
> > +void gen12p1_render_copyfunc(struct intel_batchbuffer *batch,
> > + drm_intel_context *context,
> > + const struct igt_buf *src, unsigned src_x,
> > unsigned src_y,
> > + unsigned width, unsigned height,
> > + const struct igt_buf *dst, unsigned dst_x,
> > unsigned dst_y);
> > void gen11_render_copyfunc(struct intel_batchbuffer *batch,
> > drm_intel_context *context,
> > const struct igt_buf *src, unsigned src_x, unsigned
> > src_y,
> > diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c
> > index 259a3ca2..fffcd003 100644
> > --- a/lib/rendercopy_gen9.c
> > +++ b/lib/rendercopy_gen9.c
> > @@ -101,6 +101,24 @@ static const uint32_t ps_kernel_gen11[][4] = {
> > #endif
> > };
> >
> > +/* see lib/i915/shaders/ps/gen12p1_render_copy.asm */
> > +static const uint32_t gen12p1_render_copy[][4] = {
>
> nit: once again the name seems fine to me but according to previous
> convention this should be named ps_kernel_gen12p1[][].
This naming convention is fine for C source code, but it
doesn't keep relation between shader source file. Please
take a look to i915/shaders/ps and try to guess without
assemblying which file is for gen8.
As this patch is for render copy for TGL I didn't touch
other source codes, but to be ownest it should be done.
>
> > + { 0x8003005b, 0x200002f0, 0x0a0a0664, 0x06040205 },
> > + { 0x8003005b, 0x71040fa8, 0x0a0a2001, 0x06240305 },
> > + { 0x8003005b, 0x200002f0, 0x0a0a0664, 0x06040405 },
> > + { 0x8003005b, 0x72040fa8, 0x0a0a2001, 0x06240505 },
> > + { 0x8003005b, 0x200002f0, 0x0a0a06e4, 0x06840205 },
> > + { 0x8003005b, 0x73040fa8, 0x0a0a2001, 0x06a40305 },
> > + { 0x8003005b, 0x200002f0, 0x0a0a06e4, 0x06840405 },
> > + { 0x8003005b, 0x74040fa8, 0x0a0a2001, 0x06a40505 },
> > + { 0x80049031, 0x0c440000, 0x20027124, 0x01000000 },
> > + { 0x00042061, 0x71050aa0, 0x00460c05, 0x00000000 },
> > + { 0x00040061, 0x73050aa0, 0x00460e05, 0x00000000 },
> > + { 0x00040061, 0x75050aa0, 0x00461005, 0x00000000 },
> > + { 0x00040061, 0x77050aa0, 0x00461205, 0x00000000 },
> > + { 0x80040131, 0x00000004, 0x50007144, 0x00c40000 },
> > +};
> > +
> > /* AUB annotation support */
> > #define MAX_ANNOTATIONS 33
> > struct annotations_context {
> > @@ -1089,3 +1107,15 @@ void gen11_render_copyfunc(struct intel_batchbuffer
> > *batch,
> > width, height, dst, dst_x, dst_y, ps_kernel_gen11,
> > sizeof(ps_kernel_gen11));
> > }
> > +
> > +void gen12p1_render_copyfunc(struct intel_batchbuffer *batch,
> > + drm_intel_context *context,
> > + const struct igt_buf *src, unsigned src_x,
> > unsigned src_y,
> > + unsigned width, unsigned height,
> > + const struct igt_buf *dst, unsigned dst_x,
> > unsigned dst_y)
> > +
> > +{
> > + _gen9_render_copyfunc(batch, context, src, src_x, src_y,
> > + width, height, dst, dst_x, dst_y,
> > gen12p1_render_copy,
> > + sizeof(gen12p1_render_copy));
> > +}
> > --
> > 2.23.0
> >
> > _______________________________________________
> > igt-dev mailing list
> > igt-dev@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-09-17 3:53 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-16 16:40 [igt-dev] [PATCH i-g-t 0/2] Add render copy tests on TGL Zbigniew Kempczyński
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 1/2] lib/rendercopy/tgl: Add support for gem_render_* " Zbigniew Kempczyński
2019-09-16 19:43 ` Caz Yokoyama
2019-09-17 1:56 ` Ashutosh Dixit
2019-09-17 3:53 ` Kempczynski, Zbigniew
2019-09-16 16:40 ` [igt-dev] [PATCH i-g-t 2/2] HAX: run render copy tests in BAT Zbigniew Kempczyński
2019-09-16 18:23 ` [igt-dev] ✓ Fi.CI.BAT: success for Add render copy tests on TGL Patchwork
2019-09-16 23:42 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
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.