From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 86C2710E660 for ; Tue, 6 Sep 2022 13:10:26 +0000 (UTC) Message-ID: <566796d2-e449-55be-7090-a62a15bcb641@intel.com> Date: Tue, 6 Sep 2022 16:10:13 +0300 Content-Language: en-US To: Umesh Nerlige Ramappa , References: <20220823183036.5270-1-umesh.nerlige.ramappa@intel.com> <20220823183036.5270-10-umesh.nerlige.ramappa@intel.com> From: Lionel Landwerlin In-Reply-To: <20220823183036.5270-10-umesh.nerlige.ramappa@intel.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH i-g-t 09/23] 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: On 23/08/2022 21:30, Umesh Nerlige Ramappa wrote: > 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 b61dd6e2..c120c898 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; > @@ -1069,7 +1067,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), > }; > > @@ -1095,7 +1093,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); > @@ -1126,7 +1124,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), > }; > > @@ -1148,7 +1146,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), > }; > > @@ -1182,7 +1180,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), > }; > > @@ -1214,7 +1212,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), > }; > > @@ -1354,7 +1352,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), > }; > > @@ -1833,7 +1831,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), > }; > > @@ -1868,7 +1866,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; > @@ -1931,7 +1929,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), > }; > > @@ -2007,8 +2005,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]; > @@ -2167,8 +2165,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]; > @@ -2358,7 +2356,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; > @@ -2458,7 +2456,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; > @@ -2649,7 +2647,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; > @@ -2734,7 +2732,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)); > @@ -2883,7 +2881,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); > @@ -2975,7 +2973,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; > @@ -3011,7 +3009,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]; > @@ -3168,7 +3166,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); > @@ -3271,7 +3269,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), > }; > > @@ -4253,7 +4251,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; > @@ -4309,7 +4307,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), > }; > > @@ -4405,8 +4403,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)); > @@ -4480,8 +4478,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)); > @@ -4913,7 +4911,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;