From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 097C710E1EA for ; Tue, 25 Oct 2022 20:07:18 +0000 (UTC) From: Umesh Nerlige Ramappa To: igt-dev@lists.freedesktop.org Date: Tue, 25 Oct 2022 20:06:48 +0000 Message-Id: <20221025200709.83314-9-umesh.nerlige.ramappa@intel.com> In-Reply-To: <20221025200709.83314-1-umesh.nerlige.ramappa@intel.com> References: <20221025200709.83314-1-umesh.nerlige.ramappa@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH 08/29] i915/perf: Use ARRAY_SIZE consistently for num_properties List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Replace all variations of calculating the num_properties with ARRAY_SIZE. Signed-off-by: Umesh Nerlige Ramappa Reviewed-by: Lionel Landwerlin --- tests/i915/perf.c | 62 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/tests/i915/perf.c b/tests/i915/perf.c index 65434055..75594f04 100644 --- a/tests/i915/perf.c +++ b/tests/i915/perf.c @@ -86,8 +86,6 @@ IGT_TEST_DESCRIPTION("Test the i915 perf metrics streaming interface"); #define MAX_OA_BUF_SIZE (16 * 1024 * 1024) -#define NUM_PROPERTIES(p) (sizeof(p) / (2 * sizeof(uint64_t))) - struct accumulator { #define MAX_RAW_OA_COUNTERS 62 enum drm_i915_oa_format format; @@ -1025,7 +1023,7 @@ test_system_wide_paranoid(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_FD_NONBLOCK, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -1051,7 +1049,7 @@ test_system_wide_paranoid(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_FD_NONBLOCK, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; write_u64_file("/proc/sys/dev/i915/perf_stream_paranoid", 0); @@ -1082,7 +1080,7 @@ test_invalid_open_flags(void) }; struct drm_i915_perf_open_param param = { .flags = ~0, /* Undefined flag bits set! */ - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -1104,7 +1102,7 @@ test_invalid_oa_metric_set_id(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_FD_NONBLOCK, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -1138,7 +1136,7 @@ test_invalid_oa_format_id(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_FD_NONBLOCK, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -1170,7 +1168,7 @@ test_missing_sample_flags(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -1310,7 +1308,7 @@ open_and_read_2_oa_reports(int format_id, }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -1777,7 +1775,7 @@ test_invalid_oa_exponent(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -1812,7 +1810,7 @@ test_low_oa_exponent_permissions(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; uint64_t oa_period, oa_freq; @@ -1875,7 +1873,7 @@ test_per_context_mode_unprivileged(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -1951,8 +1949,8 @@ test_blocking(uint64_t requested_oa_period, bool set_kernel_hrtimer, uint64_t ke .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_DISABLED, .num_properties = set_kernel_hrtimer ? - NUM_PROPERTIES(properties) : - NUM_PROPERTIES(properties) - 1, + ARRAY_SIZE(properties) / 2 : + (ARRAY_SIZE(properties) / 2) - 1, .properties_ptr = to_user_pointer(properties), }; uint8_t buf[1024 * 1024]; @@ -2111,8 +2109,8 @@ test_polling(uint64_t requested_oa_period, bool set_kernel_hrtimer, uint64_t ker I915_PERF_FLAG_DISABLED | I915_PERF_FLAG_FD_NONBLOCK, .num_properties = set_kernel_hrtimer ? - NUM_PROPERTIES(properties) : - NUM_PROPERTIES(properties) - 1, + ARRAY_SIZE(properties) / 2 : + (ARRAY_SIZE(properties) / 2) - 1, .properties_ptr = to_user_pointer(properties), }; uint8_t buf[1024 * 1024]; @@ -2302,7 +2300,7 @@ static void test_polling_small_buf(void) .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_DISABLED | I915_PERF_FLAG_FD_NONBLOCK, - .num_properties = NUM_PROPERTIES(properties), + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; uint32_t test_duration = 80 * 1000 * 1000; @@ -2402,7 +2400,7 @@ gen12_test_oa_tlb_invalidate(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_DISABLED, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; int num_reports1, num_reports2, num_expected_reports; @@ -2593,7 +2591,7 @@ test_non_zero_reason(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; struct drm_i915_perf_record_header *header; @@ -2678,7 +2676,7 @@ test_enable_disable(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_DISABLED, /* Verify we start disabled */ - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; int buf_size = 65536 * (256 + sizeof(struct drm_i915_perf_record_header)); @@ -2827,7 +2825,7 @@ test_short_reads(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; size_t record_size = 256 + sizeof(struct drm_i915_perf_record_header); @@ -2919,7 +2917,7 @@ test_non_sampling_read_error(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; int ret; @@ -2955,7 +2953,7 @@ test_disabled_read_error(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_DISABLED, /* XXX: open disabled */ - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; uint32_t oa_report0[64]; @@ -3112,7 +3110,7 @@ test_mi_rpc(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; struct buf_ops *bops = buf_ops_create(drm_fd); @@ -3215,7 +3213,7 @@ hsw_test_single_ctx_counters(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -4196,7 +4194,7 @@ test_rc6_disable(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; unsigned long rc6_start, rc6_end, rc6_enabled; @@ -4252,7 +4250,7 @@ test_stress_open_close(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_DISABLED, /* XXX: open disabled */ - .num_properties = NUM_PROPERTIES(properties), + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; @@ -4348,8 +4346,8 @@ test_global_sseu_config_invalid(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_DISABLED, /* XXX: open disabled */ - .num_properties = NUM_PROPERTIES(properties), - .properties_ptr = to_user_pointer(properties), + .num_properties = ARRAY_SIZE(properties) / 2, + .properties_ptr = to_user_pointer(properties), }; memset(&default_sseu, 0, sizeof(default_sseu)); @@ -4423,8 +4421,8 @@ test_global_sseu_config(void) struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC | I915_PERF_FLAG_DISABLED, /* XXX: open disabled */ - .num_properties = NUM_PROPERTIES(properties), - .properties_ptr = to_user_pointer(properties), + .num_properties = ARRAY_SIZE(properties) / 2, + .properties_ptr = to_user_pointer(properties), }; memset(&default_sseu, 0, sizeof(default_sseu)); @@ -4856,7 +4854,7 @@ test_i915_ref_count(void) }; struct drm_i915_perf_open_param param = { .flags = I915_PERF_FLAG_FD_CLOEXEC, - .num_properties = sizeof(properties) / 16, + .num_properties = ARRAY_SIZE(properties) / 2, .properties_ptr = to_user_pointer(properties), }; unsigned baseline, ref_count0, ref_count1; -- 2.25.1