Re: [Mesa-dev] [PATCH 1/2] util: import the slab allocator from gallium

2016-08-29 Thread Marek Olšák
On Mon, Aug 29, 2016 at 10:40 PM, Dave Airlie  wrote:
>>
>> There are also some cosmetic changes.
>
> Did I miss 0/2? is there some future use for this in mesa?
>
> I assume there is, just wanting more info :)

It was for an experiment that turned out to be a disaster. There is no
other use.

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


Re: [Mesa-dev] [PATCH 1/2] util: import the slab allocator from gallium

2016-08-29 Thread Dave Airlie
>
> There are also some cosmetic changes.

Did I miss 0/2? is there some future use for this in mesa?

I assume there is, just wanting more info :)

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


[Mesa-dev] [PATCH 1/2] util: import the slab allocator from gallium

2016-08-29 Thread Marek Olšák
From: Marek Olšák 

There are also some cosmetic changes.
---
 src/util/Makefile.sources |   2 +
 src/util/slab.c   | 180 ++
 src/util/slab.h   |  62 
 3 files changed, 244 insertions(+)
 create mode 100644 src/util/slab.c
 create mode 100644 src/util/slab.h

diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources
index 6def4f7..d72107a 100644
--- a/src/util/Makefile.sources
+++ b/src/util/Makefile.sources
@@ -18,19 +18,21 @@ MESA_UTIL_FILES :=  \
ralloc.c \
ralloc.h \
register_allocate.c \
register_allocate.h \
rgtc.c \
rgtc.h \
rounding.h \
set.c \
set.h \
simple_list.h \
+   slab.c \
+   slab.h \
strndup.c \
strndup.h \
strtod.c \
strtod.h \
texcompress_rgtc_tmp.h \
u_atomic.h
 
 MESA_UTIL_GENERATED_FILES = \
format_srgb.c
diff --git a/src/util/slab.c b/src/util/slab.c
new file mode 100644
index 000..acf818b
--- /dev/null
+++ b/src/util/slab.c
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2010 Marek Olšák 
+ * Copyright 2016 Advanced Micro Devices, Inc.
+ *
+ * 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
+ * on 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 above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * 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 AUTHOR(S) AND/OR THEIR 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. */
+
+#include "slab.h"
+#include "macros.h"
+#include "simple_list.h"
+#include 
+#include 
+
+#define ALIGN(value, align) (((value) + (align) - 1) & ~((align) - 1))
+
+#ifdef DEBUG
+#define SLAB_MAGIC 0xcafe4321
+#define SET_MAGIC(element)   (element)->magic = SLAB_MAGIC
+#define CHECK_MAGIC(element) assert((element)->magic == SLAB_MAGIC)
+#else
+#define SET_MAGIC(element)
+#define CHECK_MAGIC(element)
+#endif
+
+/* One array element within a big buffer. */
+struct slab_element_header {
+   /* The next free element. */
+   struct slab_element_header *next_free;
+
+#ifdef DEBUG
+   /* Use intptr_t to keep the header aligned to a pointer size. */
+   intptr_t magic;
+#endif
+};
+
+static struct slab_element_header *
+slab_get_element(struct slab_mempool *pool,
+ struct slab_page_header *page, unsigned index)
+{
+   return (struct slab_element_header*)
+  ((uint8_t*)[1] + (pool->element_size * index));
+}
+
+static bool
+slab_add_new_page(struct slab_mempool *pool)
+{
+   struct slab_page_header *page;
+   struct slab_element_header *element;
+   unsigned i;
+
+   page = malloc(sizeof(struct slab_page_header) +
+ pool->num_elements * pool->element_size);
+   if (!page)
+  return false;
+
+   if (!pool->list.prev)
+  make_empty_list(>list);
+
+   insert_at_tail(>list, page);
+
+   /* Mark all elements as free. */
+   for (i = 0; i < pool->num_elements-1; i++) {
+  element = slab_get_element(pool, page, i);
+  element->next_free = slab_get_element(pool, page, i + 1);
+  SET_MAGIC(element);
+   }
+
+   element = slab_get_element(pool, page, pool->num_elements - 1);
+   element->next_free = pool->first_free;
+   SET_MAGIC(element);
+   pool->first_free = slab_get_element(pool, page, 0);
+   return true;
+}
+
+/**
+ * Allocate an object from the slab. Single-threaded (no mutex).
+ */
+void *
+slab_alloc_st(struct slab_mempool *pool)
+{
+   struct slab_element_header *element;
+
+   /* Allocate a new page. */
+   if (!pool->first_free &&
+   !slab_add_new_page(pool))
+  return NULL;
+
+   element = pool->first_free;
+   CHECK_MAGIC(element);
+   pool->first_free = element->next_free;
+   return [1];
+}
+
+/**
+ * Free an object allocated from the slab. Single-threaded (no mutex).
+ */
+void
+slab_free_st(struct slab_mempool *pool, void *ptr)
+{
+   struct slab_element_header *element =
+  ((struct slab_element_header*)ptr - 1);
+
+   CHECK_MAGIC(element);
+   element->next_free = pool->first_free;
+   pool->first_free = element;
+}
+
+/**
+ * Allocate an object from the slab. Thread-safe.
+ */
+void *