[Intel-gfx] [PATCH i-g-t] i915/gem_exec_nop: Keep a copy of the names
The engine names are now stored inside the iterator and not as static
strings. If we wish to use them later, we need to make a copy.
Signed-off-by: Chris Wilson
Cc: Tvrtko Ursulin
---
tests/i915/gem_exec_nop.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c
index ed9568e5a..fc7f11827 100644
--- a/tests/i915/gem_exec_nop.c
+++ b/tests/i915/gem_exec_nop.c
@@ -436,7 +436,7 @@ static void parallel(int fd, uint32_t handle, int timeout)
struct drm_i915_gem_execbuffer2 execbuf;
struct drm_i915_gem_exec_object2 obj;
unsigned engines[16];
- const char *names[16];
+ char *names[16];
unsigned nengine;
unsigned long count;
double time, sum;
@@ -445,7 +445,7 @@ static void parallel(int fd, uint32_t handle, int timeout)
nengine = 0;
__for_each_physical_engine(fd, e) {
engines[nengine] = e->flags;
- names[nengine++] = e->name;
+ names[nengine++] = strdup(e->name);
time = nop_on_ring(fd, handle, e, 1, &count) / count;
sum += time;
@@ -485,10 +485,11 @@ static void parallel(int fd, uint32_t handle, int timeout)
time = elapsed(&start, &now) / count;
igt_info("%s: %ld cycles, %.3fus\n", names[child], count,
1e6*time);
}
+ while (nengine--)
+ free(names[nengine]);
igt_waitchildren();
igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0);
-
}
static void series(int fd, uint32_t handle, int timeout)
--
2.25.0
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH i-g-t] i915/gem_exec_nop: Keep a copy of the names
Hi Chris,
On Tue, Feb 11, 2020 at 12:37:42AM +, Chris Wilson wrote:
> The engine names are now stored inside the iterator and not as static
> strings. If we wish to use them later, we need to make a copy.
But we are not using them later. Your patch just copies and frees
an array.
Is there a follow-up?
Andi
> Signed-off-by: Chris Wilson
> Cc: Tvrtko Ursulin
> ---
> tests/i915/gem_exec_nop.c | 7 ---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/tests/i915/gem_exec_nop.c b/tests/i915/gem_exec_nop.c
> index ed9568e5a..fc7f11827 100644
> --- a/tests/i915/gem_exec_nop.c
> +++ b/tests/i915/gem_exec_nop.c
> @@ -436,7 +436,7 @@ static void parallel(int fd, uint32_t handle, int timeout)
> struct drm_i915_gem_execbuffer2 execbuf;
> struct drm_i915_gem_exec_object2 obj;
> unsigned engines[16];
> - const char *names[16];
> + char *names[16];
> unsigned nengine;
> unsigned long count;
> double time, sum;
> @@ -445,7 +445,7 @@ static void parallel(int fd, uint32_t handle, int timeout)
> nengine = 0;
> __for_each_physical_engine(fd, e) {
> engines[nengine] = e->flags;
> - names[nengine++] = e->name;
> + names[nengine++] = strdup(e->name);
>
> time = nop_on_ring(fd, handle, e, 1, &count) / count;
> sum += time;
> @@ -485,10 +485,11 @@ static void parallel(int fd, uint32_t handle, int
> timeout)
> time = elapsed(&start, &now) / count;
> igt_info("%s: %ld cycles, %.3fus\n", names[child], count,
> 1e6*time);
> }
> + while (nengine--)
> + free(names[nengine]);
>
> igt_waitchildren();
> igt_assert_eq(intel_detect_and_clear_missed_interrupts(fd), 0);
> -
> }
>
> static void series(int fd, uint32_t handle, int timeout)
> --
> 2.25.0
>
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH i-g-t] i915/gem_exec_nop: Keep a copy of the names
Quoting Andi Shyti (2020-02-11 00:42:55) > Hi Chris, > > On Tue, Feb 11, 2020 at 12:37:42AM +, Chris Wilson wrote: > > The engine names are now stored inside the iterator and not as static > > strings. If we wish to use them later, we need to make a copy. > > But we are not using them later. Your patch just copies and frees > an array. They are used inside an igt_info() in the child processes. Output at the moment is quite strange. -Chris ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
