[PATCH i-g-t v5 5/5] tests/xe_exercise_blt: Exercise small to large fast-copy blits
Zbigniew Kempczyński
zbigniew.kempczynski at intel.com
Thu Feb 8 20:15:35 UTC 2024
On Thu, Feb 08, 2024 at 07:23:23PM +0100, Kamil Konieczny wrote:
> Hi Zbigniew,
> On 2024-02-01 at 21:03:12 +0100, Zbigniew Kempczyński wrote:
> > Testing blitter with large size like 512x512 may be not enough
> > to verify small or unaligned blits works properly. Add subtest
> > which spread fast-copy blits from small to large.
>
> This is now working for only squares which may be a little limited.
> Consider adding new subtest with randomized rectangles for testing
> and a limit for max few seconds for run.
>
> Second concern is whole test could take over 20 seconds but that
> could be addressed later, for example splitting these into four tests:
> linear-
> xmajor-
> tile4-
> tile64-
I like idea of adding random subtest to avoid square scenario.
I'm going to add it after merging this series as my primary goal for
now is to extend different sizes testing.
>
> >
> > Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
> > Cc: Karolina Drobnik <karolina.drobnik at intel.com>
>
> LGTM,
> Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Thank you for the review.
--
Zbigniew
>
> --
> Kamil
>
> > ---
> > v5: Remove double whitespace line (Karolina)
> > ---
> > tests/intel/xe_exercise_blt.c | 62 ++++++++++++++++++++++++++++-------
> > 1 file changed, 51 insertions(+), 11 deletions(-)
> >
> > diff --git a/tests/intel/xe_exercise_blt.c b/tests/intel/xe_exercise_blt.c
> > index ddf9d188a7..253edec7fa 100644
> > --- a/tests/intel/xe_exercise_blt.c
> > +++ b/tests/intel/xe_exercise_blt.c
> > @@ -25,6 +25,10 @@
> > * Check fast-copy blit
> > * blitter
> > *
> > + * SUBTEST: fast-copy-inc-dimension
> > + * Description:
> > + * Check fast-copy blit with sizes from small to large
> > + *
> > * SUBTEST: fast-copy-emit
> > * Description:
> > * Check multiple fast-copy in one batch
> > @@ -40,6 +44,8 @@ static struct param {
> > bool print_surface_info;
> > int width;
> > int height;
> > + int width_increment;
> > + int width_steps;
> > } param = {
> > .tiling = -1,
> > .write_png = false,
> > @@ -111,6 +117,7 @@ static int fast_copy_one_bb(int xe,
> > }
> >
> > static void fast_copy_emit(int xe, const intel_ctx_t *ctx,
> > + uint32_t width, uint32_t height,
> > uint32_t region1, uint32_t region2,
> > enum blt_tiling_type mid_tiling)
> > {
> > @@ -122,7 +129,7 @@ static void fast_copy_emit(int xe, const intel_ctx_t *ctx,
> > uint64_t ahnd = intel_allocator_open_full(xe, ctx->vm, 0, 0,
> > INTEL_ALLOCATOR_SIMPLE,
> > ALLOC_STRATEGY_LOW_TO_HIGH, 0);
> > - uint32_t bb, width = param.width, height = param.height;
> > + uint32_t bb;
> > int result;
> >
> > bb = xe_bo_create(xe, 0, bb_size, region1, 0);
> > @@ -170,6 +177,7 @@ static void fast_copy_emit(int xe, const intel_ctx_t *ctx,
> > }
> >
> > static void fast_copy(int xe, const intel_ctx_t *ctx,
> > + uint32_t width, uint32_t height,
> > uint32_t region1, uint32_t region2,
> > enum blt_tiling_type mid_tiling)
> > {
> > @@ -181,7 +189,6 @@ static void fast_copy(int xe, const intel_ctx_t *ctx,
> > INTEL_ALLOCATOR_SIMPLE,
> > ALLOC_STRATEGY_LOW_TO_HIGH, 0);
> > uint32_t bb;
> > - uint32_t width = param.width, height = param.height;
> > int result;
> >
> > bb = xe_bo_create(xe, 0, bb_size, region1, 0);
> > @@ -241,14 +248,20 @@ enum fast_copy_func {
> > };
> >
> > static char
> > - *full_subtest_str(char *regtxt, enum blt_tiling_type tiling,
> > + *full_subtest_str(char *regtxt, uint32_t width, uint32_t height,
> > + 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" : "");
> > + if (!width || !height)
> > + len = asprintf(&name, "%s-%s%s", blt_tiling_name(tiling), regtxt,
> > + func == FAST_COPY_EMIT ? "-emit" : "");
> > + else
> > + len = asprintf(&name, "%s-%s%s-%ux%u", blt_tiling_name(tiling), regtxt,
> > + func == FAST_COPY_EMIT ? "-emit" : "",
> > + width, height);
> >
> > igt_assert_f(len >= 0, "asprintf failed!\n");
> >
> > @@ -264,6 +277,7 @@ static void fast_copy_test(int xe,
> > };
> > struct igt_collection *regions;
> > void (*copy_func)(int xe, const intel_ctx_t *ctx,
> > + uint32_t width, uint32_t height,
> > uint32_t r1, uint32_t r2, enum blt_tiling_type tiling);
> > intel_ctx_t *ctx;
> > int tiling;
> > @@ -286,16 +300,32 @@ static void fast_copy_test(int xe,
> >
> > copy_func = (func == FAST_COPY) ? fast_copy : fast_copy_emit;
> > regtxt = xe_memregion_dynamic_subtest_name(xe, regions);
> > - test_name = full_subtest_str(regtxt, tiling, func);
> >
> > - igt_dynamic_f("%s", test_name) {
> > - copy_func(xe, ctx,
> > - region1, region2,
> > - tiling);
> > + if (!param.width_increment) {
> > + test_name = full_subtest_str(regtxt, 0, 0, tiling, func);
> > + igt_dynamic_f("%s", test_name) {
> > + copy_func(xe, ctx,
> > + param.width, param.height,
> > + region1, region2,
> > + tiling);
> > + }
> > + free(test_name);
> > + } else {
> > + for (int w = param.width;
> > + w < param.width + param.width_steps;
> > + w += param.width_increment) {
> > + test_name = full_subtest_str(regtxt, w, w, tiling, func);
> > + igt_dynamic_f("%s", test_name) {
> > + copy_func(xe, ctx,
> > + w, w,
> > + region1, region2,
> > + tiling);
> > + }
> > + free(test_name);
> > + }
> > }
> >
> > free(regtxt);
> > - free(test_name);
> > xe_exec_queue_destroy(xe, exec_queue);
> > xe_vm_destroy(xe, vm);
> > free(ctx);
> > @@ -367,6 +397,16 @@ igt_main_args("b:pst:W:H:", NULL, help_str, opt_handler, NULL)
> > fast_copy_test(xe, set, FAST_COPY);
> > }
> >
> > + igt_describe("Check fast-copy with increment width/height");
> > + igt_subtest_with_dynamic("fast-copy-inc-dimension") {
> > + param.width = 1;
> > + param.height = 1;
> > + param.width_increment = 15;
> > + param.width_steps = 512;
> > +
> > + fast_copy_test(xe, set, FAST_COPY);
> > + }
> > +
> > igt_describe("Check multiple fast-copy in one batch");
> > igt_subtest_with_dynamic("fast-copy-emit") {
> > fast_copy_test(xe, set, FAST_COPY_EMIT);
> > --
> > 2.34.1
> >
More information about the igt-dev
mailing list