From 7be63ef956004344dd45b2fb7a45c74aaf5542cf Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 30 Oct 2025 14:32:34 -0400 Subject: [PATCH] intel: do not NIH util_is_aligned Signed-off-by: Alyssa Rosenzweig Reviewed-by: Caio Oliveira Reviewed-by: Mary Guillemard Acked-by: Yonggang Luo Part-of: --- src/intel/isl/isl_priv.h | 10 ---------- src/intel/vulkan/anv_allocator.c | 4 ++-- src/intel/vulkan/anv_image.c | 10 +++++----- src/intel/vulkan/anv_private.h | 8 -------- src/intel/vulkan_hasvk/anv_image.c | 10 +++++----- src/intel/vulkan_hasvk/anv_private.h | 8 -------- 6 files changed, 12 insertions(+), 38 deletions(-) diff --git a/src/intel/isl/isl_priv.h b/src/intel/isl/isl_priv.h index 38967722897..9605d54b825 100644 --- a/src/intel/isl/isl_priv.h +++ b/src/intel/isl/isl_priv.h @@ -109,16 +109,6 @@ isl_is_pow2(uintmax_t n) return !(n & (n - 1)); } -/** - * Alignment must be a power of 2. - */ -static inline bool -isl_is_aligned(uintmax_t n, uintmax_t a) -{ - assert(isl_is_pow2(a)); - return (n & (a - 1)) == 0; -} - /** * Alignment must be a power of 2. */ diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c index 751c8405d01..2bc92e7f1e5 100644 --- a/src/intel/vulkan/anv_allocator.c +++ b/src/intel/vulkan/anv_allocator.c @@ -360,8 +360,8 @@ anv_block_pool_init(struct anv_block_pool *pool, VkResult result; /* Make sure VMA addresses are aligned for the block pool */ - assert(anv_is_aligned(start_address, device->info->mem_alignment)); - assert(anv_is_aligned(initial_size, device->info->mem_alignment)); + assert(util_is_aligned(start_address, device->info->mem_alignment)); + assert(util_is_aligned(initial_size, device->info->mem_alignment)); assert(max_size > 0); assert(max_size > initial_size); diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index 9846f0c54a3..c5e81c95a57 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -50,7 +50,7 @@ vk_to_isl_surf_dim[] = { static uint64_t MUST_CHECK UNUSED memory_range_end(struct anv_image_memory_range memory_range) { - assert(anv_is_aligned(memory_range.offset, memory_range.alignment)); + assert(util_is_aligned(memory_range.offset, memory_range.alignment)); return memory_range.offset + memory_range.size; } @@ -141,7 +141,7 @@ image_binding_grow(const struct anv_device *device, /* Offset must be validated because it comes from * VkImageDrmFormatModifierExplicitCreateInfoEXT. */ - if (unlikely(!anv_is_aligned(offset, alignment))) { + if (unlikely(!util_is_aligned(offset, alignment))) { return vk_errorf(device, VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT, "VkImageDrmFormatModifierExplicitCreateInfoEXT::" @@ -196,8 +196,8 @@ memory_range_merge(struct anv_image_memory_range *a, return; assert(a->offset == 0); - assert(anv_is_aligned(a->offset, a->alignment)); - assert(anv_is_aligned(b.offset, b.alignment)); + assert(util_is_aligned(a->offset, a->alignment)); + assert(util_is_aligned(b.offset, b.alignment)); a->alignment = MAX2(a->alignment, b.alignment); a->size = MAX2(a->size, b.offset + b.size); @@ -1007,7 +1007,7 @@ add_primary_surface(struct anv_device *device, static bool MUST_CHECK memory_range_is_aligned(struct anv_image_memory_range memory_range) { - return anv_is_aligned(memory_range.offset, memory_range.alignment); + return util_is_aligned(memory_range.offset, memory_range.alignment); } static bool MUST_CHECK diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index c1bc7f8839f..c50c26d22ef 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -313,14 +313,6 @@ align_down_npot_u32(uint32_t v, uint32_t a) return v - (v % a); } -/** Alignment must be a power of 2. */ -static inline bool -anv_is_aligned(uintmax_t n, uintmax_t a) -{ - assert(a == (a & -a)); - return (n & (a - 1)) == 0; -} - static inline union isl_color_value vk_to_isl_color(VkClearColorValue color) { diff --git a/src/intel/vulkan_hasvk/anv_image.c b/src/intel/vulkan_hasvk/anv_image.c index e4b64068763..5e97b88ccec 100644 --- a/src/intel/vulkan_hasvk/anv_image.c +++ b/src/intel/vulkan_hasvk/anv_image.c @@ -48,7 +48,7 @@ vk_to_isl_surf_dim[] = { static uint64_t MUST_CHECK UNUSED memory_range_end(struct anv_image_memory_range memory_range) { - assert(anv_is_aligned(memory_range.offset, memory_range.alignment)); + assert(util_is_aligned(memory_range.offset, memory_range.alignment)); return memory_range.offset + memory_range.size; } @@ -131,7 +131,7 @@ image_binding_grow(const struct anv_device *device, /* Offset must be validated because it comes from * VkImageDrmFormatModifierExplicitCreateInfoEXT. */ - if (unlikely(!anv_is_aligned(offset, alignment))) { + if (unlikely(!util_is_aligned(offset, alignment))) { return vk_errorf(device, VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT, "VkImageDrmFormatModifierExplicitCreateInfoEXT::" @@ -192,8 +192,8 @@ memory_range_merge(struct anv_image_memory_range *a, return; assert(a->offset == 0); - assert(anv_is_aligned(a->offset, a->alignment)); - assert(anv_is_aligned(b.offset, b.alignment)); + assert(util_is_aligned(a->offset, a->alignment)); + assert(util_is_aligned(b.offset, b.alignment)); a->alignment = MAX2(a->alignment, b.alignment); a->size = MAX2(a->size, b.offset + b.size); @@ -741,7 +741,7 @@ add_primary_surface(struct anv_device *device, static bool MUST_CHECK memory_range_is_aligned(struct anv_image_memory_range memory_range) { - return anv_is_aligned(memory_range.offset, memory_range.alignment); + return util_is_aligned(memory_range.offset, memory_range.alignment); } static bool MUST_CHECK diff --git a/src/intel/vulkan_hasvk/anv_private.h b/src/intel/vulkan_hasvk/anv_private.h index 299737decc4..c6851813dd7 100644 --- a/src/intel/vulkan_hasvk/anv_private.h +++ b/src/intel/vulkan_hasvk/anv_private.h @@ -286,14 +286,6 @@ align_down_npot_u32(uint32_t v, uint32_t a) return v - (v % a); } -/** Alignment must be a power of 2. */ -static inline bool -anv_is_aligned(uintmax_t n, uintmax_t a) -{ - assert(a == (a & -a)); - return (n & (a - 1)) == 0; -} - static inline union isl_color_value vk_to_isl_color(VkClearColorValue color) {