Mesa (master): gallium: Remove the pool pipebuffer manager.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Apr 23 17:56:10 UTC 2019
Module: Mesa
Branch: master
Commit: f5c08d981885de4f46b251f6440f1f5587bd878d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f5c08d981885de4f46b251f6440f1f5587bd878d
Author: Eric Anholt <eric at anholt.net>
Date: Fri Apr 19 15:02:22 2019 -0700
gallium: Remove the pool pipebuffer manager.
Noticed while trying to decide if pipebuffer was of any use to me, and
found that nothing has used it in the last 10 years at least.
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Reviewed-by: Kristian Høgsberg <hoegsberg at gmail.com>
---
src/gallium/auxiliary/Makefile.sources | 1 -
src/gallium/auxiliary/meson.build | 1 -
src/gallium/auxiliary/pipebuffer/pb_bufmgr.h | 19 +-
src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c | 322 ----------------------
4 files changed, 1 insertion(+), 342 deletions(-)
diff --git a/src/gallium/auxiliary/Makefile.sources b/src/gallium/auxiliary/Makefile.sources
index 02cc5df70a7..3259f8219ba 100644
--- a/src/gallium/auxiliary/Makefile.sources
+++ b/src/gallium/auxiliary/Makefile.sources
@@ -116,7 +116,6 @@ C_SOURCES := \
pipebuffer/pb_bufmgr.h \
pipebuffer/pb_bufmgr_mm.c \
pipebuffer/pb_bufmgr_ondemand.c \
- pipebuffer/pb_bufmgr_pool.c \
pipebuffer/pb_bufmgr_slab.c \
pipebuffer/pb_cache.c \
pipebuffer/pb_cache.h \
diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build
index ca72e81e51d..3464fcd34a6 100644
--- a/src/gallium/auxiliary/meson.build
+++ b/src/gallium/auxiliary/meson.build
@@ -136,7 +136,6 @@ files_libgallium = files(
'pipebuffer/pb_bufmgr.h',
'pipebuffer/pb_bufmgr_mm.c',
'pipebuffer/pb_bufmgr_ondemand.c',
- 'pipebuffer/pb_bufmgr_pool.c',
'pipebuffer/pb_bufmgr_slab.c',
'pipebuffer/pb_cache.c',
'pipebuffer/pb_cache.h',
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
index 1638d96a63b..bcd7549faf4 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr.h
@@ -33,13 +33,11 @@
* "buffer factory" would probably a more accurate description.
*
* You can chain buffer managers so that you can have a finer grained memory
- * management and pooling.
+ * management.
*
* For example, for a simple batch buffer manager you would chain:
* - the native buffer manager, which provides DMA memory from the graphics
* memory space;
- * - the pool buffer manager, which keep around a pool of equally sized buffers
- * to avoid latency associated with the native buffer manager;
* - the fenced buffer manager, which will delay buffer destruction until the
* the moment the card finishing processing it.
*
@@ -97,21 +95,6 @@ struct pb_manager
struct pb_manager *
pb_malloc_bufmgr_create(void);
-
-/**
- * Static buffer pool sub-allocator.
- *
- * Manages the allocation of equally sized buffers. It does so by allocating
- * a single big buffer and divide it equally sized buffers.
- *
- * It is meant to manage the allocation of batch buffer pools.
- */
-struct pb_manager *
-pool_bufmgr_create(struct pb_manager *provider,
- pb_size n, pb_size size,
- const struct pb_desc *desc);
-
-
/**
* Static sub-allocator based the old memory manager.
*
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
deleted file mode 100644
index f356ecfd568..00000000000
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_pool.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/**************************************************************************
- *
- * Copyright 2006 VMware, Inc., Bismarck, ND., USA
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- *
- **************************************************************************/
-
-/**
- * \file
- * Batch buffer pool management.
- *
- * \author Jose Fonseca <jfonseca-at-vmware-dot-com>
- * \author Thomas Hellström <thellstrom-at-vmware-dot-com>
- */
-
-
-#include "pipe/p_compiler.h"
-#include "util/u_debug.h"
-#include "os/os_thread.h"
-#include "pipe/p_defines.h"
-#include "util/u_memory.h"
-#include "util/list.h"
-
-#include "pb_buffer.h"
-#include "pb_bufmgr.h"
-
-
-/**
- * Convenience macro (type safe).
- */
-#define SUPER(__derived) (&(__derived)->base)
-
-
-struct pool_pb_manager
-{
- struct pb_manager base;
-
- mtx_t mutex;
-
- pb_size bufSize;
- pb_size bufAlign;
-
- pb_size numFree;
- pb_size numTot;
-
- struct list_head free;
-
- struct pb_buffer *buffer;
- void *map;
-
- struct pool_buffer *bufs;
-};
-
-
-static inline struct pool_pb_manager *
-pool_pb_manager(struct pb_manager *mgr)
-{
- assert(mgr);
- return (struct pool_pb_manager *)mgr;
-}
-
-
-struct pool_buffer
-{
- struct pb_buffer base;
-
- struct pool_pb_manager *mgr;
-
- struct list_head head;
-
- pb_size start;
-};
-
-
-static inline struct pool_buffer *
-pool_buffer(struct pb_buffer *buf)
-{
- assert(buf);
- return (struct pool_buffer *)buf;
-}
-
-
-
-static void
-pool_buffer_destroy(struct pb_buffer *buf)
-{
- struct pool_buffer *pool_buf = pool_buffer(buf);
- struct pool_pb_manager *pool = pool_buf->mgr;
-
- assert(!pipe_is_referenced(&pool_buf->base.reference));
-
- mtx_lock(&pool->mutex);
- LIST_ADD(&pool_buf->head, &pool->free);
- pool->numFree++;
- mtx_unlock(&pool->mutex);
-}
-
-
-static void *
-pool_buffer_map(struct pb_buffer *buf, enum pb_usage_flags flags,
- void *flush_ctx)
-{
- struct pool_buffer *pool_buf = pool_buffer(buf);
- struct pool_pb_manager *pool = pool_buf->mgr;
- void *map;
-
- /* XXX: it will be necessary to remap here to propagate flush_ctx */
-
- mtx_lock(&pool->mutex);
- map = (unsigned char *) pool->map + pool_buf->start;
- mtx_unlock(&pool->mutex);
- return map;
-}
-
-
-static void
-pool_buffer_unmap(struct pb_buffer *buf)
-{
- /* No-op */
-}
-
-
-static enum pipe_error
-pool_buffer_validate(struct pb_buffer *buf,
- struct pb_validate *vl,
- enum pb_usage_flags flags)
-{
- struct pool_buffer *pool_buf = pool_buffer(buf);
- struct pool_pb_manager *pool = pool_buf->mgr;
- return pb_validate(pool->buffer, vl, flags);
-}
-
-
-static void
-pool_buffer_fence(struct pb_buffer *buf,
- struct pipe_fence_handle *fence)
-{
- struct pool_buffer *pool_buf = pool_buffer(buf);
- struct pool_pb_manager *pool = pool_buf->mgr;
- pb_fence(pool->buffer, fence);
-}
-
-
-static void
-pool_buffer_get_base_buffer(struct pb_buffer *buf,
- struct pb_buffer **base_buf,
- pb_size *offset)
-{
- struct pool_buffer *pool_buf = pool_buffer(buf);
- struct pool_pb_manager *pool = pool_buf->mgr;
- pb_get_base_buffer(pool->buffer, base_buf, offset);
- *offset += pool_buf->start;
-}
-
-
-static const struct pb_vtbl
-pool_buffer_vtbl = {
- pool_buffer_destroy,
- pool_buffer_map,
- pool_buffer_unmap,
- pool_buffer_validate,
- pool_buffer_fence,
- pool_buffer_get_base_buffer
-};
-
-
-static struct pb_buffer *
-pool_bufmgr_create_buffer(struct pb_manager *mgr,
- pb_size size,
- const struct pb_desc *desc)
-{
- struct pool_pb_manager *pool = pool_pb_manager(mgr);
- struct pool_buffer *pool_buf;
- struct list_head *item;
-
- assert(size == pool->bufSize);
- assert(pool->bufAlign % desc->alignment == 0);
-
- mtx_lock(&pool->mutex);
-
- if (pool->numFree == 0) {
- mtx_unlock(&pool->mutex);
- debug_printf("warning: out of fixed size buffer objects\n");
- return NULL;
- }
-
- item = pool->free.next;
-
- if (item == &pool->free) {
- mtx_unlock(&pool->mutex);
- debug_printf("error: fixed size buffer pool corruption\n");
- return NULL;
- }
-
- LIST_DEL(item);
- --pool->numFree;
-
- mtx_unlock(&pool->mutex);
-
- pool_buf = LIST_ENTRY(struct pool_buffer, item, head);
- assert(!pipe_is_referenced(&pool_buf->base.reference));
- pipe_reference_init(&pool_buf->base.reference, 1);
- pool_buf->base.alignment = desc->alignment;
- pool_buf->base.usage = desc->usage;
-
- return SUPER(pool_buf);
-}
-
-
-static void
-pool_bufmgr_flush(struct pb_manager *mgr)
-{
- /* No-op */
-}
-
-
-static void
-pool_bufmgr_destroy(struct pb_manager *mgr)
-{
- struct pool_pb_manager *pool = pool_pb_manager(mgr);
- mtx_lock(&pool->mutex);
-
- FREE(pool->bufs);
-
- pb_unmap(pool->buffer);
- pb_reference(&pool->buffer, NULL);
-
- mtx_unlock(&pool->mutex);
-
- FREE(mgr);
-}
-
-
-struct pb_manager *
-pool_bufmgr_create(struct pb_manager *provider,
- pb_size numBufs,
- pb_size bufSize,
- const struct pb_desc *desc)
-{
- struct pool_pb_manager *pool;
- struct pool_buffer *pool_buf;
- pb_size i;
-
- if (!provider)
- return NULL;
-
- pool = CALLOC_STRUCT(pool_pb_manager);
- if (!pool)
- return NULL;
-
- pool->base.destroy = pool_bufmgr_destroy;
- pool->base.create_buffer = pool_bufmgr_create_buffer;
- pool->base.flush = pool_bufmgr_flush;
-
- LIST_INITHEAD(&pool->free);
-
- pool->numTot = numBufs;
- pool->numFree = numBufs;
- pool->bufSize = bufSize;
- pool->bufAlign = desc->alignment;
-
- (void) mtx_init(&pool->mutex, mtx_plain);
-
- pool->buffer = provider->create_buffer(provider, numBufs*bufSize, desc);
- if (!pool->buffer)
- goto failure;
-
- pool->map = pb_map(pool->buffer,
- PB_USAGE_CPU_READ |
- PB_USAGE_CPU_WRITE, NULL);
- if(!pool->map)
- goto failure;
-
- pool->bufs = (struct pool_buffer *)CALLOC(numBufs, sizeof(*pool->bufs));
- if (!pool->bufs)
- goto failure;
-
- pool_buf = pool->bufs;
- for (i = 0; i < numBufs; ++i) {
- pipe_reference_init(&pool_buf->base.reference, 0);
- pool_buf->base.alignment = 0;
- pool_buf->base.usage = 0;
- pool_buf->base.size = bufSize;
- pool_buf->base.vtbl = &pool_buffer_vtbl;
- pool_buf->mgr = pool;
- pool_buf->start = i * bufSize;
- LIST_ADDTAIL(&pool_buf->head, &pool->free);
- pool_buf++;
- }
-
- return SUPER(pool);
-
-failure:
- FREE(pool->bufs);
- if(pool->map)
- pb_unmap(pool->buffer);
- if(pool->buffer)
- pb_reference(&pool->buffer, NULL);
- FREE(pool);
- return NULL;
-}
More information about the mesa-commit
mailing list