[PATCH i-g-t v2 61/66] tests/xe_eudebug_online: Adds debugger-reopen test
Piatkowski, Dominik Karol
dominik.karol.piatkowski at intel.com
Thu Aug 1 08:22:51 UTC 2024
One nitpick below. When fixed:
Reviewed-by: Dominik Karol Piątkowski <dominik.karol.piatkowski at intel.com>
> -----Original Message-----
> From: Manszewski, Christoph <christoph.manszewski at intel.com>
> Sent: Tuesday, July 30, 2024 1:45 PM
> To: igt-dev at lists.freedesktop.org
> Cc: Kempczynski, Zbigniew <zbigniew.kempczynski at intel.com>; Kamil
> Konieczny <kamil.konieczny at linux.intel.com>; Grzegorzek, Dominik
> <dominik.grzegorzek at intel.com>; Patelczyk, Maciej
> <maciej.patelczyk at intel.com>; Piatkowski, Dominik Karol
> <dominik.karol.piatkowski at intel.com>; Sikora, Pawel
> <pawel.sikora at intel.com>; Hajda, Andrzej <andrzej.hajda at intel.com>;
> Kolanupaka Naveena <kolanupaka.naveena at intel.com>; Kuoppala, Mika
> <mika.kuoppala at intel.com>; Mun, Gwan-gyeong <gwan-
> gyeong.mun at intel.com>
> Subject: [PATCH i-g-t v2 61/66] tests/xe_eudebug_online: Adds debugger-
> reopen test
>
> From: Kolanupaka Naveena <kolanupaka.naveena at intel.com>
>
> Introducing a test which will close and reopen the debugger after resume on
> each breakpoint to make sure that the debugger is able to capture the further
> events after reopening it.
>
> Signed-off-by: Kolanupaka Naveena <kolanupaka.naveena at intel.com>
> Cc: Dominik Karol Piątkowski <dominik.karol.piatkowski at intel.com>
> ---
> tests/intel/xe_eudebug_online.c | 68
> +++++++++++++++++++++++++++++++--
> 1 file changed, 64 insertions(+), 4 deletions(-)
>
> diff --git a/tests/intel/xe_eudebug_online.c b/tests/intel/xe_eudebug_online.c
> index 8361b6db4..c3c82b061 100644
> --- a/tests/intel/xe_eudebug_online.c
> +++ b/tests/intel/xe_eudebug_online.c
> @@ -25,6 +25,7 @@
> #define SHADER_SINGLE_STEP (1 << 2)
> #define SIP_SINGLE_STEP (1 << 3)
> #define DISABLE_DEBUG_MODE (1 << 4)
> +#define SHADER_N_NOOP_BREAKPOINT (1 << 5)
> #define TRIGGER_RESUME_SINGLE_WALK (1 << 25)
> #define TRIGGER_RESUME_PARALLEL_WALK (1 << 26)
> #define TRIGGER_RECONNECT (1 << 27)
> @@ -35,6 +36,7 @@
>
> #define DEBUGGER_REATTACHED 1
>
> +#define SHADER_LOOP_N 3
> #define SINGLE_STEP_COUNT 16
> #define STEERING_SINGLE_STEP 0
> #define STEERING_CONTINUE 0x00c0ffee
> @@ -128,6 +130,11 @@ static struct gpgpu_shader *get_shader(int fd, const
> unsigned int flags)
> gpgpu_shader__breakpoint(shader);
> for (int i = 0; i < SINGLE_STEP_COUNT; i++)
> gpgpu_shader__nop(shader);
> + } else if (flags & SHADER_N_NOOP_BREAKPOINT) {
> + for (int i = 0; i < SHADER_LOOP_N; i++) {
> + gpgpu_shader__nop(shader);
> + gpgpu_shader__breakpoint(shader);
> + }
> }
>
> gpgpu_shader__eot(shader);
> @@ -525,6 +532,7 @@ static int get_stepped_threads_count(struct
> online_debug_data *data, int threads }
>
> #define MAX_PREEMPT_TIMEOUT 10ull
> +static int is_client_resumed;
> static void eu_attention_resume_trigger(struct xe_eudebug_debugger *d,
> struct drm_xe_eudebug_event *e)
> {
> @@ -583,6 +591,7 @@ static void eu_attention_resume_trigger(struct
> xe_eudebug_debugger *d,
> att->exec_queue_handle,
> att->lrc_handle,
> bitmask, att->bitmask_size);
>
> + is_client_resumed = 1;
> free(bitmask);
> }
>
> @@ -881,8 +890,8 @@ static void run_online_client(struct
> xe_eudebug_client *c)
> data->threads_count = count_canaries_neq(ptr, w_dim, 0);
> igt_assert_f(data->threads_count, "No canaries found, nothing
> executed?\n");
>
> - if ((c->flags & SHADER_BREAKPOINT || c->flags &
> TRIGGER_RESUME_SET_BP) &&
> - !(c->flags & DISABLE_DEBUG_MODE)) {
> + if ((c->flags & SHADER_BREAKPOINT || c->flags &
> TRIGGER_RESUME_SET_BP ||
> + c->flags & SHADER_N_NOOP_BREAKPOINT) && !(c->flags &
> +DISABLE_DEBUG_MODE)) {
> uint32_t aip = ptr[0];
>
> igt_assert_f(aip != SHADER_CANARY, "Workload executed but
> breakpoint not hit!\n"); @@ -1375,7 +1384,8 @@ static void
> eu_attention_debugger_detach_trigger(struct xe_eudebug_debugger *d,
> xe_eudebug_debugger_dettach(d);
>
> /* Let the KMD scan function notice unhandled EU attention */
> - sleep(1);
> + if (!(d->flags & SHADER_N_NOOP_BREAKPOINT))
> + sleep(1);
>
> /*
> * New session that is created by EU debugger on reconnect restarts
> @@ -1394,7 +1404,8 @@ static void
> eu_attention_debugger_detach_trigger(struct xe_eudebug_debugger *d,
> /* Let the discovery worker discover resources */
> sleep(2);
>
> - xe_eudebug_debugger_signal_stage(d, DEBUGGER_REATTACHED);
> + if (!(d->flags & SHADER_N_NOOP_BREAKPOINT))
> + xe_eudebug_debugger_signal_stage(d,
> DEBUGGER_REATTACHED);
> }
>
> /**
> @@ -1510,6 +1521,52 @@ static void test_single_step(int fd, struct
> drm_xe_engine_class_instance *hwe, i
> online_debug_data_destroy(data);
> }
>
> +static int debugger_detach_count;
I noticed that this variable is only used inside the function below - it can be moved inside scope of the function.
> +static void eu_attention_debugger_ndetach_trigger(struct
> xe_eudebug_debugger *d,
> + struct
> drm_xe_eudebug_event *event) {
> + if (debugger_detach_count < (SHADER_LOOP_N - 1)) {
> + /* Make sure the resume command has issued before
> detaching the debugger */
> + if (!is_client_resumed)
> + return;
> + eu_attention_debugger_detach_trigger(d, event);
> + debugger_detach_count++;
> + } else {
> + igt_debug("Reached Nth breakpoint hence preventing the
> debugger detach\n");
> + }
> + is_client_resumed = 0;
> +}
> +
> +/**
> + * SUBTEST: debugger-reopen
> + * Description:
> + * Check whether the debugger is able to reopen the connection and
> + * capture the events of already running client.
> + */
> +static void test_debugger_reopen(int fd, struct
> +drm_xe_engine_class_instance *hwe, int flags) {
> + struct xe_eudebug_session *s;
> + struct online_debug_data *data;
> +
> + data = online_debug_data_create(hwe);
> +
> + s = xe_eudebug_session_create(fd, run_online_client, flags, data);
> +
> + xe_eudebug_debugger_add_trigger(s->d,
> DRM_XE_EUDEBUG_EVENT_EU_ATTENTION,
> + eu_attention_debug_trigger);
> + xe_eudebug_debugger_add_trigger(s->d,
> DRM_XE_EUDEBUG_EVENT_EU_ATTENTION,
> + eu_attention_resume_trigger);
> + xe_eudebug_debugger_add_trigger(s->d,
> DRM_XE_EUDEBUG_EVENT_EU_ATTENTION,
> +
> eu_attention_debugger_ndetach_trigger);
> + xe_eudebug_debugger_add_trigger(s->d,
> DRM_XE_EUDEBUG_EVENT_VM_BIND_UFENCE,
> + ufence_ack_trigger);
> +
> + xe_eudebug_session_run(s);
> +
> + xe_eudebug_session_destroy(s);
> + online_debug_data_destroy(data);
> +}
> +
> static struct drm_xe_engine_class_instance *pick_compute(int fd, int gt) {
> struct drm_xe_engine_class_instance *hwe; @@ -1586,6 +1643,9
> @@ igt_main
> test_single_step(fd, hwe, SHADER_SINGLE_STEP |
> SIP_SINGLE_STEP |
> TRIGGER_RESUME_SINGLE_WALK);
>
> + test_gt_render_or_compute("debugger-reopen", fd, hwe)
> + test_debugger_reopen(fd, hwe,
> SHADER_N_NOOP_BREAKPOINT);
> +
> igt_fixture {
> xe_eudebug_enable(fd, was_enabled);
>
> --
> 2.34.1
More information about the igt-dev
mailing list