From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id D2AD310E449 for ; Tue, 24 Oct 2023 17:36:32 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Date: Tue, 24 Oct 2023 19:36:16 +0200 Message-Id: <20231024173618.127007-4-zbigniew.kempczynski@intel.com> In-Reply-To: <20231024173618.127007-1-zbigniew.kempczynski@intel.com> References: <20231024173618.127007-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t v4 3/5] lib/igt_sizes: Add common SZ_* header List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: We often use SZ_.* macros so add this globally to IGTs. v2: Keep SZ_1K+, add copyright notice (Kamil) Signed-off-by: Zbigniew Kempczyński Cc: Kamil Konieczny --- lib/igt.h | 1 + lib/igt_sizes.h | 33 +++++++++++++++++++++++++++++++++ lib/xe/xe_query.h | 4 +--- tests/intel/gem_exec_async.c | 2 -- tests/intel/gem_lmem_swapping.c | 1 - tests/intel/i915_query.c | 1 - tests/intel/xe_evict.c | 3 --- tests/msm/msm_shrink.c | 2 -- 8 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 lib/igt_sizes.h diff --git a/lib/igt.h b/lib/igt.h index 73b6f77272..7af3d10cbc 100644 --- a/lib/igt.h +++ b/lib/igt.h @@ -39,6 +39,7 @@ #include "igt_params.h" #include "igt_pipe_crc.h" #include "igt_pm.h" +#include "igt_sizes.h" #include "igt_stats.h" #include "igt_dsc.h" #ifdef HAVE_CHAMELIUM diff --git a/lib/igt_sizes.h b/lib/igt_sizes.h new file mode 100644 index 0000000000..1157beb984 --- /dev/null +++ b/lib/igt_sizes.h @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: MIT +/* + * Copyright © 2023 Intel Corporation + */ +#ifndef __IGT_SIZES_H__ +#define __IGT_SIZES_H__ + +#define SZ_1K 0x00000400 +#define SZ_2K 0x00000800 +#define SZ_4K 0x00001000 +#define SZ_8K 0x00002000 +#define SZ_16K 0x00004000 +#define SZ_32K 0x00008000 +#define SZ_64K 0x00010000 +#define SZ_128K 0x00020000 +#define SZ_256K 0x00040000 +#define SZ_512K 0x00080000 + +#define SZ_1M 0x00100000 +#define SZ_2M 0x00200000 +#define SZ_4M 0x00400000 +#define SZ_8M 0x00800000 +#define SZ_16M 0x01000000 +#define SZ_32M 0x02000000 +#define SZ_64M 0x04000000 +#define SZ_128M 0x08000000 +#define SZ_256M 0x10000000 +#define SZ_512M 0x20000000 + +#define SZ_1G 0x40000000 +#define SZ_2G 0x80000000 + +#endif /* __IGT_SIZES_H__ */ diff --git a/lib/xe/xe_query.h b/lib/xe/xe_query.h index da7deaf4cc..7c0849bc12 100644 --- a/lib/xe/xe_query.h +++ b/lib/xe/xe_query.h @@ -12,9 +12,7 @@ #include #include #include "igt_list.h" - -#define SZ_4K 0x1000 -#define SZ_64K 0x10000 +#include "igt_sizes.h" #define XE_DEFAULT_ALIGNMENT SZ_4K #define XE_DEFAULT_ALIGNMENT_64K SZ_64K diff --git a/tests/intel/gem_exec_async.c b/tests/intel/gem_exec_async.c index 8c131d8e13..1497c5c6c8 100644 --- a/tests/intel/gem_exec_async.c +++ b/tests/intel/gem_exec_async.c @@ -41,8 +41,6 @@ IGT_TEST_DESCRIPTION("Check that we can issue concurrent writes across the engines."); -#define SZ_1M (1024 * 1024) - static void store_dword(int fd, int id, const intel_ctx_t *ctx, unsigned ring, uint32_t target, uint64_t target_offset, uint32_t offset, uint32_t value) diff --git a/tests/intel/gem_lmem_swapping.c b/tests/intel/gem_lmem_swapping.c index 2e0ba07935..6aed806294 100644 --- a/tests/intel/gem_lmem_swapping.c +++ b/tests/intel/gem_lmem_swapping.c @@ -198,7 +198,6 @@ IGT_TEST_DESCRIPTION("Exercise local memory swapping."); #define round_up(x, y) ((((x) - 1) | __round_mask(x, y)) + 1) #define PAGE_SIZE (1ULL << 12) -#define SZ_64K (16 * PAGE_SIZE) static const char *readable_unit(uint64_t size) { diff --git a/tests/intel/i915_query.c b/tests/intel/i915_query.c index f97379b83b..e9cc495973 100644 --- a/tests/intel/i915_query.c +++ b/tests/intel/i915_query.c @@ -863,7 +863,6 @@ static void test_query_regions_sanity_check(int fd) } #define rounddown(x, y) (x - (x % y)) -#define SZ_64K (1ULL << 16) static void fill_unallocated(int fd, struct drm_i915_query_item *item, int idx, bool cpu_access) diff --git a/tests/intel/xe_evict.c b/tests/intel/xe_evict.c index eec001218d..5d8463270c 100644 --- a/tests/intel/xe_evict.c +++ b/tests/intel/xe_evict.c @@ -448,9 +448,6 @@ threads(int fd, struct drm_xe_engine_class_instance *eci, pthread_join(threads_data[i].thread, NULL); } -#define SZ_256M 0x10000000 -#define SZ_1G 0x40000000 - static uint64_t calc_bo_size(uint64_t vram_size, int mul, int div) { if (vram_size >= SZ_1G) diff --git a/tests/msm/msm_shrink.c b/tests/msm/msm_shrink.c index d0b098aaf3..8e6c582ffc 100644 --- a/tests/msm/msm_shrink.c +++ b/tests/msm/msm_shrink.c @@ -30,8 +30,6 @@ #include "igt_os.h" #include "igt_sysfs.h" -#define SZ_1M (1024 * 1024) - static void leak(uint64_t alloc) { char *ptr; -- 2.34.1