Introduce blt_cmd_info struct
Subsystems (2)
v4 cover Introduce blt_cmd_info struct
This patch series introduces a new way of checking if a specific tiling format and/or blitter copy command is supported on the current platform. Instead of using functions with hardcoded devices, now we store information about available features in blt_cmd_info struct, each of the instances connected to the intel_device_info definitions.
Two patches that follow the introduction of blt_cmd_info and intel_device_info modification are a prep work for the fast copy test -- extracting needed functions and updating fill_data() to support TileYF (available only for Pre-gen12).
In addition to this, the patchset adds two fast copy tests: basic fast-copy where two blit copies are done in separate batches, and fast-copy-emit which uses emit_blt_fast_copy() and manually crafts two copies in one batch.
v4:
- Move the inclusion of igt_core.h to intel_blt_info.c (Kamil/Petri)
- Rename __MAX_TILING and __MAX_CMD so they are blitter-specific
(Kamil)
- Use BIT() macro from intel_chipset.h (Zbigniew)
- Check for empty blt_tiling_info in tiling_info(), and warn about it
- Change blt_cmd_info declarations in intel_blt_info. Add a separate file for their definitions (intel_tiling_info.c). Update lib/mason.build to reflect that change (Zbigniew)
- Remove definitions for ATS-M, as we can reuse dg2's (Zbigniew)
- Add EXEC_OBJECT_WRITE flag for dest in fast-copy-emit subtest (Zbigniew)
v3:
- Rewrite blt_tiling_type to be contiguous (Zbigniew, Kamil)
- Add BLT_BIT macro to create bit flags during .supported_tiling field initialization (Zbigniew)
- Undo accidental line deletion in intel_chipset.c (Kamil)
- Add __TILING_MAX to blt_tiling_type (Zbigniew)
- Use asprintf when creating strings of subtest and PNG files names (Zbigniew)
- Delete a duplicate WRITE_PNG call in fast_copy test (Zbigniew)
- Update documentation
- Update year in copyright headers
Karolina Stolarek (6):
i915/lib: Add new library for blitter and tiling formats
lib: Update platform definitions with blitter information lib/i915_blt: Check for Tile-YF in fast_copy lib/i915_blt: Add common functions for blt_copy_object tests/gem_exercise_blt: Add fast-copy test tests/gem_exercise_blt: Add fast-copy-emit test
.../igt-gpu-tools/igt-gpu-tools-docs.xml | 1 + lib/i915/i915_blt.c | 195 +++++++-- lib/i915/i915_blt.h | 48 ++- lib/i915/intel_blt_info.c | 156 +++++++ lib/i915/intel_blt_info.h | 93 +++++ lib/i915/intel_tiling_info.c | 87 ++++ lib/intel_chipset.h | 4 + lib/intel_device_info.c | 47 +++ lib/meson.build | 14 +- tests/i915/gem_ccs.c | 209 +++------- tests/i915/gem_exercise_blt.c | 387 ++++++++++++++++++ tests/i915/gem_lmem_swapping.c | 81 +--- tests/meson.build | 1 + 13 files changed, 1058 insertions(+), 265 deletions(-) create mode 100644 lib/i915/intel_blt_info.c create mode 100644 lib/i915/intel_blt_info.h create mode 100644 lib/i915/intel_tiling_info.c create mode 100644 tests/i915/gem_exercise_blt.c
Signature · 1 line
2.25.1
PATCH v4 1/6 i915/lib: Add new library for blitter and tiling formats
Add structs to describe what blitter commands and tiling formats are supported per platform. Add generic functions that check if a specific blitter command or tiling format is supported. Move blt_tiling enum to the newly created library and update its definition. Update i915_blt and block copy tests to reflect that change. Update blt_supports_tiling to return false for invalid tiling formats.
--- .../igt-gpu-tools/igt-gpu-tools-docs.xml | 1 + lib/i915/i915_blt.c | 37 ++--- lib/i915/i915_blt.h | 14 +- lib/i915/intel_blt_info.c | 156 ++++++++++++++++++ lib/i915/intel_blt_info.h | 93 +++++++++++ lib/i915/intel_tiling_info.c | 87 ++++++++++ lib/meson.build | 14 +- tests/i915/gem_ccs.c | 13 +- tests/i915/gem_lmem_swapping.c | 2 +- 9 files changed, 373 insertions(+), 44 deletions(-) create mode 100644 lib/i915/intel_blt_info.c create mode 100644 lib/i915/intel_blt_info.h create mode 100644 lib/i915/intel_tiling_info.c
docs/reference/igt-gpu-tools/igt-gpu-tools-docs.xml +1 -0
@@ -59,6 +59,7 @@ </chapter> <chapter> <title>igt/i915 API Reference</title> + <xi:include href="xml/intel_blt_info.xml"/> <xi:include href="xml/gem_create.xml"/> <xi:include href="xml/gem_context.xml"/> <xi:include href="xml/gem_engine_topology.xml"/>
lib/i915/i915_blt.c +13 -24
@@ -217,10 +217,13 @@ bool blt_supports_compression(int i915)* Returns: * true if it does, false otherwise. */ -bool blt_supports_tiling (int i915,enum blt_tiling tiling) +bool blt_supports_tiling (int i915,enum blt_tiling_type tiling) {uint32_t devid =intel_get_drm_devid (i915); +if (tiling >=T_YFMAJOR ) +return false; +if (tiling ==T_XMAJOR ) {if (IS_TIGERLAKE (devid) ||IS_DG1 (devid))return false;
@@ -238,28 +241,7 @@ bool blt_supports_tiling(int i915, enum blt_tiling tiling)return true; } -/** -* blt_tiling_name: -* @tiling: tiling id -* -* Returns: -* name of @tiling passed. Useful to build test names. -*/ -const char *blt_tiling_name (enum blt_tiling tiling) -{ -switch (tiling) { -case T_LINEAR :return "linear" ; -case T_XMAJOR :return "xmajor" ; -case T_YMAJOR :return "ymajor" ; -case T_TILE4 :return "tile4" ; -case T_TILE64 :return "tile64" ; - } - -igt_warn ("invalid tiling passed: %d\n" , tiling); -return NULL ; -} - -static int __block_tiling (enum blt_tiling tiling) +static int __block_tiling (enum blt_tiling_type tiling) {switch (tiling) {case T_LINEAR :return 0 ;
@@ -267,6 +249,8 @@ static int __block_tiling(enum blt_tiling tiling)case T_YMAJOR :return 1 ;case T_TILE4 :return 2 ;case T_TILE64 :return 3 ; +default : +break ; }igt_warn ("invalid tiling passed: %d\n" , tiling);
@@ -891,15 +875,20 @@ struct gen12_fast_copy_data { } dw09; }; -static int __fast_tiling (enum blt_tiling tiling) +static int __fast_tiling (enum blt_tiling_type tiling) {switch (tiling) {case T_LINEAR :return 0 ;case T_XMAJOR :return 1 ;case T_YMAJOR :return 2 ;case T_TILE4 :return 2 ; +case T_YFMAJOR :return 2 ;case T_TILE64 :return 3 ; +default : +break ; } + +igt_warn ("invalid tiling passed: %d\n" , tiling);return 0 ; }
lib/i915/i915_blt.h +3 -11
@@ -47,6 +47,7 @@#include <malloc.h> #include "drm.h" #include "igt.h" +#include "intel_blt_info.h" #define CCS_RATIO 256
@@ -59,14 +60,6 @@ enum blt_color_depth { CD_128bit, }; -enum blt_tiling { -T_LINEAR , -T_XMAJOR , -T_YMAJOR , -T_TILE4 , -T_TILE64 , -}; -enum blt_compression {COMPRESSION_DISABLED ,COMPRESSION_ENABLED ,
@@ -83,7 +76,7 @@ struct blt_copy_object {uint32_t region;uint64_t size;uint8_t mocs; -enum blt_tiling tiling; +enum blt_tiling_type tiling;enum blt_compression compression;/* BC only */ enum blt_compression_type compression_type;/* BC only */ uint32_t pitch;
@@ -165,8 +158,7 @@ struct blt_ctrl_surf_copy_data { };bool blt_supports_compression (int i915); -bool blt_supports_tiling (int i915,enum blt_tiling tiling); -const char *blt_tiling_name (enum blt_tiling tiling); +bool blt_supports_tiling (int i915,enum blt_tiling_type tiling); uint64_t emit_blt_block_copy(int i915, uint64_t ahnd,
lib/i915/intel_blt_info.c new file +156 -0
156 lines not on this page · raw message
lib/i915/intel_blt_info.h new file +93 -0
93 lines not on this page · raw message
lib/i915/intel_tiling_info.c new file +87 -0
87 lines not on this page · raw message
lib/meson.build +12 -2
@@ -11,6 +11,8 @@ lib_sources = [ 'i915/gem_ring.c', 'i915/gem_mman.c', 'i915/gem_vm.c', + 'i915/intel_blt_info.c', + 'i915/intel_tiling_info.c', 'i915/intel_decode.c', 'i915/intel_memory_region.c', 'i915/intel_mocs.c',
@@ -229,6 +231,14 @@ lib_igt_perf_build = static_library('igt_perf', lib_igt_perf = declare_dependency(link_with : lib_igt_perf_build, include_directories : inc) +lin_igt_intel_blt_info_build = static_library('igt_intel_blt_info', + ['i915/intel_blt_info.c', + 'i915/intel_tiling_info.c'], + include_directories : inc) + +lib_igt_intel_blt_info = declare_dependency(link_with : lin_igt_intel_blt_info_build, + include_directories : inc) + scan_dep = [ glib, libudev,
@@ -240,7 +250,7 @@ lib_igt_device_scan_build = static_library('igt_device_scan', 'igt_tools_stub.c', 'intel_device_info.c', ], - dependencies : scan_dep, + dependencies : [scan_dep, lib_igt_intel_blt_info], include_directories : inc) lib_igt_device_scan = declare_dependency(link_with : lib_igt_device_scan_build,
@@ -320,7 +330,7 @@ endforeach lib_igt_i915_perf_build = shared_library( 'i915_perf', i915_perf_files, - dependencies: lib_igt_chipset, + dependencies: [lib_igt_chipset, lib_igt_intel_blt_info], include_directories : inc, install: true, soversion: '1.5')
tests/i915/gem_ccs.c +7 -6
@@ -46,7 +46,7 @@ struct test_config {static void set_object (struct blt_copy_object *obj,uint32_t handle,uint64_t size,uint32_t region, -uint8_t mocs,enum blt_tiling tiling, +uint8_t mocs,enum blt_tiling_type tiling,enum blt_compression compression,enum blt_compression_type compression_type) {
@@ -108,7 +108,7 @@ static void set_surf_object(struct blt_ctrl_surf_copy_object *obj,static struct blt_copy_object *create_object (int i915,uint32_t region,uint32_t width,uint32_t height,uint32_t bpp,uint8_t mocs, -enum blt_tiling tiling, +enum blt_tiling_type tiling,enum blt_compression compression,enum blt_compression_type compression_type,bool create_mapping)
@@ -374,7 +374,7 @@ static void block_copy(int i915,const intel_ctx_t *ctx, const struct intel_execution_engine2 *e, uint32_t region1, uint32_t region2, - enum blt_tiling mid_tiling, + enum blt_tiling_type mid_tiling, const struct test_config *config) { struct blt_copy_data blt = {};
@@ -492,7 +492,7 @@ static void block_multicopy(int i915,const intel_ctx_t *ctx, const struct intel_execution_engine2 *e, uint32_t region1, uint32_t region2, - enum blt_tiling mid_tiling, + enum blt_tiling_type mid_tiling, const struct test_config *config) { struct blt_copy3_data blt3 = {};
@@ -581,7 +581,7 @@ static const struct {const char *suffix;void (*copyfn)(int ,const intel_ctx_t *,const struct intel_execution_engine2 *, -uint32_t ,uint32_t ,enum blt_tiling , +uint32_t ,uint32_t ,enum blt_tiling_type ,const struct test_config *); } copyfns[] = { [BLOCK_COPY] = { "", block_copy },
@@ -596,6 +596,7 @@ static void block_copy_test(int i915, {struct igt_collection *regions;const struct intel_execution_engine2 *e; +int tiling;if (config->compression && !blt_supports_compression (i915))return ;
@@ -603,7 +604,7 @@ static void block_copy_test(int i915,if (config->inplace && !config->compression)return ; -for (int tiling =T_LINEAR ; tiling <=T_TILE64 ; tiling++) { +for_each_tiling (tiling) {if (!blt_supports_tiling (i915, tiling) || (param.tiling >=0 && param.tiling != tiling))continue ;
tests/i915/gem_lmem_swapping.c +1 -1
@@ -78,7 +78,7 @@ struct object {static void set_object (struct blt_copy_object *obj,uint32_t handle,uint64_t size,uint32_t region, -uint8_t mocs,enum blt_tiling tiling, +uint8_t mocs,enum blt_tiling_type tiling,enum blt_compression compression,enum blt_compression_type compression_type) {
Signature · 1 line
2.25.1
PATCH v4 2/6 lib: Update platform definitions with blitter information
In reply to Karolina StolarekUpdate entries in intel_device_info to store information on supported blitter commands and tiling formats. Add predicates that check if block or fast copy are supported. Update block copy tests to use the new checks.
--- lib/i915/i915_blt.c | 76 ++++++++++++++++++++++++++++++----------- lib/i915/i915_blt.h | 6 +++- lib/intel_chipset.h | 4 +++ lib/intel_device_info.c | 47 +++++++++++++++++++++++++ tests/i915/gem_ccs.c | 4 +-- 5 files changed, 114 insertions(+), 23 deletions(-)
lib/i915/i915_blt.c +56 -20
@@ -208,37 +208,73 @@ bool blt_supports_compression(int i915) }/** -* blt_supports_tiling: +* blt_has_block_copy * @i915: drm fd -* @tiling: tiling id * -* Function checks if blitter supports @tiling on @i915 device. +* Check if block copy is supported by @i915 device * * Returns: * true if it does, false otherwise. */ -bool blt_supports_tiling (int i915,enum blt_tiling_type tiling) +bool blt_has_block_copy (int i915) { -uint32_t devid =intel_get_drm_devid (i915); +const struct blt_cmd_info + *blt_info =intel_get_blt_info (intel_get_drm_devid (i915)); -if (tiling >=T_YFMAJOR ) -return false; +return blt_supports_command (blt_info,XY_BLOCK_COPY ); +} -if (tiling ==T_XMAJOR ) { -if (IS_TIGERLAKE (devid) ||IS_DG1 (devid)) -return false; -else -return true; - } +/** +* blt_has_fast_copy +* @i915: drm fd +* +* Check if fast copy is supported by @i915 device +* +* Returns: +* true if it does, false otherwise. +*/ +bool blt_has_fast_copy (int i915) +{ +const struct blt_cmd_info + *blt_info =intel_get_blt_info (intel_get_drm_devid (i915)); -if (tiling ==T_YMAJOR ) { -if (IS_TIGERLAKE (devid) ||IS_DG1 (devid)) -return true; -else -return false; - } +return blt_supports_command (blt_info,XY_FAST_COPY ); +} + +/** +* blt_fast_copy_supports_tiling +* @i915: drm fd +* @tiling: tiling format +* +* Check if fast copy provided by @i915 device supports @tiling format +* +* Returns: +* true if it does, false otherwise. +*/ +bool blt_fast_copy_supports_tiling (int i915,enum blt_tiling_type tiling) +{ +const struct blt_cmd_info + *blt_info =intel_get_blt_info (intel_get_drm_devid (i915)); + +return blt_cmd_supports_tiling (blt_info,XY_FAST_COPY , tiling); +} + +/** +* blt_block_copy_supports_tiling +* @i915: drm fd +* @tiling: tiling format +* +* Check if block copy provided by @i915 device supports @tiling format +* +* Returns: +* true if it does, false otherwise. +*/ +bool blt_block_copy_supports_tiling (int i915,enum blt_tiling_type tiling) +{ +const struct blt_cmd_info + *blt_info =intel_get_blt_info (intel_get_drm_devid (i915)); -return true; +return blt_cmd_supports_tiling (blt_info,XY_BLOCK_COPY , tiling); }static int __block_tiling (enum blt_tiling_type tiling)
lib/i915/i915_blt.h +5 -1
@@ -158,7 +158,11 @@ struct blt_ctrl_surf_copy_data { };bool blt_supports_compression (int i915); -bool blt_supports_tiling (int i915,enum blt_tiling_type tiling); + +bool blt_has_block_copy (int i915); +bool blt_has_fast_copy (int i915); +bool blt_fast_copy_supports_tiling (int i915,enum blt_tiling_type tiling); +bool blt_block_copy_supports_tiling (int i915,enum blt_tiling_type tiling); uint64_t emit_blt_block_copy(int i915, uint64_t ahnd,
lib/intel_chipset.h +4 -0
@@ -31,6 +31,8 @@#include <pciaccess.h> #include <stdbool.h> +#include "i915/intel_blt_info.h" +#define BIT (x) (1ul <<(x))struct pci_device *intel_get_pci_device (void );
@@ -86,11 +88,13 @@ struct intel_device_info { bool is_alderlake_p : 1; bool is_alderlake_n : 1; bool is_meteorlake : 1; +const struct blt_cmd_info *blt_tiling;const char *codename; };const struct intel_device_info *intel_get_device_info (uint16_t devid) __attribute__((pure)); +const struct blt_cmd_info *intel_get_blt_info (uint16_t devid) __attribute__((pure));unsigned intel_gen (uint16_t devid) __attribute__((pure));unsigned intel_graphics_ver (uint16_t devid) __attribute__((pure));unsigned intel_display_ver (uint16_t devid) __attribute__((pure));
lib/intel_device_info.c +47 -0
221 lines not on this page · raw message
tests/i915/gem_ccs.c +2 -2
@@ -605,7 +605,7 @@ static void block_copy_test(int i915,return ;for_each_tiling (tiling) { -if (!blt_supports_tiling (i915, tiling) || +if (!blt_block_copy_supports_tiling (i915, tiling) || (param.tiling >=0 && param.tiling != tiling))continue ;
@@ -703,7 +703,7 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL) igt_fixture { i915 =drm_open_driver (DRIVER_INTEL );igt_require_gem (i915); -igt_require (AT_LEAST_GEN (intel_get_drm_devid (i915),12 ) >0 ); +igt_require (blt_has_block_copy (i915)); query_info =gem_get_query_memory_regions (i915);igt_require (query_info);
Signature · 1 line
2.25.1
PATCH v4 3/6 lib/i915_blt: Check for Tile-YF in fast_copy
In reply to Karolina StolarekIn older gens Tile4 is not available, we have Tile-YF instead. Check for both tilings when setting up the fast_copy command.
--- lib/i915/i915_blt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
lib/i915/i915_blt.c +7 -2
@@ -326,6 +326,11 @@ static enum blt_aux_mode __aux_mode(const struct blt_copy_object *obj)return AM_AUX_NONE ; } +static bool __new_tile_y_type (enum blt_tiling_type tiling) +{ +return tiling ==T_TILE4 || tiling ==T_YFMAJOR ; +} + static void fill_data(struct gen12_block_copy_data *data, const struct blt_copy_data *blt, uint64_t src_offset, uint64_t dst_offset,
@@ -1016,8 +1021,8 @@ uint64_t emit_blt_fast_copy(int i915, data.dw01.color_depth =__fast_color_depth (blt->color_depth); data.dw01.dst_memory =__memory_type (blt->dst.region); data.dw01.src_memory =__memory_type (blt->src.region); - data.dw01.dst_type_y = blt->dst.tiling ==T_TILE4 ?1 :0 ; - data.dw01.src_type_y = blt->src.tiling ==T_TILE4 ?1 :0 ; + data.dw01.dst_type_y =__new_tile_y_type (blt->dst.tiling) ?1 :0 ; + data.dw01.src_type_y =__new_tile_y_type (blt->src.tiling) ?1 :0 ; data.dw02.dst_x1 = blt->dst.x1; data.dw02.dst_y1 = blt->dst.y1;
Signature · 1 line
2.25.1
PATCH v4 4/6 lib/i915_blt: Add common functions for blt_copy_object
In reply to Karolina Stolarekgem_ccs and gem_lmem_swapping tests share a number of functions. Extract them to i915_blt so they are accessible for both tests. Delete local definitions. Add blt_* prefixes to avoid potential name clash.
--- lib/i915/i915_blt.c | 95 ++++++++++++++++ lib/i915/i915_blt.h | 30 ++++- tests/i915/gem_ccs.c | 196 +++++++++------------------------ tests/i915/gem_lmem_swapping.c | 81 +++----------- 4 files changed, 191 insertions(+), 211 deletions(-)
lib/i915/i915_blt.c +95 -0
@@ -1126,6 +1126,101 @@ int blt_fast_copy(int i915,return ret; } +void blt_set_geom (struct blt_copy_object *obj,uint32_t pitch, +int16_t x1,int16_t y1,int16_t x2,int16_t y2, +uint16_t x_offset,uint16_t y_offset) +{ + obj->pitch = pitch; + obj->x1 = x1; + obj->y1 = y1; + obj->x2 = x2; + obj->y2 = y2; + obj->x_offset = x_offset; + obj->y_offset = y_offset; +} + +void blt_set_batch (struct blt_copy_batch *batch, +uint32_t handle,uint64_t size,uint32_t region) +{ + batch->handle = handle; + batch->size = size; + batch->region = region; +} + +struct blt_copy_object * +blt_create_object (int i915,uint32_t region, +uint32_t width,uint32_t height,uint32_t bpp,uint8_t mocs, +enum blt_tiling_type tiling, +enum blt_compression compression, +enum blt_compression_type compression_type, +bool create_mapping) +{ +struct blt_copy_object *obj; +uint64_t size = width * height * bpp /8 ; +uint32_t stride = tiling ==T_LINEAR ? width *4 : width; +uint32_t handle; + + obj =calloc (1 ,sizeof (*obj)); + + obj->size = size; +igt_assert (__gem_create_in_memory_regions (i915, &handle, + &size, region) ==0 ); + +blt_set_object (obj, handle, size, region, mocs, tiling, + compression, compression_type); +blt_set_geom (obj, stride,0 ,0 , width, height,0 ,0 ); + +if (create_mapping) + obj->ptr =gem_mmap__device_coherent (i915, handle,0 , size, +PROT_READ |PROT_WRITE ); + +return obj; +} + +void blt_destroy_object (int i915,struct blt_copy_object *obj) +{ +if (obj->ptr) +munmap (obj->ptr, obj->size); + +gem_close (i915, obj->handle); +free (obj); +} + +void blt_set_object (struct blt_copy_object *obj, +uint32_t handle,uint64_t size,uint32_t region, +uint8_t mocs,enum blt_tiling_type tiling, +enum blt_compression compression, +enum blt_compression_type compression_type) +{ + obj->handle = handle; + obj->size = size; + obj->region = region; + obj->mocs = mocs; + obj->tiling = tiling; + obj->compression = compression; + obj->compression_type = compression_type; +} + +void blt_set_object_ext (struct blt_block_copy_object_ext *obj, +uint8_t compression_format, +uint16_t surface_width,uint16_t surface_height, +enum blt_surface_type surface_type) +{ + obj->compression_format = compression_format; + obj->surface_width = surface_width; + obj->surface_height = surface_height; + obj->surface_type = surface_type; + +/* Ensure mip tail won't overlap lod */ + obj->mip_tail_start_lod =0xf ; +} + +void blt_set_copy_object (struct blt_copy_object *obj, +const struct blt_copy_object *orig) +{ +memcpy (obj, orig,sizeof (*obj)); +} +/** * blt_surface_fill_rect: * @i915: drm fd
lib/i915/i915_blt.h +28 -2
@@ -202,10 +202,36 @@ int blt_fast_copy(int i915,uint64_t ahnd, const struct blt_copy_data *blt); +void blt_set_geom (struct blt_copy_object *obj,uint32_t pitch, +int16_t x1,int16_t y1,int16_t x2,int16_t y2, +uint16_t x_offset,uint16_t y_offset); +void blt_set_batch (struct blt_copy_batch *batch, +uint32_t handle,uint64_t size,uint32_t region); + +struct blt_copy_object * +blt_create_object (int i915,uint32_t region, +uint32_t width,uint32_t height,uint32_t bpp,uint8_t mocs, +enum blt_tiling_type tiling, +enum blt_compression compression, +enum blt_compression_type compression_type, +bool create_mapping); +void blt_destroy_object (int i915,struct blt_copy_object *obj); +void blt_set_object (struct blt_copy_object *obj, +uint32_t handle,uint64_t size,uint32_t region, +uint8_t mocs,enum blt_tiling_type tiling, +enum blt_compression compression, +enum blt_compression_type compression_type); +void blt_set_object_ext (struct blt_block_copy_object_ext *obj, +uint8_t compression_format, +uint16_t surface_width,uint16_t surface_height, +enum blt_surface_type surface_type); +void blt_set_copy_object (struct blt_copy_object *obj, +const struct blt_copy_object *orig); +void blt_surface_info (const char *info,const struct blt_copy_object *obj);void blt_surface_fill_rect (int i915,const struct blt_copy_object *obj,uint32_t width,uint32_t height);void blt_surface_to_png (int i915,uint32_t run_id,const char *fileid, -const struct blt_copy_object *obj, -uint32_t width,uint32_t height); +const struct blt_copy_object *obj, +uint32_t width,uint32_t height);
tests/i915/gem_ccs.c +51 -145
273 lines not on this page · raw message
tests/i915/gem_lmem_swapping.c +17 -64
123 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v4 5/6 tests/gem_exercise_blt: Add fast-copy test
In reply to Karolina StolarekExercise a basic scenario with two block copies in separate batch buffers.
--- tests/i915/gem_exercise_blt.c | 215 ++++++++++++++++++++++++++++++++++ tests/meson.build | 1 + 2 files changed, 216 insertions(+) create mode 100644 tests/i915/gem_exercise_blt.c
tests/i915/gem_exercise_blt.c new file +215 -0
@@ -0,0 +1,215 @@ +// SPDX-License-Identifier: MIT +/* +* Copyright © 2023 Intel Corporation +*/ + +#include "igt.h" +#include "drm.h" +#include "i915/gem.h" +#include "i915/gem_create.h" +#include "lib/intel_chipset.h" +#include "i915/i915_blt.h" +#include "i915/intel_mocs.h" + +IGT_TEST_DESCRIPTION ("Exercise blitter commands" ); + +static struct param { +int tiling; +bool write_png; +bool print_bb; +bool print_surface_info; +int width; +int height; +} param = { + .tiling =-1 , + .write_png = false, + .print_bb = false, + .print_surface_info = false, + .width =512 , + .height =512 , +}; + +#define PRINT_SURFACE_INFO (name, obj) do { \ + if (param.print_surface_info) \ + blt_surface_info((name), (obj)); } while (0) + +#define WRITE_PNG (fd, id, name, obj, w, h) do { \ + if (param.write_png) \ + blt_surface_to_png((fd), (id), (name), (obj), (w), (h)); } while (0) + +static void fast_copy (int i915,const intel_ctx_t *ctx, +const struct intel_execution_engine2 *e, +uint32_t region1,uint32_t region2, +enum blt_tiling_type mid_tiling) +{ +struct blt_copy_data blt = {}; +struct blt_copy_object *src, *mid, *dst; +const uint32_t bpp =32 ; +uint64_t bb_size =4096 ; +uint64_t ahnd =intel_allocator_open_full (i915, ctx->id,0 ,0 , +INTEL_ALLOCATOR_SIMPLE , +ALLOC_STRATEGY_LOW_TO_HIGH ,0 ); +uint32_t bb; +uint32_t width = param.width, height = param.height; +int result; + +igt_assert (__gem_create_in_memory_regions (i915, &bb, &bb_size, region1) ==0 ); + + src =blt_create_object (i915, region1, width, height, bpp,0 , +T_LINEAR ,COMPRESSION_DISABLED ,0 , true); + mid =blt_create_object (i915, region2, width, height, bpp,0 , + mid_tiling,COMPRESSION_DISABLED ,0 , true); + dst =blt_create_object (i915, region1, width, height, bpp,0 , +T_LINEAR ,COMPRESSION_DISABLED ,0 , true); +igt_assert (src->size == dst->size); + +blt_surface_fill_rect (i915, src, width, height); + +memset (&blt,0 ,sizeof (blt)); + blt.color_depth = CD_32bit; + blt.print_bb = param.print_bb; +blt_set_copy_object (&blt.src, src); +blt_set_copy_object (&blt.dst, mid); +blt_set_batch (&blt.bb, bb, bb_size, region1); + +blt_fast_copy (i915, ctx, e, ahnd, &blt); +gem_sync (i915, mid->handle); + +WRITE_PNG (i915, mid_tiling,"src" , &blt.src, width, height); +WRITE_PNG (i915, mid_tiling,"mid" , &blt.dst, width, height); + +memset (&blt,0 ,sizeof (blt)); + blt.color_depth = CD_32bit; + blt.print_bb = param.print_bb; +blt_set_copy_object (&blt.src, mid); +blt_set_copy_object (&blt.dst, dst); +blt_set_batch (&blt.bb, bb, bb_size, region1); + +blt_fast_copy (i915, ctx, e, ahnd, &blt); +gem_sync (i915, blt.dst.handle); + +WRITE_PNG (i915, mid_tiling,"dst" , &blt.dst, width, height); + + result =memcmp (src->ptr, blt.dst.ptr, src->size); + +blt_destroy_object (i915, src); +blt_destroy_object (i915, mid); +blt_destroy_object (i915, dst); +gem_close (i915, bb); +put_ahnd (ahnd); + +igt_assert_f (!result,"source and destination surfaces differs!\n" ); +} + +static void fast_copy_test (int i915, +const intel_ctx_t *ctx, +struct igt_collection *set) +{ +struct igt_collection *regions; +const struct intel_execution_engine2 *e; +int tiling; + +for_each_tiling (tiling) { +if (!blt_fast_copy_supports_tiling (i915, tiling)) +continue ; + +for_each_ctx_engine (i915, ctx, e) { +if (e->class !=I915_ENGINE_CLASS_COPY ) +continue ; +for_each_variation_r (regions,2 , set) { +uint32_t region1, region2; +char *regtxt; + + region1 =igt_collection_get_value (regions,0 ); + region2 =igt_collection_get_value (regions,1 ); + regtxt =memregion_dynamic_subtest_name (regions); + +igt_dynamic_f ("%s-%s" , + blt_tiling_name(tiling), regtxt) { +fast_copy (i915, ctx, e, + region1, region2, + tiling); + } + +free (regtxt); + } + } + } +} + +static int opt_handler (int opt,int opt_index,void *data) +{ +switch (opt) { +case 'b' : + param.print_bb = true; +igt_debug ("Print bb: %d\n" , param.print_bb); +break ; +case 'p' : + param.write_png = true; +igt_debug ("Write png: %d\n" , param.write_png); +break ; +case 's' : + param.print_surface_info = true; +igt_debug ("Print surface info: %d\n" , param.print_surface_info); +break ; +case 't' : + param.tiling =atoi (optarg); +igt_debug ("Tiling: %d\n" , param.tiling); +break ; +case 'W' : + param.width =atoi (optarg); +igt_debug ("Width: %d\n" , param.width); +break ; +case 'H' : + param.height =atoi (optarg); +igt_debug ("Height: %d\n" , param.height); +break ; +default : +return IGT_OPT_HANDLER_ERROR ; + } + +return IGT_OPT_HANDLER_SUCCESS ; +} + +const char *help_str = +" -b\tPrint bb\n" +" -p\tWrite PNG\n" +" -s\tPrint surface info\n" +" -t\tTiling format (0 - linear, 1 - XMAJOR, 2 - YMAJOR, 3 - TILE4, 4 - TILE64, 5 - YFMAJOR)\n" +" -W\tWidth (default 512)\n" +" -H\tHeight (default 512)" + ; + +igt_main_args("b:pst:W:H:", NULL, help_str, opt_handler, NULL) +{ +struct drm_i915_query_memory_regions *query_info; +struct igt_collection *set; +const intel_ctx_t *ctx; +int i915; +igt_hang_t hang; + + igt_fixture { + i915 =drm_open_driver (DRIVER_INTEL ); +igt_require_gem (i915); +igt_require (blt_has_fast_copy (i915)); + + query_info =gem_get_query_memory_regions (i915); +igt_require (query_info); + + set =get_memory_region_set (query_info, +I915_SYSTEM_MEMORY , +I915_DEVICE_MEMORY ); + ctx =intel_ctx_create_all_physical (i915); + hang =igt_allow_hang (i915, ctx->id,0 ); + } + +igt_describe ("Check fast-copy blit" ); + igt_subtest_with_dynamic("fast-copy") { +fast_copy_test (i915, ctx, set); + } + + igt_fixture { +igt_disallow_hang (i915, hang); +close (i915); + } +}
tests/meson.build +1 -0
@@ -129,6 +129,7 @@ i915_progs = [ 'gem_exec_nop', 'gem_exec_parallel', 'gem_exec_params', + 'gem_exercise_blt', 'gen7_exec_parse', 'gen9_exec_parse', 'gem_exec_reloc',
Signature · 1 line
2.25.1
PATCH v4 6/6 tests/gem_exercise_blt: Add fast-copy-emit test
In reply to Karolina StolarekAdd a subtest where two fast copy commands are executed within the single batch buffer.
--- tests/i915/gem_exercise_blt.c | 184 ++++++++++++++++++++++++++++++++-- 1 file changed, 178 insertions(+), 6 deletions(-)
tests/i915/gem_exercise_blt.c +178 -6
@@ -37,6 +37,146 @@ static struct param {if (param.write_png) \blt_surface_to_png ((fd), (id), (name), (obj), (w), (h)); }while (0 ) +struct blt_fast_copy_data { +int i915; +struct blt_copy_object src; +struct blt_copy_object mid; +struct blt_copy_object dst; + +struct blt_copy_batch bb; +enum blt_color_depth color_depth; + +/* debug stuff */ +bool print_bb; +}; + +static int fast_copy_one_bb (int i915, +const intel_ctx_t *ctx, +const struct intel_execution_engine2 *e, +uint64_t ahnd, +const struct blt_fast_copy_data *blt) +{ +struct drm_i915_gem_execbuffer2 execbuf = {}; +struct drm_i915_gem_exec_object2 obj[4 ] = {}; +struct blt_copy_data blt_tmp; +uint64_t src_offset, mid_offset, dst_offset, bb_offset, alignment; +uint64_t bb_pos =0 ; +uint32_t flags; +int ret; + + alignment =gem_detect_safe_alignment (i915); + + src_offset =get_offset (ahnd, blt->src.handle, blt->src.size, alignment); + mid_offset =get_offset (ahnd, blt->mid.handle, blt->mid.size, alignment); + dst_offset =get_offset (ahnd, blt->dst.handle, blt->dst.size, alignment); + bb_offset =get_offset (ahnd, blt->bb.handle, blt->bb.size, alignment); + +/* First blit */ +memset (&blt_tmp,0 ,sizeof (blt_tmp)); + blt_tmp.src = blt->src; + blt_tmp.dst = blt->mid; + blt_tmp.bb = blt->bb; + blt_tmp.color_depth = blt->color_depth; + blt_tmp.print_bb = blt->print_bb; + bb_pos =emit_blt_fast_copy (i915, ahnd, &blt_tmp, bb_pos, false); + +/* Second blit */ +memset (&blt_tmp,0 ,sizeof (blt_tmp)); + blt_tmp.src = blt->mid; + blt_tmp.dst = blt->dst; + blt_tmp.bb = blt->bb; + blt_tmp.color_depth = blt->color_depth; + blt_tmp.print_bb = blt->print_bb; + bb_pos =emit_blt_fast_copy (i915, ahnd, &blt_tmp, bb_pos, true); + + flags =EXEC_OBJECT_PINNED |EXEC_OBJECT_SUPPORTS_48B_ADDRESS ; + + obj[0 ].handle = blt->src.handle; + obj[0 ].offset =CANONICAL (src_offset); + obj[0 ].flags = flags; + + obj[1 ].handle = blt->mid.handle; + obj[1 ].offset =CANONICAL (mid_offset); + obj[1 ].flags = flags; + + obj[2 ].handle = blt->dst.handle; + obj[2 ].offset =CANONICAL (dst_offset); + obj[2 ].flags = flags |EXEC_OBJECT_WRITE ; + + obj[3 ].handle = blt->bb.handle; + obj[3 ].offset =CANONICAL (bb_offset); + obj[3 ].flags = flags; + + execbuf.buffer_count =4 ; + execbuf.buffers_ptr =to_user_pointer (obj); + execbuf.rsvd1 = ctx ? ctx->id :0 ; + execbuf.flags = e ? e->flags :I915_EXEC_BLT ; + ret =__gem_execbuf (i915, &execbuf); + +gem_sync (i915, blt->bb.handle); + +return ret; +} + +static void fast_copy_emit (int i915,const intel_ctx_t *ctx, +const struct intel_execution_engine2 *e, +uint32_t region1,uint32_t region2, +enum blt_tiling_type mid_tiling) +{ +struct blt_fast_copy_data blt = {}; +struct blt_copy_object *src, *mid, *dst; +const uint32_t bpp =32 ; +uint64_t bb_size =4096 ; +uint64_t ahnd =intel_allocator_open_full (i915, ctx->id,0 ,0 , +INTEL_ALLOCATOR_SIMPLE , +ALLOC_STRATEGY_LOW_TO_HIGH ,0 ); +uint32_t bb, width = param.width, height = param.height; +int result; + +igt_assert (__gem_create_in_memory_regions (i915, &bb, &bb_size, region1) ==0 ); + + src =blt_create_object (i915, region1, width, height, bpp,0 , +T_LINEAR ,COMPRESSION_DISABLED ,0 , true); + mid =blt_create_object (i915, region2, width, height, bpp,0 , + mid_tiling,COMPRESSION_DISABLED ,0 , true); + dst =blt_create_object (i915, region1, width, height, bpp,0 , +T_LINEAR ,COMPRESSION_DISABLED ,0 , true); +igt_assert (src->size == dst->size); + +PRINT_SURFACE_INFO ("src" , src); +PRINT_SURFACE_INFO ("mid" , mid); +PRINT_SURFACE_INFO ("dst" , dst); + +blt_surface_fill_rect (i915, src, width, height); +WRITE_PNG (i915, mid_tiling,"src" , src, width, height); + +memset (&blt,0 ,sizeof (blt)); + blt.color_depth = CD_32bit; + blt.print_bb = param.print_bb; +blt_set_copy_object (&blt.src, src); +blt_set_copy_object (&blt.mid, mid); +blt_set_copy_object (&blt.dst, dst); +blt_set_batch (&blt.bb, bb, bb_size, region1); + +fast_copy_one_bb (i915, ctx, e, ahnd, &blt); +gem_sync (i915, blt.dst.handle); + +WRITE_PNG (i915, mid_tiling,"mid" , &blt.mid, width, height); +WRITE_PNG (i915, mid_tiling,"dst" , &blt.dst, width, height); + + result =memcmp (src->ptr, blt.dst.ptr, src->size); + +blt_destroy_object (i915, src); +blt_destroy_object (i915, mid); +blt_destroy_object (i915, dst); +gem_close (i915, bb); +put_ahnd (ahnd); + +munmap (&bb, bb_size); + +igt_assert_f (!result,"source and destination surfaces differs!\n" ); +} + static void fast_copy(int i915, const intel_ctx_t *ctx, const struct intel_execution_engine2 *e, uint32_t region1, uint32_t region2,
@@ -101,12 +241,36 @@ static void fast_copy(int i915, const intel_ctx_t *ctx,igt_assert_f (!result,"source and destination surfaces differs!\n" ); } +enum fast_copy_func { +FAST_COPY , +FAST_COPY_EMIT +}; + +static char + *full_subtest_str (char *regtxt,enum blt_tiling_type tiling, +enum fast_copy_func func) +{ +char *name; +uint32_t len; + + len =asprintf (&name,"%s-%s%s" ,blt_tiling_name (tiling), regtxt, + func ==FAST_COPY_EMIT ?"-emit" :"" ); + +igt_assert_f (len >=0 ,"asprintf failed!\n" ); + +return name; +} +static void fast_copy_test (int i915,const intel_ctx_t *ctx, -struct igt_collection *set) +struct igt_collection *set, +enum fast_copy_func func) {struct igt_collection *regions;const struct intel_execution_engine2 *e; +void (*copy_func)(int i915,const intel_ctx_t *ctx, +const struct intel_execution_engine2 *e, +uint32_t r1,uint32_t r2,enum blt_tiling_type tiling);int tiling;for_each_tiling (tiling) {
@@ -118,20 +282,23 @@ static void fast_copy_test(int i915,continue ;for_each_variation_r (regions,2 , set) {uint32_t region1, region2; -char *regtxt; +char *regtxt, *test_name; region1 =igt_collection_get_value (regions,0 ); region2 =igt_collection_get_value (regions,1 ); + + copy_func = (func ==FAST_COPY ) ? fast_copy : fast_copy_emit; regtxt =memregion_dynamic_subtest_name (regions); + test_name =full_subtest_str (regtxt, tiling, func); -igt_dynamic_f ("%s-%s" , - blt_tiling_name(tiling), regtxt) { -fast_copy (i915, ctx, e, + igt_dynamic_f("%s", test_name) { +copy_func (i915, ctx, e, region1, region2, tiling); }free (regtxt); +free (test_name); } } }
@@ -205,7 +372,12 @@ igt_main_args("b:pst:W:H:", NULL, help_str, opt_handler, NULL)igt_describe ("Check fast-copy blit" ); igt_subtest_with_dynamic("fast-copy") { -fast_copy_test (i915, ctx, set); +fast_copy_test (i915, ctx, set,FAST_COPY ); + } + +igt_describe ("Check multiple fast-copy in one batch" ); + igt_subtest_with_dynamic("fast-copy-emit") { +fast_copy_test (i915, ctx, set,FAST_COPY_EMIT ); } igt_fixture {
Signature · 1 line
2.25.1
Patchwork
CI[igt-dev] ✗ Fi.CI.BUILD: failure for Introduce blt_cmd_info struct (rev4)
In reply to Karolina Stolarek== Series Details ==
== Series Details ==
Series: Introduce blt_cmd_info struct (rev4)
URL : https://patchwork.freedesktop.org/series/112055/
State : failure
== Summary ==
Applying: i915/lib: Add new library for blitter and tiling formats
Applying: lib: Update platform definitions with blitter information
Applying: lib/i915_blt: Check for Tile-YF in fast_copy
Applying: lib/i915_blt: Add common functions for blt_copy_object Using index info to reconstruct a base tree...
M tests/i915/gem_ccs.c
Falling back to patching base and 3-way merge...
Auto-merging tests/i915/gem_ccs.c
CONFLICT (content): Merge conflict in tests/i915/gem_ccs.c Patch failed at 0004 lib/i915_blt: Add common functions for blt_copy_object When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".