tools/intel_aubdump: Simulate "enhanced execlist" submission for gen11+
PATCH 1/1 tools/intel_aubdump: Simulate "enhanced execlist" submission for gen11+
gen11 execlist submission is done through the submit queue registers (ELSQ). See kernel patch "drm/i915/icl: Enhanced execution list support"
--- tools/aubdump.c | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-)
tools/aubdump.c +35 -7
@@ -72,6 +72,14 @@#define EXECLIST_STATUS_VCSUNIT0 0x12234#define EXECLIST_STATUS_BCSUNIT 0x22234 +#define EXECLIST_SQ_CONTENTS0_RCSUNIT 0x02510 +#define EXECLIST_SQ_CONTENTS0_VCSUNIT0 0x12510 +#define EXECLIST_SQ_CONTENTS0_BCSUNIT 0x22510 + +#define EXECLIST_CONTROL_RCSUNIT 0x02550 +#define EXECLIST_CONTROL_VCSUNIT0 0x12550 +#define EXECLIST_CONTROL_BCSUNIT 0x22550 + #define MEMORY_MAP_SIZE (64 /* MiB */ * 1024 * 1024)#define PTE_SIZE 4
@@ -584,7 +592,9 @@ aub_dump_execlist(uint64_t batch_offset, int ring_flag)uint32_t ring_addr;uint64_t descriptor;uint32_t elsp_reg; +uint32_t elsq_reg;uint32_t status_reg; +uint32_t control_reg;switch (ring_flag) {case I915_EXEC_DEFAULT :
@@ -592,19 +602,25 @@ aub_dump_execlist(uint64_t batch_offset, int ring_flag) ring_addr =RENDER_RING_ADDR ; descriptor =RENDER_CONTEXT_DESCRIPTOR ; elsp_reg =EXECLIST_SUBMITPORT_RCSUNIT ; + elsq_reg =EXECLIST_SQ_CONTENTS0_RCSUNIT ; status_reg =EXECLIST_STATUS_RCSUNIT ; + control_reg =EXECLIST_CONTROL_RCSUNIT ;break ;case I915_EXEC_BSD : ring_addr =VIDEO_RING_ADDR ; descriptor =VIDEO_CONTEXT_DESCRIPTOR ; elsp_reg =EXECLIST_SUBMITPORT_VCSUNIT0 ; + elsq_reg =EXECLIST_SQ_CONTENTS0_VCSUNIT0 ; status_reg =EXECLIST_STATUS_VCSUNIT0 ; + control_reg =EXECLIST_CONTROL_VCSUNIT0 ;break ;case I915_EXEC_BLT : ring_addr =BLITTER_RING_ADDR ; descriptor =BLITTER_CONTEXT_DESCRIPTOR ; elsp_reg =EXECLIST_SUBMITPORT_BCSUNIT ; + elsq_reg =EXECLIST_SQ_CONTENTS0_BCSUNIT ; status_reg =EXECLIST_STATUS_BCSUNIT ; + control_reg =EXECLIST_CONTROL_BCSUNIT ;break ; }
@@ -622,18 +638,30 @@ aub_dump_execlist(uint64_t batch_offset, int ring_flag) AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_LOCAL);dword_out (16 );/* RING_BUFFER_TAIL */ -register_write_out (elsp_reg,0 ); -register_write_out (elsp_reg,8 ); -register_write_out (elsp_reg, descriptor >>32 ); -register_write_out (elsp_reg, descriptor &0xFFFFFFFF ); +if (gen >=11 ) { +register_write_out (elsq_reg, descriptor &0xFFFFFFFF ); +register_write_out (elsq_reg +sizeof (uint32_t ), descriptor >>32 ); +register_write_out (control_reg,1 ); + }else { +register_write_out (elsp_reg,0 ); +register_write_out (elsp_reg,0 ); +register_write_out (elsp_reg, descriptor >>32 ); +register_write_out (elsp_reg, descriptor &0xFFFFFFFF ); + }dword_out (CMD_MEM_TRACE_REGISTER_POLL | (5 +1 -1 ));dword_out (status_reg);dword_out (AUB_MEM_TRACE_REGISTER_SIZE_DWORD |AUB_MEM_TRACE_REGISTER_SPACE_MMIO ); -dword_out (0x00000010 );/* mask lo */ -dword_out (0x00000000 );/* mask hi */ -dword_out (0x00000000 ); +if (gen >=11 ) { +dword_out (0x00000001 );/* mask lo */ +dword_out (0x00000000 );/* mask hi */ +dword_out (0x00000001 ); + }else { +dword_out (0x00000010 );/* mask lo */ +dword_out (0x00000000 );/* mask hi */ +dword_out (0x00000000 ); + } } static void
Signature · 6 lines
2.14.3 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✗ Fi.CI.BAT: warning for tools/intel_aubdump: Simulate "enhanced execlist" submission for gen11+
== Series Details ==
== Series Details ==
Series: tools/intel_aubdump: Simulate "enhanced execlist" submission for gen11+
URL : https://patchwork.freedesktop.org/series/37682/
State : warning
== Summary ==
IGT patchset tested on top of latest successful build 3fd9b578b3138b04178b4ce8ee4a60e74a16ec91 tests/perf_pmu: Use short batches from hotplug test
with latest DRM-Tip kernel build CI_DRM_372689ac14dcb4d0 drm-tip: 2018y-02m-05d-19h-08m-24s UTC integration manifest
No testlist changes.
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
pass -> FAIL (fi-gdg-551) fdo#102575
Test gem_sync:
Subgroup basic-all:
pass -> SKIP (fi-pnv-d510)
Subgroup basic-each:
pass -> SKIP (fi-pnv-d510)
Subgroup basic-many-each:
pass -> SKIP (fi-pnv-d510)
Subgroup basic-store-all:
pass -> SKIP (fi-pnv-d510)
Subgroup basic-store-each:
pass -> SKIP (fi-pnv-d510)
Test gem_tiled_blits:
Subgroup basic:
pass -> SKIP (fi-pnv-d510)
Test gem_tiled_fence_blits:
Subgroup basic:
pass -> SKIP (fi-pnv-d510)
Test gem_wait:
Subgroup basic-busy-all:
pass -> SKIP (fi-pnv-d510)
Subgroup basic-wait-all:
pass -> SKIP (fi-pnv-d510)
Subgroup basic-await-all:
pass -> SKIP (fi-pnv-d510)
Test kms_busy:
Subgroup basic-flip-a:
pass -> SKIP (fi-pnv-d510)
Subgroup basic-flip-b:
pass -> SKIP (fi-pnv-d510)
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> SKIP (fi-pnv-d510)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:418s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:424s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:378s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:494s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:286s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:481s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:487s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:472s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:464s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:568s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:577s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:420s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:282s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:514s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:390s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:398s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:416s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:458s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:428s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:460s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:502s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:458s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:502s fi-pnv-d510 total:288 pass:209 dwarn:1 dfail:0 fail:0 skip:78 time:560s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:425s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:510s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:529s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:499s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:480s fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:415s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:428s fi-snb-2520m total:245 pass:211 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:398s
Blacklisted hosts:
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:473s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_866/issues.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
The new code path:
Quoted 105 lines · Scott D Phillips
gen11 execlist submission is done through the submit queue registers (ELSQ). See kernel patch "drm/i915/icl: Enhanced execution list support"
Signed-off-by Scott D Phillips <[email protected]>--- tools/aubdump.c | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-)tools/aubdump.c +35
-7@@ -72,6 +72,14 @@#define EXECLIST_STATUS_VCSUNIT0 0x12234#define EXECLIST_STATUS_BCSUNIT 0x22234 +#define EXECLIST_SQ_CONTENTS0_RCSUNIT 0x02510 +#define EXECLIST_SQ_CONTENTS0_VCSUNIT0 0x12510 +#define EXECLIST_SQ_CONTENTS0_BCSUNIT 0x22510 + +#define EXECLIST_CONTROL_RCSUNIT 0x02550 +#define EXECLIST_CONTROL_VCSUNIT0 0x12550 +#define EXECLIST_CONTROL_BCSUNIT 0x22550 + #define MEMORY_MAP_SIZE (64 /* MiB */ * 1024 * 1024)#define PTE_SIZE 4@@ -584,7 +592,9 @@ aub_dump_execlist(uint64_t batch_offset, int ring_flag)uint32_t ring_addr;uint64_t descriptor;uint32_t elsp_reg; +uint32_t elsq_reg;uint32_t status_reg; +uint32_t control_reg;switch (ring_flag) {case I915_EXEC_DEFAULT :@@ -592,19 +602,25 @@ aub_dump_execlist(uint64_t batch_offset, int ring_flag) ring_addr =RENDER_RING_ADDR ; descriptor =RENDER_CONTEXT_DESCRIPTOR ; elsp_reg =EXECLIST_SUBMITPORT_RCSUNIT ; + elsq_reg =EXECLIST_SQ_CONTENTS0_RCSUNIT ; status_reg =EXECLIST_STATUS_RCSUNIT ; + control_reg =EXECLIST_CONTROL_RCSUNIT ;break ;case I915_EXEC_BSD : ring_addr =VIDEO_RING_ADDR ; descriptor =VIDEO_CONTEXT_DESCRIPTOR ; elsp_reg =EXECLIST_SUBMITPORT_VCSUNIT0 ; + elsq_reg =EXECLIST_SQ_CONTENTS0_VCSUNIT0 ; status_reg =EXECLIST_STATUS_VCSUNIT0 ; + control_reg =EXECLIST_CONTROL_VCSUNIT0 ;break ;case I915_EXEC_BLT : ring_addr =BLITTER_RING_ADDR ; descriptor =BLITTER_CONTEXT_DESCRIPTOR ; elsp_reg =EXECLIST_SUBMITPORT_BCSUNIT ; + elsq_reg =EXECLIST_SQ_CONTENTS0_BCSUNIT ; status_reg =EXECLIST_STATUS_BCSUNIT ; + control_reg =EXECLIST_CONTROL_BCSUNIT ;break ; }@@ -622,18 +638,30 @@ aub_dump_execlist(uint64_t batch_offset, int ring_flag) AUB_MEM_TRACE_MEMORY_ADDRESS_SPACE_LOCAL);dword_out (16 );/* RING_BUFFER_TAIL */ -register_write_out (elsp_reg,0 ); -register_write_out (elsp_reg,8 ); -register_write_out (elsp_reg, descriptor >>32 ); -register_write_out (elsp_reg, descriptor &0xFFFFFFFF ); +if (gen >=11 ) { +register_write_out (elsq_reg, descriptor &0xFFFFFFFF ); +register_write_out (elsq_reg +sizeof (uint32_t ), descriptor >>32 ); +register_write_out (control_reg,1 ); + }else { +register_write_out (elsp_reg,0 ); +register_write_out (elsp_reg,0 ); +register_write_out (elsp_reg, descriptor >>32 ); +register_write_out (elsp_reg, descriptor &0xFFFFFFFF ); + }dword_out (CMD_MEM_TRACE_REGISTER_POLL | (5 +1 -1 ));dword_out (status_reg);dword_out (AUB_MEM_TRACE_REGISTER_SIZE_DWORD |AUB_MEM_TRACE_REGISTER_SPACE_MMIO ); -dword_out (0x00000010 );/* mask lo */ -dword_out (0x00000000 );/* mask hi */ -dword_out (0x00000000 ); +if (gen >=11 ) { +dword_out (0x00000001 );/* mask lo */ +dword_out (0x00000000 );/* mask hi */ +dword_out (0x00000001 ); + }else { +dword_out (0x00000010 );/* mask lo */ +dword_out (0x00000000 );/* mask hi */ +dword_out (0x00000000 ); + } } static voidSignature · 1 line
2.14.3
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev