| Message ID | 20220324142621.347452-2-matthew.auld@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [i-g-t,1/4] test/gem_lmem_swapping: account for object rounding | expand |
On Thu, 24 Mar 2022 07:26:18 -0700, Matthew Auld wrote: > > On DG2 the object size might be rounded when allocating lmem. Make sure > we account for any rounding up. Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
On Thu, 2022-03-24 at 14:26 +0000, Matthew Auld wrote: > On DG2 the object size might be rounded when allocating lmem. Make > sure > we account for any rounding up. > > Signed-off-by: Matthew Auld <matthew.auld@intel.com> > Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> > Cc: Nirmoy Das <nirmoy.das@linux.intel.com> Reviewed-by: Thomas Hellström <thomas.hellstrom@linux-intel.com> > --- > tests/i915/gem_lmem_swapping.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tests/i915/gem_lmem_swapping.c > b/tests/i915/gem_lmem_swapping.c > index 582111dd..193ff370 100644 > --- a/tests/i915/gem_lmem_swapping.c > +++ b/tests/i915/gem_lmem_swapping.c > @@ -72,7 +72,7 @@ struct object { > }; > > static uint32_t create_bo(int i915, > - uint64_t size, > + uint64_t *size, > struct drm_i915_gem_memory_class_instance > *region, > bool do_oom_test) > { > @@ -80,7 +80,7 @@ static uint32_t create_bo(int i915, > int ret; > > retry: > - ret = __gem_create_in_memory_region_list(i915, &handle, > &size, region, 1); > + ret = __gem_create_in_memory_region_list(i915, &handle, size, > region, 1); > if (do_oom_test && ret == -ENOMEM) > goto retry; > igt_assert_eq(ret, 0); > @@ -172,7 +172,7 @@ static void __do_evict(int i915, > > __gem_context_set_persistence(i915, 0, false); > size = 4096; > - batch = create_bo(i915, size, region, params->oom_test); > + batch = create_bo(i915, &size, region, params->oom_test); > > gem_write(i915, batch, 0, &bbe, sizeof(bbe)); > > @@ -199,7 +199,7 @@ static void __do_evict(int i915, > params->count = i; > break; > } > - obj->handle = create_bo(i915, obj->size, region, > params->oom_test); > + obj->handle = create_bo(i915, &obj->size, region, > params->oom_test); > > move_to_lmem(i915, objects + i, 1, batch, engine, > params->oom_test); > @@ -270,7 +270,7 @@ static void fill_params(int i915, struct params > *params, > > if (flags & TEST_RANDOM) { > params->size.min = 4096; > - handle = create_bo(i915, params->size.min, ®ion- > >region, > + handle = create_bo(i915, ¶ms->size.min, ®ion- > >region, > do_oom_test); > gem_close(i915, handle); > params->size.max = 2 * size + params->size.min;
diff --git a/tests/i915/gem_lmem_swapping.c b/tests/i915/gem_lmem_swapping.c index 582111dd..193ff370 100644 --- a/tests/i915/gem_lmem_swapping.c +++ b/tests/i915/gem_lmem_swapping.c @@ -72,7 +72,7 @@ struct object { }; static uint32_t create_bo(int i915, - uint64_t size, + uint64_t *size, struct drm_i915_gem_memory_class_instance *region, bool do_oom_test) { @@ -80,7 +80,7 @@ static uint32_t create_bo(int i915, int ret; retry: - ret = __gem_create_in_memory_region_list(i915, &handle, &size, region, 1); + ret = __gem_create_in_memory_region_list(i915, &handle, size, region, 1); if (do_oom_test && ret == -ENOMEM) goto retry; igt_assert_eq(ret, 0); @@ -172,7 +172,7 @@ static void __do_evict(int i915, __gem_context_set_persistence(i915, 0, false); size = 4096; - batch = create_bo(i915, size, region, params->oom_test); + batch = create_bo(i915, &size, region, params->oom_test); gem_write(i915, batch, 0, &bbe, sizeof(bbe)); @@ -199,7 +199,7 @@ static void __do_evict(int i915, params->count = i; break; } - obj->handle = create_bo(i915, obj->size, region, params->oom_test); + obj->handle = create_bo(i915, &obj->size, region, params->oom_test); move_to_lmem(i915, objects + i, 1, batch, engine, params->oom_test); @@ -270,7 +270,7 @@ static void fill_params(int i915, struct params *params, if (flags & TEST_RANDOM) { params->size.min = 4096; - handle = create_bo(i915, params->size.min, ®ion->region, + handle = create_bo(i915, ¶ms->size.min, ®ion->region, do_oom_test); gem_close(i915, handle); params->size.max = 2 * size + params->size.min;
On DG2 the object size might be rounded when allocating lmem. Make sure we account for any rounding up. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> Cc: Nirmoy Das <nirmoy.das@linux.intel.com> --- tests/i915/gem_lmem_swapping.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)