[igt-dev] [PATCH i-g-t] tests/gem_ccs: Remove inplace subtests

[igt-dev] [PATCH i-g-t] tests/gem_ccs: Remove inplace subtests

[Karolina Stolarek]

block-copy-inplace and block-multicopy-inplace attempt to
decompress and detile in place, that is the destination surface
is the mid surface. When working in full resolve mode of operation,
the tiling format has to be the same for source and destination
surfaces. We can't use different tiling formats, which defeats the
purpose of these tests.

Remove the tests where we try to reuse the mid surface. Remove
references to igt_hang_t, as without inplace subtests we expect
to see no GPU hangs.

Signed-off-by: Karolina Stolarek <karolina.stolarek@intel.com>
---
 tests/i915/gem_ccs.c | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c
index b7e8bda7..34408db9 100644
--- a/tests/i915/gem_ccs.c
+++ b/tests/i915/gem_ccs.c
@@ -38,7 +38,6 @@ static struct param {
 
 struct test_config {
 	bool compression;
-	bool inplace;
 	bool surfcopy;
 	bool new_ctx;
 	bool suspend_resume;
@@ -423,11 +422,6 @@ static void block_copy(int i915,
 	blt_set_copy_object(&blt.dst, dst);
 	blt_set_object_ext(&ext.src, mid_compression_format, width, height, SURFACE_TYPE_2D);
 	blt_set_object_ext(&ext.dst, 0, width, height, SURFACE_TYPE_2D);
-	if (config->inplace) {
-		blt_set_object(&blt.dst, mid->handle, dst->size, mid->region, 0,
-			       T_LINEAR, COMPRESSION_DISABLED, comp_type);
-		blt.dst.ptr = mid->ptr;
-	}
 
 	blt_set_batch(&blt.bb, bb, bb_size, region1);
 	blt_block_copy(i915, ctx, e, ahnd, &blt, pext);
@@ -496,13 +490,6 @@ static void block_multicopy(int i915,
 	blt_set_copy_object(&blt3.dst, dst);
 	blt_set_copy_object(&blt3.final, final);
 
-	if (config->inplace) {
-		blt_set_object(&blt3.dst, mid->handle, dst->size, mid->region,
-			       mid->mocs, mid_tiling, COMPRESSION_DISABLED,
-			       comp_type);
-		blt3.dst.ptr = mid->ptr;
-	}
-
 	blt_set_object_ext(&ext3.src, 0, width, height, SURFACE_TYPE_2D);
 	blt_set_object_ext(&ext3.mid, mid_compression_format, width, height, SURFACE_TYPE_2D);
 	blt_set_object_ext(&ext3.dst, 0, width, height, SURFACE_TYPE_2D);
@@ -513,8 +500,7 @@ static void block_multicopy(int i915,
 	gem_sync(i915, blt3.final.handle);
 
 	WRITE_PNG(i915, run_id, "src", &blt3.src, width, height);
-	if (!config->inplace)
-		WRITE_PNG(i915, run_id, "mid", &blt3.mid, width, height);
+	WRITE_PNG(i915, run_id, "mid", &blt3.mid, width, height);
 	WRITE_PNG(i915, run_id, "dst", &blt3.dst, width, height);
 	WRITE_PNG(i915, run_id, "final", &blt3.final, width, height);
 
@@ -559,9 +545,6 @@ static void block_copy_test(int i915,
 	if (config->compression && !blt_block_copy_supports_compression(i915))
 		return;
 
-	if (config->inplace && !config->compression)
-		return;
-
 	for_each_tiling(tiling) {
 		if (!blt_block_copy_supports_tiling(i915, tiling) ||
 		    (param.tiling >= 0 && param.tiling != tiling))
@@ -656,7 +639,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 	struct igt_collection *set;
 	const intel_ctx_t *ctx;
 	int i915;
-	igt_hang_t hang;
 
 	igt_fixture {
 		i915 = drm_open_driver(DRIVER_INTEL);
@@ -670,7 +652,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 					    I915_SYSTEM_MEMORY,
 					    I915_DEVICE_MEMORY);
 		ctx = intel_ctx_create_all_physical(i915);
-		hang = igt_allow_hang(i915, ctx->id, 0);
 	}
 
 	igt_describe("Check block-copy uncompressed blit");
@@ -694,22 +675,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 		block_copy_test(i915, &config, ctx, set, BLOCK_MULTICOPY);
 	}
 
-	igt_describe("Check block-copy flatccs inplace decompression blit");
-	igt_subtest_with_dynamic("block-copy-inplace") {
-		struct test_config config = { .compression = true,
-					      .inplace = true };
-
-		block_copy_test(i915, &config, ctx, set, BLOCK_COPY);
-	}
-
-	igt_describe("Check block-multicopy flatccs inplace decompression blit");
-	igt_subtest_with_dynamic("block-multicopy-inplace") {
-		struct test_config config = { .compression = true,
-					      .inplace = true };
-
-		block_copy_test(i915, &config, ctx, set, BLOCK_MULTICOPY);
-	}
-
 	igt_describe("Check flatccs data can be copied from/to surface");
 	igt_subtest_with_dynamic("ctrl-surf-copy") {
 		struct test_config config = { .compression = true,
@@ -738,7 +703,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 	}
 
 	igt_fixture {
-		igt_disallow_hang(i915, hang);
 		close(i915);
 	}
 }
-- 
2.25.1

[igt-dev] ✗ Fi.CI.BAT: failure for tests/gem_ccs: Remove inplace subtests

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 2030 bytes --]

== Series Details ==

Series: tests/gem_ccs: Remove inplace subtests
URL   : https://patchwork.freedesktop.org/series/114563/
State : failure

== Summary ==

CI Bug Log - changes from IGT_7178 -> IGTPW_8554
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with IGTPW_8554 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_8554, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

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

Participating hosts (39 -> 3)
------------------------------

  ERROR: It appears as if the changes made in IGTPW_8554 prevented too many machines from booting.

  Missing    (36): fi-rkl-11600 bat-adls-5 bat-dg1-5 bat-adlp-6 fi-apl-guc fi-snb-2520m fi-pnv-d510 bat-rpls-1 bat-rpls-2 fi-blb-e6850 fi-skl-6600u fi-bsw-n3050 bat-dg2-8 bat-adlm-1 bat-dg2-9 fi-ilk-650 fi-hsw-4770 bat-adln-1 fi-ivb-3770 bat-jsl-3 bat-rplp-1 fi-elk-e7500 bat-dg2-11 fi-bsw-nick fi-kbl-7567u bat-dg1-7 bat-kbl-2 bat-adlp-9 fi-skl-guc fi-cfl-8700k fi-glk-j4005 bat-jsl-1 fi-cfl-guc fi-kbl-guc fi-kbl-x1275 fi-cfl-8109u 


Changes
-------

  No changes found


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

  * CI: CI-20190529 -> None
  * IGT: IGT_7178 -> IGTPW_8554
  * Linux: CI_DRM_12798 -> CI_DRM_12801

  CI-20190529: 20190529
  CI_DRM_12798: 6c2064dddd9ef900a337f7bbbfa2d5c712950242 @ git://anongit.freedesktop.org/gfx-ci/linux
  CI_DRM_12801: 6695d34a4e09a2371e6ad8a2ea8644bfa901744e @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_8554: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8554/index.html
  IGT_7178: ffe3f6670b91ab975f90799ab3fd0941b6eae019 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git


Testlist changes
----------------

+++ 0 lines
--- 789 lines

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8554/index.html

[-- Attachment #2: Type: text/html, Size: 2635 bytes --]

Re: [igt-dev] [PATCH i-g-t] tests/gem_ccs: Remove inplace subtests

[Zbigniew Kempczyński]

On Thu, Mar 02, 2023 at 12:39:46PM +0100, Karolina Stolarek wrote:
> block-copy-inplace and block-multicopy-inplace attempt to
> decompress and detile in place, that is the destination surface
> is the mid surface. When working in full resolve mode of operation,
> the tiling format has to be the same for source and destination
> surfaces. We can't use different tiling formats, which defeats the
> purpose of these tests.
> 
> Remove the tests where we try to reuse the mid surface. Remove
> references to igt_hang_t, as without inplace subtests we expect
> to see no GPU hangs.
> 
> Signed-off-by: Karolina Stolarek <karolina.stolarek@intel.com>
> ---
>  tests/i915/gem_ccs.c | 38 +-------------------------------------
>  1 file changed, 1 insertion(+), 37 deletions(-)
> 
> diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c
> index b7e8bda7..34408db9 100644
> --- a/tests/i915/gem_ccs.c
> +++ b/tests/i915/gem_ccs.c
> @@ -38,7 +38,6 @@ static struct param {
>  
>  struct test_config {
>  	bool compression;
> -	bool inplace;
>  	bool surfcopy;
>  	bool new_ctx;
>  	bool suspend_resume;
> @@ -423,11 +422,6 @@ static void block_copy(int i915,
>  	blt_set_copy_object(&blt.dst, dst);
>  	blt_set_object_ext(&ext.src, mid_compression_format, width, height, SURFACE_TYPE_2D);
>  	blt_set_object_ext(&ext.dst, 0, width, height, SURFACE_TYPE_2D);
> -	if (config->inplace) {
> -		blt_set_object(&blt.dst, mid->handle, dst->size, mid->region, 0,
> -			       T_LINEAR, COMPRESSION_DISABLED, comp_type);
> -		blt.dst.ptr = mid->ptr;
> -	}
>  
>  	blt_set_batch(&blt.bb, bb, bb_size, region1);
>  	blt_block_copy(i915, ctx, e, ahnd, &blt, pext);
> @@ -496,13 +490,6 @@ static void block_multicopy(int i915,
>  	blt_set_copy_object(&blt3.dst, dst);
>  	blt_set_copy_object(&blt3.final, final);
>  
> -	if (config->inplace) {
> -		blt_set_object(&blt3.dst, mid->handle, dst->size, mid->region,
> -			       mid->mocs, mid_tiling, COMPRESSION_DISABLED,
> -			       comp_type);
> -		blt3.dst.ptr = mid->ptr;
> -	}
> -
>  	blt_set_object_ext(&ext3.src, 0, width, height, SURFACE_TYPE_2D);
>  	blt_set_object_ext(&ext3.mid, mid_compression_format, width, height, SURFACE_TYPE_2D);
>  	blt_set_object_ext(&ext3.dst, 0, width, height, SURFACE_TYPE_2D);
> @@ -513,8 +500,7 @@ static void block_multicopy(int i915,
>  	gem_sync(i915, blt3.final.handle);
>  
>  	WRITE_PNG(i915, run_id, "src", &blt3.src, width, height);
> -	if (!config->inplace)
> -		WRITE_PNG(i915, run_id, "mid", &blt3.mid, width, height);
> +	WRITE_PNG(i915, run_id, "mid", &blt3.mid, width, height);
>  	WRITE_PNG(i915, run_id, "dst", &blt3.dst, width, height);
>  	WRITE_PNG(i915, run_id, "final", &blt3.final, width, height);
>  
> @@ -559,9 +545,6 @@ static void block_copy_test(int i915,
>  	if (config->compression && !blt_block_copy_supports_compression(i915))
>  		return;
>  
> -	if (config->inplace && !config->compression)
> -		return;
> -
>  	for_each_tiling(tiling) {
>  		if (!blt_block_copy_supports_tiling(i915, tiling) ||
>  		    (param.tiling >= 0 && param.tiling != tiling))
> @@ -656,7 +639,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  	struct igt_collection *set;
>  	const intel_ctx_t *ctx;
>  	int i915;
> -	igt_hang_t hang;
>  
>  	igt_fixture {
>  		i915 = drm_open_driver(DRIVER_INTEL);
> @@ -670,7 +652,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  					    I915_SYSTEM_MEMORY,
>  					    I915_DEVICE_MEMORY);
>  		ctx = intel_ctx_create_all_physical(i915);
> -		hang = igt_allow_hang(i915, ctx->id, 0);
>  	}
>  
>  	igt_describe("Check block-copy uncompressed blit");
> @@ -694,22 +675,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  		block_copy_test(i915, &config, ctx, set, BLOCK_MULTICOPY);
>  	}
>  
> -	igt_describe("Check block-copy flatccs inplace decompression blit");
> -	igt_subtest_with_dynamic("block-copy-inplace") {
> -		struct test_config config = { .compression = true,
> -					      .inplace = true };
> -
> -		block_copy_test(i915, &config, ctx, set, BLOCK_COPY);
> -	}
> -
> -	igt_describe("Check block-multicopy flatccs inplace decompression blit");
> -	igt_subtest_with_dynamic("block-multicopy-inplace") {
> -		struct test_config config = { .compression = true,
> -					      .inplace = true };
> -
> -		block_copy_test(i915, &config, ctx, set, BLOCK_MULTICOPY);
> -	}
> -

No. This one uses resolve with same tiling so it should stay.
Get rid of block-copy-inplace only.

--
Zbigniew

>  	igt_describe("Check flatccs data can be copied from/to surface");
>  	igt_subtest_with_dynamic("ctrl-surf-copy") {
>  		struct test_config config = { .compression = true,
> @@ -738,7 +703,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  	}
>  
>  	igt_fixture {
> -		igt_disallow_hang(i915, hang);
>  		close(i915);
>  	}
>  }
> -- 
> 2.25.1
> 

Re: [igt-dev] [PATCH i-g-t] tests/gem_ccs: Remove inplace subtests

[Karolina Stolarek]

On 3.03.2023 08:17, Zbigniew Kempczyński wrote:
> On Thu, Mar 02, 2023 at 12:39:46PM +0100, Karolina Stolarek wrote:
>> block-copy-inplace and block-multicopy-inplace attempt to
>> decompress and detile in place, that is the destination surface
>> is the mid surface. When working in full resolve mode of operation,
>> the tiling format has to be the same for source and destination
>> surfaces. We can't use different tiling formats, which defeats the
>> purpose of these tests.
>>
>> Remove the tests where we try to reuse the mid surface. Remove
>> references to igt_hang_t, as without inplace subtests we expect
>> to see no GPU hangs.
>>
>> Signed-off-by: Karolina Stolarek <karolina.stolarek@intel.com>
>> ---
>>   tests/i915/gem_ccs.c | 38 +-------------------------------------
>>   1 file changed, 1 insertion(+), 37 deletions(-)
>>
>> diff --git a/tests/i915/gem_ccs.c b/tests/i915/gem_ccs.c
>> index b7e8bda7..34408db9 100644
>> --- a/tests/i915/gem_ccs.c
>> +++ b/tests/i915/gem_ccs.c
>> @@ -38,7 +38,6 @@ static struct param {
>>   
>>   struct test_config {
>>   	bool compression;
>> -	bool inplace;
>>   	bool surfcopy;
>>   	bool new_ctx;
>>   	bool suspend_resume;
>> @@ -423,11 +422,6 @@ static void block_copy(int i915,
>>   	blt_set_copy_object(&blt.dst, dst);
>>   	blt_set_object_ext(&ext.src, mid_compression_format, width, height, SURFACE_TYPE_2D);
>>   	blt_set_object_ext(&ext.dst, 0, width, height, SURFACE_TYPE_2D);
>> -	if (config->inplace) {
>> -		blt_set_object(&blt.dst, mid->handle, dst->size, mid->region, 0,
>> -			       T_LINEAR, COMPRESSION_DISABLED, comp_type);
>> -		blt.dst.ptr = mid->ptr;
>> -	}
>>   
>>   	blt_set_batch(&blt.bb, bb, bb_size, region1);
>>   	blt_block_copy(i915, ctx, e, ahnd, &blt, pext);
>> @@ -496,13 +490,6 @@ static void block_multicopy(int i915,
>>   	blt_set_copy_object(&blt3.dst, dst);
>>   	blt_set_copy_object(&blt3.final, final);
>>   
>> -	if (config->inplace) {
>> -		blt_set_object(&blt3.dst, mid->handle, dst->size, mid->region,
>> -			       mid->mocs, mid_tiling, COMPRESSION_DISABLED,
>> -			       comp_type);
>> -		blt3.dst.ptr = mid->ptr;
>> -	}
>> -
>>   	blt_set_object_ext(&ext3.src, 0, width, height, SURFACE_TYPE_2D);
>>   	blt_set_object_ext(&ext3.mid, mid_compression_format, width, height, SURFACE_TYPE_2D);
>>   	blt_set_object_ext(&ext3.dst, 0, width, height, SURFACE_TYPE_2D);
>> @@ -513,8 +500,7 @@ static void block_multicopy(int i915,
>>   	gem_sync(i915, blt3.final.handle);
>>   
>>   	WRITE_PNG(i915, run_id, "src", &blt3.src, width, height);
>> -	if (!config->inplace)
>> -		WRITE_PNG(i915, run_id, "mid", &blt3.mid, width, height);
>> +	WRITE_PNG(i915, run_id, "mid", &blt3.mid, width, height);
>>   	WRITE_PNG(i915, run_id, "dst", &blt3.dst, width, height);
>>   	WRITE_PNG(i915, run_id, "final", &blt3.final, width, height);
>>   
>> @@ -559,9 +545,6 @@ static void block_copy_test(int i915,
>>   	if (config->compression && !blt_block_copy_supports_compression(i915))
>>   		return;
>>   
>> -	if (config->inplace && !config->compression)
>> -		return;
>> -
>>   	for_each_tiling(tiling) {
>>   		if (!blt_block_copy_supports_tiling(i915, tiling) ||
>>   		    (param.tiling >= 0 && param.tiling != tiling))
>> @@ -656,7 +639,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>>   	struct igt_collection *set;
>>   	const intel_ctx_t *ctx;
>>   	int i915;
>> -	igt_hang_t hang;
>>   
>>   	igt_fixture {
>>   		i915 = drm_open_driver(DRIVER_INTEL);
>> @@ -670,7 +652,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>>   					    I915_SYSTEM_MEMORY,
>>   					    I915_DEVICE_MEMORY);
>>   		ctx = intel_ctx_create_all_physical(i915);
>> -		hang = igt_allow_hang(i915, ctx->id, 0);
>>   	}
>>   
>>   	igt_describe("Check block-copy uncompressed blit");
>> @@ -694,22 +675,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>>   		block_copy_test(i915, &config, ctx, set, BLOCK_MULTICOPY);
>>   	}
>>   
>> -	igt_describe("Check block-copy flatccs inplace decompression blit");
>> -	igt_subtest_with_dynamic("block-copy-inplace") {
>> -		struct test_config config = { .compression = true,
>> -					      .inplace = true };
>> -
>> -		block_copy_test(i915, &config, ctx, set, BLOCK_COPY);
>> -	}
>> -
>> -	igt_describe("Check block-multicopy flatccs inplace decompression blit");
>> -	igt_subtest_with_dynamic("block-multicopy-inplace") {
>> -		struct test_config config = { .compression = true,
>> -					      .inplace = true };
>> -
>> -		block_copy_test(i915, &config, ctx, set, BLOCK_MULTICOPY);
>> -	}
>> -
> 
> No. This one uses resolve with same tiling so it should stay.
> Get rid of block-copy-inplace only.

OK, will put that one back in.

Thanks,
Karolina

> --
> Zbigniew
> 
>>   	igt_describe("Check flatccs data can be copied from/to surface");
>>   	igt_subtest_with_dynamic("ctrl-surf-copy") {
>>   		struct test_config config = { .compression = true,
>> @@ -738,7 +703,6 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>>   	}
>>   
>>   	igt_fixture {
>> -		igt_disallow_hang(i915, hang);
>>   		close(i915);
>>   	}
>>   }
>> -- 
>> 2.25.1
>>