From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6DEF9C25B7D for ; Fri, 24 May 2024 21:09:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CB3910E0A5; Fri, 24 May 2024 21:09:57 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Qaa/8S9C"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id E63B410E0A5 for ; Fri, 24 May 2024 21:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716584995; x=1748120995; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=LHkilb3fHAMG0nhOmlukbT+DgdtuE0j9CIJdgzPvLHQ=; b=Qaa/8S9CjCIJzgnZTCdh53ZgSSmMcsanI/MyYciSeHGMqmMUrYk0e1J4 GTcnyhk+h0LfMCyGmmfD3+YNdrHtUWPFhh7HX1k3f6uuEwvCHas5aKR0+ wTLm3IMsOcpB9s2Kob6KqDEeSFCfFWWbzlE3WlyQLFKZ6nqhp3bBbxB+k Cedgy9NZrkq0g5dEn7tKBxegIJMeMO3SCx6C7qrQvfzHB8SbjGhbJR6zl eL+duaueCijJtDGYMj7lGzc2bpyy9SULFlyHRFP64EL4O8hQwp3Ktxk9d Ecy05UAJ0LeyUBFo2BU3/IPxbAPy0Cc0RNBktuNQbQyTN2afnSmohalQD g==; X-CSE-ConnectionGUID: DH3hHL9ZRXyIAZ0RvFWMkQ== X-CSE-MsgGUID: bqiosMg/Td63gfiJpoZPTw== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="16808350" X-IronPort-AV: E=Sophos;i="6.08,186,1712646000"; d="scan'208";a="16808350" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2024 14:09:54 -0700 X-CSE-ConnectionGUID: a8cx67FBT26dKtFxMH7OnQ== X-CSE-MsgGUID: iLbhHGc/Sy2XFTewE9CuPw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,186,1712646000"; d="scan'208";a="34033472" Received: from unerlige-desk.jf.intel.com ([10.165.21.199]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2024 14:09:55 -0700 From: Umesh Nerlige Ramappa To: intel-xe@lists.freedesktop.org Cc: jani.saarinen@intel.com, matthew.auld@intel.com, lucas.demarchi@intel.com, rodrigo.vivi@intel.com Subject: [PATCH 1/2] drm/xe: Use run_ticks instead of runtime for client stats Date: Fri, 24 May 2024 14:09:48 -0700 Message-Id: <20240524210949.1345804-1-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Note that runtime is also used in the pm context, so it is confusing to use the same name to denote run time of the drm client. Use a more appropriate name for the client utilization. While at it, drop the incorrect multi-lrc comment in the helper description Signed-off-by: Umesh Nerlige Ramappa --- drivers/gpu/drm/xe/xe_device_types.h | 4 ++-- drivers/gpu/drm/xe/xe_drm_client.c | 4 ++-- drivers/gpu/drm/xe/xe_exec_queue.c | 12 ++++++------ drivers/gpu/drm/xe/xe_exec_queue.h | 2 +- drivers/gpu/drm/xe/xe_execlist.c | 2 +- drivers/gpu/drm/xe/xe_guc_submit.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 03bedc33b21a..d0936d82cc1d 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -556,8 +556,8 @@ struct xe_file { struct mutex lock; } exec_queue; - /** @runtime: hw engine class runtime in ticks for this drm client */ - u64 runtime[XE_ENGINE_CLASS_MAX]; + /** @run_ticks: hw engine class run time in ticks for this drm client */ + u64 run_ticks[XE_ENGINE_CLASS_MAX]; /** @client: drm client */ struct xe_drm_client *client; diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c index af404c9e5cc0..5679e9b15d06 100644 --- a/drivers/gpu/drm/xe/xe_drm_client.c +++ b/drivers/gpu/drm/xe/xe_drm_client.c @@ -252,7 +252,7 @@ static void show_runtime(struct drm_printer *p, struct drm_file *file) /* Accumulate all the exec queues from this client */ mutex_lock(&xef->exec_queue.lock); xa_for_each(&xef->exec_queue.xa, i, q) - xe_exec_queue_update_runtime(q); + xe_exec_queue_update_run_ticks(q); mutex_unlock(&xef->exec_queue.lock); /* Get the total GPU cycles */ @@ -287,7 +287,7 @@ static void show_runtime(struct drm_printer *p, struct drm_file *file) class_name = xe_hw_engine_class_to_str(class); drm_printf(p, "drm-cycles-%s:\t%llu\n", - class_name, xef->runtime[class]); + class_name, xef->run_ticks[class]); drm_printf(p, "drm-total-cycles-%s:\t%llu\n", class_name, gpu_timestamp); diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c index 0fd61fb4d104..841d3ea71e0d 100644 --- a/drivers/gpu/drm/xe/xe_exec_queue.c +++ b/drivers/gpu/drm/xe/xe_exec_queue.c @@ -756,14 +756,14 @@ bool xe_exec_queue_is_idle(struct xe_exec_queue *q) } /** - * xe_exec_queue_update_runtime() - Update runtime for this exec queue from hw + * xe_exec_queue_update_run_ticks() - Update run time in ticks for this exec queue + * from hw * @q: The exec queue * - * Update the timestamp saved by HW for this exec queue and save runtime - * calculated by using the delta from last update. On multi-lrc case, only the - * first is considered. + * Update the timestamp saved by HW for this exec queue and save run ticks + * calculated by using the delta from last update. */ -void xe_exec_queue_update_runtime(struct xe_exec_queue *q) +void xe_exec_queue_update_run_ticks(struct xe_exec_queue *q) { struct xe_file *xef; struct xe_lrc *lrc; @@ -789,7 +789,7 @@ void xe_exec_queue_update_runtime(struct xe_exec_queue *q) */ lrc = &q->lrc[0]; new_ts = xe_lrc_update_timestamp(lrc, &old_ts); - xef->runtime[q->class] += (new_ts - old_ts) * q->width; + xef->run_ticks[q->class] += (new_ts - old_ts) * q->width; } void xe_exec_queue_kill(struct xe_exec_queue *q) diff --git a/drivers/gpu/drm/xe/xe_exec_queue.h b/drivers/gpu/drm/xe/xe_exec_queue.h index e0f07d28ee1a..289a3a51d2a2 100644 --- a/drivers/gpu/drm/xe/xe_exec_queue.h +++ b/drivers/gpu/drm/xe/xe_exec_queue.h @@ -75,6 +75,6 @@ struct dma_fence *xe_exec_queue_last_fence_get(struct xe_exec_queue *e, struct xe_vm *vm); void xe_exec_queue_last_fence_set(struct xe_exec_queue *e, struct xe_vm *vm, struct dma_fence *fence); -void xe_exec_queue_update_runtime(struct xe_exec_queue *q); +void xe_exec_queue_update_run_ticks(struct xe_exec_queue *q); #endif diff --git a/drivers/gpu/drm/xe/xe_execlist.c b/drivers/gpu/drm/xe/xe_execlist.c index bd7f27efe0e0..8e5c591fcecd 100644 --- a/drivers/gpu/drm/xe/xe_execlist.c +++ b/drivers/gpu/drm/xe/xe_execlist.c @@ -306,7 +306,7 @@ static void execlist_job_free(struct drm_sched_job *drm_job) { struct xe_sched_job *job = to_xe_sched_job(drm_job); - xe_exec_queue_update_runtime(job->q); + xe_exec_queue_update_run_ticks(job->q); xe_sched_job_put(job); } diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 54778189cfd5..ee078a6d174a 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -763,7 +763,7 @@ static void guc_exec_queue_free_job(struct drm_sched_job *drm_job) { struct xe_sched_job *job = to_xe_sched_job(drm_job); - xe_exec_queue_update_runtime(job->q); + xe_exec_queue_update_run_ticks(job->q); trace_xe_sched_job_free(job); xe_sched_job_put(job); -- 2.34.1