Re: [Mesa-dev] [PATCH 08/11] anv: move to using vk_alloc helpers.

[Dave Airlie]

On 19 October 2016 at 03:18, Emil Velikov  wrote:
> Hi Dave,
>
> On 17 October 2016 at 03:07, Dave Airlie  wrote:
>> From: Dave Airlie 
>>
>> This moves all the alloc/free in anv to the generic helpers.
>>
>> Signed-off-by: Dave Airlie 
>> ---
>>  src/intel/vulkan/anv_batch_chain.c| 40 +++---
>>  src/intel/vulkan/anv_cmd_buffer.c | 22 -
>>  src/intel/vulkan/anv_descriptor_set.c | 12 -
>>  src/intel/vulkan/anv_device.c | 26 ++--
>>  src/intel/vulkan/anv_image.c  | 14 +--
>>  src/intel/vulkan/anv_intel.c  |  4 +--
>>  src/intel/vulkan/anv_pass.c   | 10 
>>  src/intel/vulkan/anv_pipeline.c   |  6 ++---
>>  src/intel/vulkan/anv_pipeline_cache.c |  8 +++---
>>  src/intel/vulkan/anv_private.h| 46 
>> +--
>>  src/intel/vulkan/anv_query.c  |  6 ++---
>>  src/intel/vulkan/anv_wsi.c|  2 +-
>>  src/intel/vulkan/anv_wsi_wayland.c| 16 ++--
>>  src/intel/vulkan/anv_wsi_x11.c| 22 -
>>  src/intel/vulkan/gen7_pipeline.c  |  4 +--
>>  src/intel/vulkan/gen8_pipeline.c  |  4 +--
>>  src/intel/vulkan/genX_pipeline.c  |  6 ++---
>>  src/intel/vulkan/genX_state.c |  2 +-
>>  18 files changed, 103 insertions(+), 147 deletions(-)
>>
> Wondering we one shouldn't include the new header only where needed ?
> Quick grep shows 33 files which include anv_private.h of which (as per
> above) ~half only need vk_alloc.h.

Don't really see the benefit, splitting anv_private.h would be a
bigger job I would think.

Dave.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH 08/11] anv: move to using vk_alloc helpers.

[Emil Velikov]

Hi Dave,

On 17 October 2016 at 03:07, Dave Airlie  wrote:
> From: Dave Airlie 
>
> This moves all the alloc/free in anv to the generic helpers.
>
> Signed-off-by: Dave Airlie 
> ---
>  src/intel/vulkan/anv_batch_chain.c| 40 +++---
>  src/intel/vulkan/anv_cmd_buffer.c | 22 -
>  src/intel/vulkan/anv_descriptor_set.c | 12 -
>  src/intel/vulkan/anv_device.c | 26 ++--
>  src/intel/vulkan/anv_image.c  | 14 +--
>  src/intel/vulkan/anv_intel.c  |  4 +--
>  src/intel/vulkan/anv_pass.c   | 10 
>  src/intel/vulkan/anv_pipeline.c   |  6 ++---
>  src/intel/vulkan/anv_pipeline_cache.c |  8 +++---
>  src/intel/vulkan/anv_private.h| 46 
> +--
>  src/intel/vulkan/anv_query.c  |  6 ++---
>  src/intel/vulkan/anv_wsi.c|  2 +-
>  src/intel/vulkan/anv_wsi_wayland.c| 16 ++--
>  src/intel/vulkan/anv_wsi_x11.c| 22 -
>  src/intel/vulkan/gen7_pipeline.c  |  4 +--
>  src/intel/vulkan/gen8_pipeline.c  |  4 +--
>  src/intel/vulkan/genX_pipeline.c  |  6 ++---
>  src/intel/vulkan/genX_state.c |  2 +-
>  18 files changed, 103 insertions(+), 147 deletions(-)
>
Wondering we one shouldn't include the new header only where needed ?
Quick grep shows 33 files which include anv_private.h of which (as per
above) ~half only need vk_alloc.h.

Just an idea.
Emil
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 08/11] anv: move to using vk_alloc helpers.

[Dave Airlie]

From: Dave Airlie 

This moves all the alloc/free in anv to the generic helpers.

Signed-off-by: Dave Airlie 
---
 src/intel/vulkan/anv_batch_chain.c| 40 +++---
 src/intel/vulkan/anv_cmd_buffer.c | 22 -
 src/intel/vulkan/anv_descriptor_set.c | 12 -
 src/intel/vulkan/anv_device.c | 26 ++--
 src/intel/vulkan/anv_image.c  | 14 +--
 src/intel/vulkan/anv_intel.c  |  4 +--
 src/intel/vulkan/anv_pass.c   | 10 
 src/intel/vulkan/anv_pipeline.c   |  6 ++---
 src/intel/vulkan/anv_pipeline_cache.c |  8 +++---
 src/intel/vulkan/anv_private.h| 46 +--
 src/intel/vulkan/anv_query.c  |  6 ++---
 src/intel/vulkan/anv_wsi.c|  2 +-
 src/intel/vulkan/anv_wsi_wayland.c| 16 ++--
 src/intel/vulkan/anv_wsi_x11.c| 22 -
 src/intel/vulkan/gen7_pipeline.c  |  4 +--
 src/intel/vulkan/gen8_pipeline.c  |  4 +--
 src/intel/vulkan/genX_pipeline.c  |  6 ++---
 src/intel/vulkan/genX_state.c |  2 +-
 18 files changed, 103 insertions(+), 147 deletions(-)

diff --git a/src/intel/vulkan/anv_batch_chain.c 
b/src/intel/vulkan/anv_batch_chain.c
index 4f6f0c2..68c4e54 100644
--- a/src/intel/vulkan/anv_batch_chain.c
+++ b/src/intel/vulkan/anv_batch_chain.c
@@ -59,18 +59,18 @@ anv_reloc_list_init_clone(struct anv_reloc_list *list,
}
 
list->relocs =
-  anv_alloc(alloc, list->array_length * sizeof(*list->relocs), 8,
+  vk_alloc(alloc, list->array_length * sizeof(*list->relocs), 8,
 VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 
if (list->relocs == NULL)
   return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 
list->reloc_bos =
-  anv_alloc(alloc, list->array_length * sizeof(*list->reloc_bos), 8,
+  vk_alloc(alloc, list->array_length * sizeof(*list->reloc_bos), 8,
 VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
 
if (list->reloc_bos == NULL) {
-  anv_free(alloc, list->relocs);
+  vk_free(alloc, list->relocs);
   return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
}
 
@@ -95,8 +95,8 @@ void
 anv_reloc_list_finish(struct anv_reloc_list *list,
   const VkAllocationCallbacks *alloc)
 {
-   anv_free(alloc, list->relocs);
-   anv_free(alloc, list->reloc_bos);
+   vk_free(alloc, list->relocs);
+   vk_free(alloc, list->reloc_bos);
 }
 
 static VkResult
@@ -112,16 +112,16 @@ anv_reloc_list_grow(struct anv_reloc_list *list,
   new_length *= 2;
 
struct drm_i915_gem_relocation_entry *new_relocs =
-  anv_alloc(alloc, new_length * sizeof(*list->relocs), 8,
+  vk_alloc(alloc, new_length * sizeof(*list->relocs), 8,
 VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (new_relocs == NULL)
   return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 
struct anv_bo **new_reloc_bos =
-  anv_alloc(alloc, new_length * sizeof(*list->reloc_bos), 8,
+  vk_alloc(alloc, new_length * sizeof(*list->reloc_bos), 8,
 VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (new_reloc_bos == NULL) {
-  anv_free(alloc, new_relocs);
+  vk_free(alloc, new_relocs);
   return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
}
 
@@ -129,8 +129,8 @@ anv_reloc_list_grow(struct anv_reloc_list *list,
memcpy(new_reloc_bos, list->reloc_bos,
   list->num_relocs * sizeof(*list->reloc_bos));
 
-   anv_free(alloc, list->relocs);
-   anv_free(alloc, list->reloc_bos);
+   vk_free(alloc, list->relocs);
+   vk_free(alloc, list->reloc_bos);
 
list->array_length = new_length;
list->relocs = new_relocs;
@@ -246,7 +246,7 @@ anv_batch_bo_create(struct anv_cmd_buffer *cmd_buffer,
 {
VkResult result;
 
-   struct anv_batch_bo *bbo = anv_alloc(_buffer->pool->alloc, sizeof(*bbo),
+   struct anv_batch_bo *bbo = vk_alloc(_buffer->pool->alloc, sizeof(*bbo),
 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (bbo == NULL)
   return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -267,7 +267,7 @@ anv_batch_bo_create(struct anv_cmd_buffer *cmd_buffer,
  fail_bo_alloc:
anv_bo_pool_free(_buffer->device->batch_bo_pool, >bo);
  fail_alloc:
-   anv_free(_buffer->pool->alloc, bbo);
+   vk_free(_buffer->pool->alloc, bbo);
 
return result;
 }
@@ -279,7 +279,7 @@ anv_batch_bo_clone(struct anv_cmd_buffer *cmd_buffer,
 {
VkResult result;
 
-   struct anv_batch_bo *bbo = anv_alloc(_buffer->pool->alloc, sizeof(*bbo),
+   struct anv_batch_bo *bbo = vk_alloc(_buffer->pool->alloc, sizeof(*bbo),
 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (bbo == NULL)
   return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -306,7 +306,7 @@ anv_batch_bo_clone(struct anv_cmd_buffer *cmd_buffer,
  fail_bo_alloc:
anv_bo_pool_free(_buffer->device->batch_bo_pool, >bo);
  fail_alloc:
-   anv_free(_buffer->pool->alloc, bbo);
+   vk_free(_buffer->pool->alloc,