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 8355BCCD185 for ; Mon, 13 Oct 2025 20:30:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E27810E153; Mon, 13 Oct 2025 20:30:56 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="UNzvocv8"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71F1C10E535 for ; Mon, 13 Oct 2025 20:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1760387450; x=1791923450; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BTacSbyFHQRrVKSlY8a/RPoIhL8gaTdWg0nBop81v20=; b=UNzvocv8OZmk/MmF1am26K6tOhTcu4zGnNBKtWXr8ebK0WilZFHvyf8e MCamddMMJBNLLYcmP2NOnKfvWsCKaorhXmQDb+CHjCD1c46XbMNgEpwyM c+0BYh5x9UI61N5ZWTnYaaVv7XTWnxA8Hu2tbrn3YGYRx/gKKwsNPufJR rnQrGdLK1g5S1lneTo7OXP4ueR1Q1Mg/xrqzmnfBYcjL27q0YnWrPoeGj GjoQk/qU6EkT8s3RGFPPHY1tRYqRrI5oTY8lH2rv58rkK954nFqLXbaWS FpDMqpEggtJK9P7YALtSPa0oNvOaB4RosB8X03xWTJ7QgYGrelMubN7bW A==; X-CSE-ConnectionGUID: PwYMYWlqTcOHkJ0NEu46mA== X-CSE-MsgGUID: YwauB9IISMCUqlKyq7RrMg== X-IronPort-AV: E=McAfee;i="6800,10657,11581"; a="73641942" X-IronPort-AV: E=Sophos;i="6.19,226,1754982000"; d="scan'208";a="73641942" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2025 13:30:48 -0700 X-CSE-ConnectionGUID: 6ylcjVqiQwaq5psCjhsBdg== X-CSE-MsgGUID: bpWbuldURo28jpf5bLD4Mw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,226,1754982000"; d="scan'208";a="180924050" Received: from orsosgc001.jf.intel.com ([10.88.27.185]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2025 13:30:48 -0700 From: Ashutosh Dixit To: igt-dev@lists.freedesktop.org Cc: Umesh Nerlige Ramappa Subject: [PATCH i-g-t 15/18] tests/intel/xe_oa: Convert sync tests to take OA unit arguments Date: Mon, 13 Oct 2025 13:30:38 -0700 Message-ID: <20251013203042.925115-16-ashutosh.dixit@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251013203042.925115-1-ashutosh.dixit@intel.com> References: <20251013203042.925115-1-ashutosh.dixit@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Convert sync tests to take 'struct drm_xe_oa_unit *' arguments, to enable them to be run on all OA units. Signed-off-by: Ashutosh Dixit Reviewed-by: Umesh Nerlige Ramappa --- tests/intel/xe_oa.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c index ba4d3ddfb7..0e7d9d063e 100644 --- a/tests/intel/xe_oa.c +++ b/tests/intel/xe_oa.c @@ -4776,9 +4776,10 @@ struct oa_sync { }; static void -oa_sync_init(enum oa_sync_type sync_type, const struct drm_xe_engine_class_instance *hwe, +oa_sync_init(enum oa_sync_type sync_type, struct drm_xe_oa_unit *oau, struct oa_sync *osync, struct drm_xe_sync *sync) { + struct drm_xe_engine_class_instance *hwe = oa_unit_engine(oau); uint64_t addr = 0x1a0000; osync->sync_type = sync_type; @@ -4900,15 +4901,15 @@ static void oa_sync_free(struct oa_sync *osync) * @wait-cfg: Exercise reconfig path and wait for syncs to signal * @wait: Don't exercise reconfig path and wait for syncs to signal */ -static void test_syncs(const struct drm_xe_engine_class_instance *hwe, +static void test_syncs(struct drm_xe_oa_unit *oau, enum oa_sync_type sync_type, int flags) { struct drm_xe_ext_set_property extn[XE_OA_MAX_SET_PROPERTIES] = {}; - struct intel_xe_perf_metric_set *test_set = metric_set(hwe); + struct intel_xe_perf_metric_set *test_set = oa_unit_metric_set(oau); struct drm_xe_sync sync = {}; struct oa_sync osync = {}; uint64_t open_properties[] = { - DRM_XE_OA_PROPERTY_OA_UNIT_ID, 0, + DRM_XE_OA_PROPERTY_OA_UNIT_ID, oau->oa_unit_id, DRM_XE_OA_PROPERTY_SAMPLE_OA, true, DRM_XE_OA_PROPERTY_OA_METRIC_SET, test_set->perf_oa_metrics_set, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(test_set->perf_oa_format), @@ -4939,7 +4940,7 @@ static void test_syncs(const struct drm_xe_engine_class_instance *hwe, if (sync_type == OA_SYNC_TYPE_USERPTR || sync_type == OA_SYNC_TYPE_UFENCE) flags |= WAIT; - oa_sync_init(sync_type, hwe, &osync, &sync); + oa_sync_init(sync_type, oau, &osync, &sync); stream_fd = __perf_open(drm_fd, &open_param, false); @@ -4966,25 +4967,6 @@ exit: oa_sync_free(&osync); } -static const char *xe_engine_class_name(uint32_t engine_class) -{ - switch (engine_class) { - case DRM_XE_ENGINE_CLASS_RENDER: - return "rcs"; - case DRM_XE_ENGINE_CLASS_COPY: - return "bcs"; - case DRM_XE_ENGINE_CLASS_VIDEO_DECODE: - return "vcs"; - case DRM_XE_ENGINE_CLASS_VIDEO_ENHANCE: - return "vecs"; - case DRM_XE_ENGINE_CLASS_COMPUTE: - return "ccs"; - default: - igt_warn("Engine class 0x%x unknown\n", engine_class); - return "unknown"; - } -} - #define __for_one_hwe_in_each_oa_unit(hwe) \ for (int m = 0; !m || hwe; m++) \ for_each_if(hwe = oa_unit_engine(oa_unit_by_id(drm_fd, m))) \ @@ -5065,7 +5047,6 @@ igt_main_args("b:t", long_options, help_str, opt_handler, NULL) { "ufence-wait", OA_SYNC_TYPE_UFENCE, WAIT }, { NULL }, }; - struct drm_xe_engine_class_instance *hwe = NULL; struct drm_xe_oa_unit *oau; struct xe_device *xe_dev; @@ -5311,8 +5292,8 @@ igt_main_args("b:t", long_options, help_str, opt_handler, NULL) for (const struct sync_section *s = sync_sections; s->name; s++) { igt_subtest_with_dynamic_f("syncs-%s", s->name) { - __for_one_hwe_in_oag(hwe) - test_syncs(hwe, s->sync_type, s->flags); + __for_oa_unit_by_type(DRM_XE_OA_UNIT_TYPE_OAG) + test_syncs(oau, s->sync_type, s->flags); } } } -- 2.48.1