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 BAE97C021B9 for ; Tue, 18 Feb 2025 20:28:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64F2910E770; Tue, 18 Feb 2025 20:28:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="FrMvEu+i"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id F419310E762 for ; Tue, 18 Feb 2025 20:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739910496; x=1771446496; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=/Pt1H+h8ztE73YWKedTgDVtDaEHwJnSUbz+revpiauI=; b=FrMvEu+iaNbeOl8PqiGlss2VWPXglHN2rpI+VPsMBT6LuUg/6UcAj7Ud QhB0SAuC/P1CA25ltgoBODjK8KZR+7hL5a6rJMhDzzxjMUEiz21wrainp NrlBbidC8Y8/FBz32SKOIY4tGeMG8+N1yWdhLFAn/BYHjQrujpNk7rhLx 2Fi2vi0AtVWXgfn0W0j5PCeTDy4XFuLiFN/8pB4do3IOvtmuZmaSEpWB4 ggwE7vqNIJmezpFeTKLQ2nNNagfeXvQigqX0ihPGk8uGjRokuK39KVL1t 8X5y1WFPuiCKNPqcvCWHAPaKnoPOtSlpwkxtrvexvj34piQkbeDkhwlia w==; X-CSE-ConnectionGUID: h4lcsBowSZyaDA/v9FcJbQ== X-CSE-MsgGUID: eFGpOLLvQPikohfU2rE7GQ== X-IronPort-AV: E=McAfee;i="6700,10204,11348"; a="44545835" X-IronPort-AV: E=Sophos;i="6.13,296,1732608000"; d="scan'208";a="44545835" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2025 12:28:15 -0800 X-CSE-ConnectionGUID: 3PcKcasTTDKYMHbhqODmSw== X-CSE-MsgGUID: KMcS9txwSliD2sUEF5nXlw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,296,1732608000"; d="scan'208";a="114367442" Received: from dut4463arlhx.fm.intel.com ([10.105.10.25]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2025 12:28:15 -0800 From: Umesh Nerlige Ramappa To: igt-dev@lists.freedesktop.org, Ashutosh Dixit Subject: [PATCH i-g-t CI run 03/14] tests/intel/xe_oa: Rename oa_exp_1_millisec to oa_exponent_default Date: Tue, 18 Feb 2025 12:28:01 -0800 Message-Id: <20250218202812.1679653-4-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218202812.1679653-1-umesh.nerlige.ramappa@intel.com> References: <20250218202812.1679653-1-umesh.nerlige.ramappa@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" Rename the global exponent to default so it can be used in different modes. Signed-off-by: Umesh Nerlige Ramappa --- tests/intel/xe_oa.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c index 9c74315df..e7d6ac5af 100644 --- a/tests/intel/xe_oa.c +++ b/tests/intel/xe_oa.c @@ -299,7 +299,7 @@ static uint32_t devid; static struct drm_xe_engine_class_instance default_hwe; static struct intel_xe_perf *intel_xe_perf; -static uint64_t oa_exp_1_millisec; +static uint64_t oa_exponent_default; static size_t default_oa_buffer_size; static struct intel_mmio_data mmio_data; static igt_render_copyfunc_t render_copy; @@ -514,7 +514,7 @@ static size_t get_default_oa_buffer_size(int fd) /* OA unit configuration */ DRM_XE_OA_PROPERTY_OA_METRIC_SET, default_test_set->perf_oa_metrics_set, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(default_test_set->perf_oa_format), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, }; struct intel_xe_oa_open_prop param = { .num_properties = ARRAY_SIZE(properties) / 2, @@ -1089,7 +1089,7 @@ init_sys_info(void) intel_xe_perf_load_perf_configs(intel_xe_perf, drm_fd); - oa_exp_1_millisec = max_oa_exponent_for_period_lte(1000000); + oa_exponent_default = max_oa_exponent_for_period_lte(1000000); default_oa_buffer_size = get_default_oa_buffer_size(drm_fd); igt_debug("default_oa_buffer_size: %zu\n", default_oa_buffer_size); @@ -1114,7 +1114,7 @@ static void test_system_wide_paranoid(void) /* OA unit configuration */ DRM_XE_OA_PROPERTY_OA_METRIC_SET, default_test_set->perf_oa_metrics_set, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(default_test_set->perf_oa_format), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, }; struct intel_xe_oa_open_prop param = { .num_properties = ARRAY_SIZE(properties) / 2, @@ -1140,7 +1140,7 @@ static void test_system_wide_paranoid(void) /* OA unit configuration */ DRM_XE_OA_PROPERTY_OA_METRIC_SET, default_test_set->perf_oa_metrics_set, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(default_test_set->perf_oa_format), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, }; struct intel_xe_oa_open_prop param = { .num_properties = ARRAY_SIZE(properties) / 2, @@ -1174,7 +1174,7 @@ static void test_invalid_oa_metric_set_id(void) /* OA unit configuration */ DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(default_test_set->perf_oa_format), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, DRM_XE_OA_PROPERTY_OA_METRIC_SET, UINT64_MAX, }; struct intel_xe_oa_open_prop param = { @@ -1211,7 +1211,7 @@ static void test_invalid_oa_format_id(void) /* OA unit configuration */ DRM_XE_OA_PROPERTY_OA_METRIC_SET, default_test_set->perf_oa_metrics_set, - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, DRM_XE_OA_PROPERTY_OA_FORMAT, UINT64_MAX, /* No __ff() here */ }; struct intel_xe_oa_open_prop param = { @@ -1246,7 +1246,7 @@ static void test_missing_sample_flags(void) /* OA unit configuration */ DRM_XE_OA_PROPERTY_OA_METRIC_SET, default_test_set->perf_oa_metrics_set, - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(default_test_set->perf_oa_format), }; struct intel_xe_oa_open_prop param = { @@ -1536,7 +1536,7 @@ static void test_oa_formats(const struct drm_xe_engine_class_instance *hwe) igt_debug("Checking OA format %s\n", format.name); open_and_read_2_oa_reports(i, - oa_exp_1_millisec, + oa_exponent_default, oa_report0, oa_report1, false, /* timer reports only */ @@ -3420,7 +3420,7 @@ test_rc6_disable(void) /* OA unit configuration */ DRM_XE_OA_PROPERTY_OA_METRIC_SET, default_test_set->perf_oa_metrics_set, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(default_test_set->perf_oa_format), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, }; struct intel_xe_oa_open_prop param = { .num_properties = ARRAY_SIZE(properties) / 2, @@ -3648,7 +3648,7 @@ test_create_destroy_userspace_config(void) /* OA unit configuration */ DRM_XE_OA_PROPERTY_SAMPLE_OA, true, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(default_test_set->perf_oa_format), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, DRM_XE_OA_PROPERTY_OA_DISABLED, true, DRM_XE_OA_PROPERTY_OA_METRIC_SET }; @@ -3948,7 +3948,7 @@ static void test_oa_regs_whitelist(const struct drm_xe_engine_class_instance *hw 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), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, }; struct intel_xe_oa_open_prop param = { .num_properties = sizeof(properties) / 16, @@ -4154,7 +4154,7 @@ test_oa_unit_exclusive_stream(bool exponent) DRM_XE_OA_PROPERTY_OA_METRIC_SET, 0, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(0), DRM_XE_OA_PROPERTY_OA_ENGINE_INSTANCE, 0, - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, }; struct intel_xe_oa_open_prop param = { .num_properties = ARRAY_SIZE(properties) / 2, @@ -4216,7 +4216,7 @@ test_oa_unit_exclusive_stream(bool exponent) properties[7] = __ff(test_set->perf_oa_format); properties[9] = hwe->engine_instance; properties[10] = DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT; - properties[11] = oa_exp_1_millisec; + properties[11] = oa_exponent_default; intel_xe_perf_ioctl_err(drm_fd, DRM_XE_OBSERVATION_OP_STREAM_OPEN, ¶m, EBUSY); /* case 2: concurrent access to non-OAG unit should fail */ @@ -4374,7 +4374,7 @@ static void map_oa_buffer_forked_access(const struct drm_xe_engine_class_instanc static void mmap_wait_for_periodic_reports(void *oa_vaddr, uint32_t n, const struct drm_xe_engine_class_instance *hwe) { - uint32_t period_us = oa_exponent_to_ns(oa_exp_1_millisec) / 1000; + uint32_t period_us = oa_exponent_to_ns(oa_exponent_default) / 1000; struct intel_xe_perf_metric_set *test_set = metric_set(hwe); uint64_t fmt = test_set->perf_oa_format; uint32_t num_periodic_reports = 0; @@ -4440,7 +4440,7 @@ static void closed_fd_and_unmapped_access(const struct drm_xe_engine_class_insta DRM_XE_OA_PROPERTY_SAMPLE_OA, true, DRM_XE_OA_PROPERTY_OA_METRIC_SET, default_test_set->perf_oa_metrics_set, DRM_XE_OA_PROPERTY_OA_FORMAT, __ff(default_test_set->perf_oa_format), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, }; struct intel_xe_oa_open_prop param = { .num_properties = ARRAY_SIZE(properties) / 2, @@ -4487,7 +4487,7 @@ static void test_mapped_oa_buffer(map_oa_buffer_test_t test_with_fd_open, 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), - DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exp_1_millisec, + DRM_XE_OA_PROPERTY_OA_PERIOD_EXPONENT, oa_exponent_default, DRM_XE_OA_PROPERTY_OA_ENGINE_INSTANCE, hwe->engine_instance, }; struct intel_xe_oa_open_prop param = { -- 2.34.1