nvk: Use align() and align64() instead of ALIGN_POT

For one thing, they actually assert that the alignment factor is a power
of two.  More importantly, though, because they're real functions and
not macros, they up-cast the alignment to a full uint32_t or uint64_t
before doing the alignment calculation.  If you do ALIGN_POT() on a
64-bit value with a 32-bit alignment, it truncates to 32 bits because
the NOT is done before the up-cast due to C implicit cast rules.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25555>

diff --git a/src/nouveau/nil/nil_image.c b/src/nouveau/nil/nil_image.c
index bc8b840..a56b233 100644 (file)
--- a/src/nouveau/nil/nil_image.c
+++ b/src/nouveau/nil/nil_image.c
@@ -67,13 +67,13 @@ nil_offset4d_mul(struct nil_offset4d a, struct nil_extent4d b)
 }
 
 static struct nil_extent4d
-nil_extent4d_align(struct nil_extent4d ext, struct nil_extent4d align)
+nil_extent4d_align(struct nil_extent4d ext, struct nil_extent4d alignment)
 {
    return (struct nil_extent4d) {
-      .w = ALIGN_POT(ext.w, align.w),
-      .h = ALIGN_POT(ext.h, align.h),
-      .d = ALIGN_POT(ext.d, align.d),
-      .a = ALIGN_POT(ext.a, align.a),
+      .w = align(ext.w, alignment.w),
+      .h = align(ext.h, alignment.h),
+      .d = align(ext.d, alignment.d),
+      .a = align(ext.a, alignment.a),
    };
 }
 

diff --git a/src/nouveau/vulkan/nvk_buffer.c b/src/nouveau/vulkan/nvk_buffer.c
index 43dc60b..6f1c405 100644 (file)
--- a/src/nouveau/vulkan/nvk_buffer.c
+++ b/src/nouveau/vulkan/nvk_buffer.c
@@ -48,12 +48,12 @@ nvk_CreateBuffer(VkDevice device,
 
    if (buffer->vk.size > 0 &&
        (buffer->vk.create_flags & VK_BUFFER_CREATE_SPARSE_BINDING_BIT)) {
-      const uint64_t alignment =
+      const uint32_t alignment =
          nvk_get_buffer_alignment(&nvk_device_physical(dev)->info,
                                   buffer->vk.usage,
                                   buffer->vk.create_flags);
       assert(alignment >= 4096);
-      buffer->vma_size_B = ALIGN_POT(buffer->vk.size, alignment);
+      buffer->vma_size_B = align64(buffer->vk.size, alignment);
 
       const bool sparse_residency =
          buffer->vk.create_flags & VK_BUFFER_CREATE_SPARSE_RESIDENCY_BIT;
@@ -104,7 +104,7 @@ nvk_GetDeviceBufferMemoryRequirements(
                                pInfo->pCreateInfo->flags);
 
    pMemoryRequirements->memoryRequirements = (VkMemoryRequirements) {
-      .size = ALIGN_POT(pInfo->pCreateInfo->size, alignment),
+      .size = align64(pInfo->pCreateInfo->size, alignment),
       .alignment = alignment,
       .memoryTypeBits = BITFIELD_MASK(dev->pdev->mem_type_cnt),
    };

diff --git a/src/nouveau/vulkan/nvk_descriptor_set_layout.c b/src/nouveau/vulkan/nvk_descriptor_set_layout.c
index 492a3c0..4f85c93 100644 (file)
--- a/src/nouveau/vulkan/nvk_descriptor_set_layout.c
+++ b/src/nouveau/vulkan/nvk_descriptor_set_layout.c
@@ -221,7 +221,7 @@ nvk_CreateDescriptorSetLayout(VkDevice _device,
          assert(stride <= UINT8_MAX);
          assert(util_is_power_of_two_nonzero(align));
 
-         buffer_size = ALIGN_POT(buffer_size, align);
+         buffer_size = align64(buffer_size, align);
          layout->binding[b].offset = buffer_size;
          layout->binding[b].stride = stride;
 
@@ -356,7 +356,7 @@ nvk_GetDescriptorSetLayoutSupport(VkDevice _device,
              * keep non_variable_size aligned to max_align.
              */
             non_variable_size += stride * binding->descriptorCount;
-            non_variable_size = ALIGN_POT(non_variable_size, max_align);
+            non_variable_size = align64(non_variable_size, max_align);
          }
       }
    }
@@ -364,7 +364,7 @@ nvk_GetDescriptorSetLayoutSupport(VkDevice _device,
    uint64_t buffer_size = non_variable_size;
    if (variable_stride > 0) {
       buffer_size += variable_stride * variable_count;
-      buffer_size = ALIGN_POT(buffer_size, max_align);
+      buffer_size = align64(buffer_size, max_align);
    }
 
    uint32_t max_buffer_size;

diff --git a/src/nouveau/vulkan/nvk_device_memory.c b/src/nouveau/vulkan/nvk_device_memory.c
index b89c1e1..055a868 100644 (file)
--- a/src/nouveau/vulkan/nvk_device_memory.c
+++ b/src/nouveau/vulkan/nvk_device_memory.c
@@ -185,7 +185,7 @@ nvk_AllocateMemory(VkDevice device,
       alignment = (1ULL << 16);
 
    const uint64_t aligned_size =
-      ALIGN_POT(pAllocateInfo->allocationSize, alignment);
+      align64(pAllocateInfo->allocationSize, alignment);
 
    mem = vk_device_memory_create(&dev->vk, pAllocateInfo,
                                  pAllocator, sizeof(*mem));

diff --git a/src/nouveau/vulkan/nvk_image.c b/src/nouveau/vulkan/nvk_image.c
index 59a8f95..075c570 100644 (file)
--- a/src/nouveau/vulkan/nvk_image.c
+++ b/src/nouveau/vulkan/nvk_image.c
@@ -650,7 +650,7 @@ nvk_image_plane_add_req(struct nvk_image_plane *plane,
    assert(util_is_power_of_two_or_zero64(plane->nil.align_B));
 
    *align_B = MAX2(*align_B, plane->nil.align_B);
-   *size_B = ALIGN_POT(*size_B, plane->nil.align_B);
+   *size_B = align64(*size_B, plane->nil.align_B);
    *size_B += plane->nil.size_B;
 }
 
@@ -816,7 +816,7 @@ nvk_image_plane_bind(struct nvk_device *dev,
                      struct nvk_device_memory *mem,
                      uint64_t *offset_B)
 {
-   *offset_B = ALIGN_POT(*offset_B, plane->nil.align_B);
+   *offset_B = align64(*offset_B, (uint64_t)plane->nil.align_B);
 
    if (plane->vma_size_B) {
       nouveau_ws_bo_bind_vma(dev->ws_dev,

diff --git a/src/nouveau/vulkan/nvk_query_pool.c b/src/nouveau/vulkan/nvk_query_pool.c
index e8e5908..c15595c 100644 (file)
--- a/src/nouveau/vulkan/nvk_query_pool.c
+++ b/src/nouveau/vulkan/nvk_query_pool.c
@@ -49,8 +49,8 @@ nvk_CreateQueryPool(VkDevice device,
       return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
 
    /* We place the availability first and then data */
-   pool->query_start = ALIGN_POT(pool->vk.query_count * sizeof(uint32_t),
-                                 sizeof(struct nvk_query_report));
+   pool->query_start = align(pool->vk.query_count * sizeof(uint32_t),
+                             sizeof(struct nvk_query_report));
 
    uint32_t reports_per_query;
    switch (pCreateInfo->queryType) {

diff --git a/src/nouveau/vulkan/nvk_queue_drm_nouveau.c b/src/nouveau/vulkan/nvk_queue_drm_nouveau.c
index 05486cb..3c7653a 100644 (file)
--- a/src/nouveau/vulkan/nvk_queue_drm_nouveau.c
+++ b/src/nouveau/vulkan/nvk_queue_drm_nouveau.c
@@ -124,8 +124,7 @@ push_add_image_plane_opaque_bind(struct push_builder *pb,
                                  const VkSparseMemoryBind *bind,
                                  uint64_t *image_plane_offset_B)
 {
-   *image_plane_offset_B = ALIGN_POT(*image_plane_offset_B,
-                                     plane->nil.align_B);
+   *image_plane_offset_B = align64(*image_plane_offset_B, plane->nil.align_B);
 
    /* The offset of the bind range within the image */
    uint64_t image_bind_offset_B = bind->resourceOffset;