[RFC,i-g-t,5/6] tests/gem_concurrent_all: drop stolen memory related subtests
diff mbox

Message ID 1506985218-28880-6-git-send-email-daniele.ceraolospurio@intel.com
State New
Headers show

Commit Message

Daniele Ceraolo Spurio Oct. 2, 2017, 11 p.m. UTC
The feature was never merged and there has been no progress in the
last year. The tests are currently excluded from compilation with and
ifdef.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 tests/gem_concurrent_all.c | 35 -----------------------------------
 1 file changed, 35 deletions(-)

Comments

Chris Wilson Oct. 3, 2017, 11:11 a.m. UTC | #1
Quoting Daniele Ceraolo Spurio (2017-10-03 00:00:17)
> The feature was never merged and there has been no progress in the
> last year. The tests are currently excluded from compilation with and
> ifdef.
> 
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> ---
>  tests/gem_concurrent_all.c | 35 -----------------------------------
>  1 file changed, 35 deletions(-)
> 
> diff --git a/tests/gem_concurrent_all.c b/tests/gem_concurrent_all.c
> index 201b491..87f2129 100644
> --- a/tests/gem_concurrent_all.c
> +++ b/tests/gem_concurrent_all.c
> @@ -170,36 +170,6 @@ static void can_create_private(const struct create *create, unsigned count)
>  }
>  #endif
>  
> -#if HAVE_CREATE_STOLEN
> -static drm_intel_bo *
> -create_stolen_bo(drm_intel_bufmgr *bufmgr, uint64_t size)
> -{
> -       drm_intel_bo *bo;
> -       uint32_t handle;
> -
> -       /* XXX gem_create_with_flags(fd, size, I915_CREATE_STOLEN); */
> -
> -       handle = gem_create(fd, size);
> -       bo = gem_handle_to_libdrm_bo(bufmgr, fd, "stolen", handle);
> -       gem_close(fd, handle);
> -
> -       return bo;
> -}
> -
> -static void can_create_stolen(const struct create *create, unsigned count)
> -{
> -       /* XXX check num_buffers against available stolen */
> -       igt_require(0);
> -}
> -#endif
> -
> -static void create_cpu_require(const struct create *create, unsigned count)
> -{
> -#if HAVE_CREATE_STOLEN
> -       igt_require(create->create != create_stolen_bo);
> -#endif
> -}
> -
>  static drm_intel_bo *
>  unmapped_create_bo(const struct buffers *b)
>  {
> @@ -208,7 +178,6 @@ unmapped_create_bo(const struct buffers *b)
>  
>  static void create_snoop_require(const struct create *create, unsigned count)
>  {
> -       create_cpu_require(create, count);

Pardon? It's about being descriptive of the requirements, for the snooping code paths,
the bo must be cpu accessible.
-Chris
Daniele Ceraolo Spurio Oct. 3, 2017, 4:14 p.m. UTC | #2
On 03/10/17 04:11, Chris Wilson wrote:
> Quoting Daniele Ceraolo Spurio (2017-10-03 00:00:17)
>> The feature was never merged and there has been no progress in the
>> last year. The tests are currently excluded from compilation with and
>> ifdef.
>>
>> Cc: Chris Wilson <chris@chris-wilson.co.uk>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> ---
>>   tests/gem_concurrent_all.c | 35 -----------------------------------
>>   1 file changed, 35 deletions(-)
>>
>> diff --git a/tests/gem_concurrent_all.c b/tests/gem_concurrent_all.c
>> index 201b491..87f2129 100644
>> --- a/tests/gem_concurrent_all.c
>> +++ b/tests/gem_concurrent_all.c
>> @@ -170,36 +170,6 @@ static void can_create_private(const struct create *create, unsigned count)
>>   }
>>   #endif
>>   
>> -#if HAVE_CREATE_STOLEN
>> -static drm_intel_bo *
>> -create_stolen_bo(drm_intel_bufmgr *bufmgr, uint64_t size)
>> -{
>> -       drm_intel_bo *bo;
>> -       uint32_t handle;
>> -
>> -       /* XXX gem_create_with_flags(fd, size, I915_CREATE_STOLEN); */
>> -
>> -       handle = gem_create(fd, size);
>> -       bo = gem_handle_to_libdrm_bo(bufmgr, fd, "stolen", handle);
>> -       gem_close(fd, handle);
>> -
>> -       return bo;
>> -}
>> -
>> -static void can_create_stolen(const struct create *create, unsigned count)
>> -{
>> -       /* XXX check num_buffers against available stolen */
>> -       igt_require(0);
>> -}
>> -#endif
>> -
>> -static void create_cpu_require(const struct create *create, unsigned count)
>> -{
>> -#if HAVE_CREATE_STOLEN
>> -       igt_require(create->create != create_stolen_bo);
>> -#endif
>> -}
>> -
>>   static drm_intel_bo *
>>   unmapped_create_bo(const struct buffers *b)
>>   {
>> @@ -208,7 +178,6 @@ unmapped_create_bo(const struct buffers *b)
>>   
>>   static void create_snoop_require(const struct create *create, unsigned count)
>>   {
>> -       create_cpu_require(create, count);
> 
> Pardon? It's about being descriptive of the requirements, for the snooping code paths,
> the bo must be cpu accessible.
> -Chris
> 

Would it be ok for you to just leave create_cpu_require() as an empty 
function or do you have something else in mind?

Thanks,
Daniele
Chris Wilson Oct. 3, 2017, 4:25 p.m. UTC | #3
Quoting Daniele Ceraolo Spurio (2017-10-03 17:14:21)
> 
> 
> On 03/10/17 04:11, Chris Wilson wrote:
> > Quoting Daniele Ceraolo Spurio (2017-10-03 00:00:17)
> >> The feature was never merged and there has been no progress in the
> >> last year. The tests are currently excluded from compilation with and
> >> ifdef.
> >>
> >> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> >> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> >> ---
> >>   tests/gem_concurrent_all.c | 35 -----------------------------------
> >>   1 file changed, 35 deletions(-)
> >>
> >> diff --git a/tests/gem_concurrent_all.c b/tests/gem_concurrent_all.c
> >> index 201b491..87f2129 100644
> >> --- a/tests/gem_concurrent_all.c
> >> +++ b/tests/gem_concurrent_all.c
> >> @@ -170,36 +170,6 @@ static void can_create_private(const struct create *create, unsigned count)
> >>   }
> >>   #endif
> >>   
> >> -#if HAVE_CREATE_STOLEN
> >> -static drm_intel_bo *
> >> -create_stolen_bo(drm_intel_bufmgr *bufmgr, uint64_t size)
> >> -{
> >> -       drm_intel_bo *bo;
> >> -       uint32_t handle;
> >> -
> >> -       /* XXX gem_create_with_flags(fd, size, I915_CREATE_STOLEN); */
> >> -
> >> -       handle = gem_create(fd, size);
> >> -       bo = gem_handle_to_libdrm_bo(bufmgr, fd, "stolen", handle);
> >> -       gem_close(fd, handle);
> >> -
> >> -       return bo;
> >> -}
> >> -
> >> -static void can_create_stolen(const struct create *create, unsigned count)
> >> -{
> >> -       /* XXX check num_buffers against available stolen */
> >> -       igt_require(0);
> >> -}
> >> -#endif
> >> -
> >> -static void create_cpu_require(const struct create *create, unsigned count)
> >> -{
> >> -#if HAVE_CREATE_STOLEN
> >> -       igt_require(create->create != create_stolen_bo);
> >> -#endif
> >> -}
> >> -
> >>   static drm_intel_bo *
> >>   unmapped_create_bo(const struct buffers *b)
> >>   {
> >> @@ -208,7 +178,6 @@ unmapped_create_bo(const struct buffers *b)
> >>   
> >>   static void create_snoop_require(const struct create *create, unsigned count)
> >>   {
> >> -       create_cpu_require(create, count);
> > 
> > Pardon? It's about being descriptive of the requirements, for the snooping code paths,
> > the bo must be cpu accessible.
> > -Chris
> > 
> 
> Would it be ok for you to just leave create_cpu_require() as an empty 
> function or do you have something else in mind?

Leave it as empty. It's primary purpose is a placeholder for
restrictions as they come to light.
-Chris

Patch
diff mbox

diff --git a/tests/gem_concurrent_all.c b/tests/gem_concurrent_all.c
index 201b491..87f2129 100644
--- a/tests/gem_concurrent_all.c
+++ b/tests/gem_concurrent_all.c
@@ -170,36 +170,6 @@  static void can_create_private(const struct create *create, unsigned count)
 }
 #endif
 
-#if HAVE_CREATE_STOLEN
-static drm_intel_bo *
-create_stolen_bo(drm_intel_bufmgr *bufmgr, uint64_t size)
-{
-	drm_intel_bo *bo;
-	uint32_t handle;
-
-	/* XXX gem_create_with_flags(fd, size, I915_CREATE_STOLEN); */
-
-	handle = gem_create(fd, size);
-	bo = gem_handle_to_libdrm_bo(bufmgr, fd, "stolen", handle);
-	gem_close(fd, handle);
-
-	return bo;
-}
-
-static void can_create_stolen(const struct create *create, unsigned count)
-{
-	/* XXX check num_buffers against available stolen */
-	igt_require(0);
-}
-#endif
-
-static void create_cpu_require(const struct create *create, unsigned count)
-{
-#if HAVE_CREATE_STOLEN
-	igt_require(create->create != create_stolen_bo);
-#endif
-}
-
 static drm_intel_bo *
 unmapped_create_bo(const struct buffers *b)
 {
@@ -208,7 +178,6 @@  unmapped_create_bo(const struct buffers *b)
 
 static void create_snoop_require(const struct create *create, unsigned count)
 {
-	create_cpu_require(create, count);
 	igt_require(!gem_has_llc(fd));
 }
 
@@ -1727,7 +1696,6 @@  igt_main
 		{
 			.name = "cpu",
 			.create_bo = unmapped_create_bo,
-			.require = create_cpu_require,
 			.set_bo = cpu_set_bo,
 			.cmp_bo = cpu_cmp_bo,
 			.release_bo = nop_release_bo,
@@ -1807,9 +1775,6 @@  igt_main
 #if HAVE_CREATE_PRIVATE
 		{ "private-", can_create_private, create_private_bo},
 #endif
-#if HAVE_CREATE_STOLEN
-		{ "stolen-", can_create_stolen, create_stolen_bo},
-#endif
 		{ NULL, NULL }
 	};
 	const struct size sizes[] = {