util: Move the open-addressing linear-probing hash_table to src/util.

This hash table is used in core Mesa, the GLSL compiler, and the i965
driver, which makes it a good candidate for the new src/util module.

It's much faster than program/hash_table.[ch] (see commit 6991c2922f5
for data), and José's u_hash_table.c has a comment saying Gallium should
probably consider switching to a linear probing hash table at some point.
So this seems like the best candidate for a shared data structure.

Signed-off-by: Kenneth Graunke <[email protected]>

v2 (Jason Ekstrand): Pick up another hash_table use and patch up scons

Signed-off-by: Jason Ekstrand <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>

21 files changed, 6 insertions, 1279 deletions

diff --git a/src/mesa/main/errors.c b/src/mesa/main/errors.c
index aa0ff50ac37..9cde1e02004 100644
--- a/src/mesa/main/errors.c
+++ b/src/mesa/main/errors.c
@@ -36,7 +36,7 @@
 #include "hash.h"
 #include "mtypes.h"
 #include "version.h"
-#include "hash_table.h"
+#include "util/hash_table.h"
 
 static mtx_t DynamicIDMutex = _MTX_INITIALIZER_NP;
 static GLuint NextDynamicID = 1;
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 674c29d650b..52095f7d1c3 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -37,7 +37,7 @@
 #include "glheader.h"
 #include "imports.h"
 #include "hash.h"
-#include "hash_table.h"
+#include "util/hash_table.h"
 
 /**
  * Magic GLuint object name that gets stored outside of the struct hash_table.
diff --git a/src/mesa/main/hash_table.c b/src/mesa/main/hash_table.c
deleted file mode 100644
index b51dada6691..00000000000
--- a/src/mesa/main/hash_table.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * Copyright © 2009,2012 Intel Corporation
- * Copyright © 1988-2004 Keith Packard and Bart Massey.
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Except as contained in this notice, the names of the authors
- * or their institutions shall not be used in advertising or
- * otherwise to promote the sale, use or other dealings in this
- * Software without prior written authorization from the
- * authors.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- *    Keith Packard <[email protected]>
- */
-
-/**
- * Implements an open-addressing, linear-reprobing hash table.
- *
- * For more information, see:
- *
- * http://cgit.freedesktop.org/~anholt/hash_table/tree/README
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "main/hash_table.h"
-#include "main/macros.h"
-#include "util/ralloc.h"
-
-static const uint32_t deleted_key_value;
-
-/**
- * From Knuth -- a good choice for hash/rehash values is p, p-2 where
- * p and p-2 are both prime.  These tables are sized to have an extra 10%
- * free to avoid exponential performance degradation as the hash table fills
- */
-static const struct {
-   uint32_t max_entries, size, rehash;
-} hash_sizes[] = {
-   { 2,			5,		3	  },
-   { 4,			7,		5	  },
-   { 8,			13,		11	  },
-   { 16,		19,		17	  },
-   { 32,		43,		41        },
-   { 64,		73,		71        },
-   { 128,		151,		149       },
-   { 256,		283,		281       },
-   { 512,		571,		569       },
-   { 1024,		1153,		1151      },
-   { 2048,		2269,		2267      },
-   { 4096,		4519,		4517      },
-   { 8192,		9013,		9011      },
-   { 16384,		18043,		18041     },
-   { 32768,		36109,		36107     },
-   { 65536,		72091,		72089     },
-   { 131072,		144409,		144407    },
-   { 262144,		288361,		288359    },
-   { 524288,		576883,		576881    },
-   { 1048576,		1153459,	1153457   },
-   { 2097152,		2307163,	2307161   },
-   { 4194304,		4613893,	4613891   },
-   { 8388608,		9227641,	9227639   },
-   { 16777216,		18455029,	18455027  },
-   { 33554432,		36911011,	36911009  },
-   { 67108864,		73819861,	73819859  },
-   { 134217728,		147639589,	147639587 },
-   { 268435456,		295279081,	295279079 },
-   { 536870912,		590559793,	590559791 },
-   { 1073741824,	1181116273,	1181116271},
-   { 2147483648ul,	2362232233ul,	2362232231ul}
-};
-
-static int
-entry_is_free(const struct hash_entry *entry)
-{
-   return entry->key == NULL;
-}
-
-static int
-entry_is_deleted(const struct hash_table *ht, struct hash_entry *entry)
-{
-   return entry->key == ht->deleted_key;
-}
-
-static int
-entry_is_present(const struct hash_table *ht, struct hash_entry *entry)
-{
-   return entry->key != NULL && entry->key != ht->deleted_key;
-}
-
-struct hash_table *
-_mesa_hash_table_create(void *mem_ctx,
-                        bool (*key_equals_function)(const void *a,
-                                                    const void *b))
-{
-   struct hash_table *ht;
-
-   ht = ralloc(mem_ctx, struct hash_table);
-   if (ht == NULL)
-      return NULL;
-
-   ht->size_index = 0;
-   ht->size = hash_sizes[ht->size_index].size;
-   ht->rehash = hash_sizes[ht->size_index].rehash;
-   ht->max_entries = hash_sizes[ht->size_index].max_entries;
-   ht->key_equals_function = key_equals_function;
-   ht->table = rzalloc_array(ht, struct hash_entry, ht->size);
-   ht->entries = 0;
-   ht->deleted_entries = 0;
-   ht->deleted_key = &deleted_key_value;
-
-   if (ht->table == NULL) {
-      ralloc_free(ht);
-      return NULL;
-   }
-
-   return ht;
-}
-
-/**
- * Frees the given hash table.
- *
- * If delete_function is passed, it gets called on each entry present before
- * freeing.
- */
-void
-_mesa_hash_table_destroy(struct hash_table *ht,
-                         void (*delete_function)(struct hash_entry *entry))
-{
-   if (!ht)
-      return;
-
-   if (delete_function) {
-      struct hash_entry *entry;
-
-      hash_table_foreach(ht, entry) {
-         delete_function(entry);
-      }
-   }
-   ralloc_free(ht);
-}
-
-/** Sets the value of the key pointer used for deleted entries in the table.
- *
- * The assumption is that usually keys are actual pointers, so we use a
- * default value of a pointer to an arbitrary piece of storage in the library.
- * But in some cases a consumer wants to store some other sort of value in the
- * table, like a uint32_t, in which case that pointer may conflict with one of
- * their valid keys.  This lets that user select a safe value.
- *
- * This must be called before any keys are actually deleted from the table.
- */
-void
-_mesa_hash_table_set_deleted_key(struct hash_table *ht, const void *deleted_key)
-{
-   ht->deleted_key = deleted_key;
-}
-
-/**
- * Finds a hash table entry with the given key and hash of that key.
- *
- * Returns NULL if no entry is found.  Note that the data pointer may be
- * modified by the user.
- */
-struct hash_entry *
-_mesa_hash_table_search(struct hash_table *ht, uint32_t hash,
-                        const void *key)
-{
-   uint32_t start_hash_address = hash % ht->size;
-   uint32_t hash_address = start_hash_address;
-
-   do {
-      uint32_t double_hash;
-
-      struct hash_entry *entry = ht->table + hash_address;
-
-      if (entry_is_free(entry)) {
-         return NULL;
-      } else if (entry_is_present(ht, entry) && entry->hash == hash) {
-         if (ht->key_equals_function(key, entry->key)) {
-            return entry;
-         }
-      }
-
-      double_hash = 1 + hash % ht->rehash;
-
-      hash_address = (hash_address + double_hash) % ht->size;
-   } while (hash_address != start_hash_address);
-
-   return NULL;
-}
-
-static void
-_mesa_hash_table_rehash(struct hash_table *ht, int new_size_index)
-{
-   struct hash_table old_ht;
-   struct hash_entry *table, *entry;
-
-   if (new_size_index >= ARRAY_SIZE(hash_sizes))
-      return;
-
-   table = rzalloc_array(ht, struct hash_entry,
-                         hash_sizes[new_size_index].size);
-   if (table == NULL)
-      return;
-
-   old_ht = *ht;
-
-   ht->table = table;
-   ht->size_index = new_size_index;
-   ht->size = hash_sizes[ht->size_index].size;
-   ht->rehash = hash_sizes[ht->size_index].rehash;
-   ht->max_entries = hash_sizes[ht->size_index].max_entries;
-   ht->entries = 0;
-   ht->deleted_entries = 0;
-
-   hash_table_foreach(&old_ht, entry) {
-      _mesa_hash_table_insert(ht, entry->hash,
-                              entry->key, entry->data);
-   }
-
-   ralloc_free(old_ht.table);
-}
-
-/**
- * Inserts the key with the given hash into the table.
- *
- * Note that insertion may rearrange the table on a resize or rehash,
- * so previously found hash_entries are no longer valid after this function.
- */
-struct hash_entry *
-_mesa_hash_table_insert(struct hash_table *ht, uint32_t hash,
-                        const void *key, void *data)
-{
-   uint32_t start_hash_address, hash_address;
-
-   if (ht->entries >= ht->max_entries) {
-      _mesa_hash_table_rehash(ht, ht->size_index + 1);
-   } else if (ht->deleted_entries + ht->entries >= ht->max_entries) {
-      _mesa_hash_table_rehash(ht, ht->size_index);
-   }
-
-   start_hash_address = hash % ht->size;
-   hash_address = start_hash_address;
-   do {
-      struct hash_entry *entry = ht->table + hash_address;
-      uint32_t double_hash;
-
-      if (!entry_is_present(ht, entry)) {
-         if (entry_is_deleted(ht, entry))
-            ht->deleted_entries--;
-         entry->hash = hash;
-         entry->key = key;
-         entry->data = data;
-         ht->entries++;
-         return entry;
-      }
-
-      /* Implement replacement when another insert happens
-       * with a matching key.  This is a relatively common
-       * feature of hash tables, with the alternative
-       * generally being "insert the new value as well, and
-       * return it first when the key is searched for".
-       *
-       * Note that the hash table doesn't have a delete
-       * callback.  If freeing of old data pointers is
-       * required to avoid memory leaks, perform a search
-       * before inserting.
-       */
-      if (entry->hash == hash &&
-          ht->key_equals_function(key, entry->key)) {
-         entry->key = key;
-         entry->data = data;
-         return entry;
-      }
-
-
-      double_hash = 1 + hash % ht->rehash;
-
-      hash_address = (hash_address + double_hash) % ht->size;
-   } while (hash_address != start_hash_address);
-
-   /* We could hit here if a required resize failed. An unchecked-malloc
-    * application could ignore this result.
-    */
-   return NULL;
-}
-
-/**
- * This function deletes the given hash table entry.
- *
- * Note that deletion doesn't otherwise modify the table, so an iteration over
- * the table deleting entries is safe.
- */
-void
-_mesa_hash_table_remove(struct hash_table *ht,
-                        struct hash_entry *entry)
-{
-   if (!entry)
-      return;
-
-   entry->key = ht->deleted_key;
-   ht->entries--;
-   ht->deleted_entries++;
-}
-
-/**
- * This function is an iterator over the hash table.
- *
- * Pass in NULL for the first entry, as in the start of a for loop.  Note that
- * an iteration over the table is O(table_size) not O(entries).
- */
-struct hash_entry *
-_mesa_hash_table_next_entry(struct hash_table *ht,
-                            struct hash_entry *entry)
-{
-   if (entry == NULL)
-      entry = ht->table;
-   else
-      entry = entry + 1;
-
-   for (; entry != ht->table + ht->size; entry++) {
-      if (entry_is_present(ht, entry)) {
-         return entry;
-      }
-   }
-
-   return NULL;
-}
-
-/**
- * Returns a random entry from the hash table.
- *
- * This may be useful in implementing random replacement (as opposed
- * to just removing everything) in caches based on this hash table
- * implementation.  @predicate may be used to filter entries, or may
- * be set to NULL for no filtering.
- */
-struct hash_entry *
-_mesa_hash_table_random_entry(struct hash_table *ht,
-                              bool (*predicate)(struct hash_entry *entry))
-{
-   struct hash_entry *entry;
-   uint32_t i = rand() % ht->size;
-
-   if (ht->entries == 0)
-      return NULL;
-
-   for (entry = ht->table + i; entry != ht->table + ht->size; entry++) {
-      if (entry_is_present(ht, entry) &&
-          (!predicate || predicate(entry))) {
-         return entry;
-      }
-   }
-
-   for (entry = ht->table; entry != ht->table + i; entry++) {
-      if (entry_is_present(ht, entry) &&
-          (!predicate || predicate(entry))) {
-         return entry;
-      }
-   }
-
-   return NULL;
-}
-
-
-/**
- * Quick FNV-1 hash implementation based on:
- * http://www.isthe.com/chongo/tech/comp/fnv/
- *
- * FNV-1 is not be the best hash out there -- Jenkins's lookup3 is supposed to
- * be quite good, and it probably beats FNV.  But FNV has the advantage that
- * it involves almost no code.  For an improvement on both, see Paul
- * Hsieh's http://www.azillionmonkeys.com/qed/hash.html
- */
-uint32_t
-_mesa_hash_data(const void *data, size_t size)
-{
-   uint32_t hash = 2166136261ul;
-   const uint8_t *bytes = data;
-
-   while (size-- != 0) {
-      hash ^= *bytes;
-      hash = hash * 0x01000193;
-      bytes++;
-   }
-
-   return hash;
-}
-
-/** FNV-1 string hash implementation */
-uint32_t
-_mesa_hash_string(const char *key)
-{
-   uint32_t hash = 2166136261ul;
-
-   while (*key != 0) {
-      hash ^= *key;
-      hash = hash * 0x01000193;
-      key++;
-   }
-
-   return hash;
-}
-
-/**
- * String compare function for use as the comparison callback in
- * _mesa_hash_table_create().
- */
-bool
-_mesa_key_string_equal(const void *a, const void *b)
-{
-   return strcmp(a, b) == 0;
-}
-
-bool
-_mesa_key_pointer_equal(const void *a, const void *b)
-{
-   return a == b;
-}
diff --git a/src/mesa/main/hash_table.h b/src/mesa/main/hash_table.h
deleted file mode 100644
index f51131aeed8..00000000000
--- a/src/mesa/main/hash_table.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright © 2009,2012 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- *
- */
-
-#ifndef _HASH_TABLE_H
-#define _HASH_TABLE_H
-
-#include <inttypes.h>
-#include <stdbool.h>
-
-#include "compiler.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct hash_entry {
-   uint32_t hash;
-   const void *key;
-   void *data;
-};
-
-struct hash_table {
-   struct hash_entry *table;
-   bool (*key_equals_function)(const void *a, const void *b);
-   const void *deleted_key;
-   uint32_t size;
-   uint32_t rehash;
-   uint32_t max_entries;
-   uint32_t size_index;
-   uint32_t entries;
-   uint32_t deleted_entries;
-};
-
-struct hash_table *
-_mesa_hash_table_create(void *mem_ctx,
-                        bool (*key_equals_function)(const void *a,
-                                                    const void *b));
-void _mesa_hash_table_destroy(struct hash_table *ht,
-                              void (*delete_function)(struct hash_entry *entry));
-void _mesa_hash_table_set_deleted_key(struct hash_table *ht,
-                                      const void *deleted_key);
-
-struct hash_entry *
-_mesa_hash_table_insert(struct hash_table *ht, uint32_t hash,
-                        const void *key, void *data);
-struct hash_entry *
-_mesa_hash_table_search(struct hash_table *ht, uint32_t hash,
-                        const void *key);
-void _mesa_hash_table_remove(struct hash_table *ht,
-                             struct hash_entry *entry);
-
-struct hash_entry *_mesa_hash_table_next_entry(struct hash_table *ht,
-                                               struct hash_entry *entry);
-struct hash_entry *
-_mesa_hash_table_random_entry(struct hash_table *ht,
-                              bool (*predicate)(struct hash_entry *entry));
-
-uint32_t _mesa_hash_data(const void *data, size_t size);
-uint32_t _mesa_hash_string(const char *key);
-bool _mesa_key_string_equal(const void *a, const void *b);
-bool _mesa_key_pointer_equal(const void *a, const void *b);
-
-static inline uint32_t _mesa_hash_pointer(const void *pointer)
-{
-   return _mesa_hash_data(&pointer, sizeof(pointer));
-}
-
-/**
- * This foreach function is safe against deletion (which just replaces
- * an entry's data with the deleted marker), but not against insertion
- * (which may rehash the table, making entry a dangling pointer).
- */
-#define hash_table_foreach(ht, entry)                   \
-   for (entry = _mesa_hash_table_next_entry(ht, NULL);  \
-        entry != NULL;                                  \
-        entry = _mesa_hash_table_next_entry(ht, entry))
-
-#ifdef __cplusplus
-} /* extern C */
-#endif
-
-#endif /* _HASH_TABLE_H */
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 85b975304ad..b4a5e70506b 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -42,7 +42,6 @@
 #include "main/dispatch.h"
 #include "main/enums.h"
 #include "main/hash.h"
-#include "main/hash_table.h"
 #include "main/mtypes.h"
 #include "main/pipelineobj.h"
 #include "main/shaderapi.h"
@@ -53,6 +52,7 @@
 #include "program/prog_print.h"
 #include "program/prog_parameter.h"
 #include "util/ralloc.h"
+#include "util/hash_table.h"
 #include <stdbool.h>
 #include "../glsl/glsl_parser_extras.h"
 #include "../glsl/ir.h"
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 5ae7014b1cd..0189dd2960a 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -30,7 +30,6 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "hash.h"
-#include "hash_table.h"
 #include "atifragshader.h"
 #include "bufferobj.h"
 #include "shared.h"
@@ -42,6 +41,7 @@
 #include "shaderobj.h"
 #include "syncobj.h"
 
+#include "util/hash_table.h"
 
 /**
  * Allocate and initialize a shared context state structure.
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index a88d7e469f2..225399eda3b 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -64,7 +64,7 @@
 #include "dispatch.h"
 #include "mtypes.h"
 #include "set.h"
-#include "hash_table.h"
+#include "util/hash_table.h"
 
 #include "syncobj.h"
 
diff --git a/src/mesa/main/tests/Makefile.am b/src/mesa/main/tests/Makefile.am
index 3c7c1b51ad8..251474d5c25 100644
--- a/src/mesa/main/tests/Makefile.am
+++ b/src/mesa/main/tests/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = hash_table
-
 AM_CFLAGS = \
 	$(X11_CFLAGS) \
 	$(PTHREAD_CFLAGS)
diff --git a/src/mesa/main/tests/hash_table/.gitignore b/src/mesa/main/tests/hash_table/.gitignore
deleted file mode 100644
index 1b9aaf4a27e..00000000000
--- a/src/mesa/main/tests/hash_table/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-collision
-delete_and_lookup
-delete_management
-destroy_callback
-insert_and_lookup
-insert_many
-null_destroy
-random_entry
-remove_null
-replacement
diff --git a/src/mesa/main/tests/hash_table/Makefile.am b/src/mesa/main/tests/hash_table/Makefile.am
deleted file mode 100644
index 0330ebb3e8f..00000000000
--- a/src/mesa/main/tests/hash_table/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2009 Intel Corporation
-#
-#  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
-#  ADAM JACKSON 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.
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/mesa/main \
-	$(DEFINES) $(INCLUDE_DIRS)
-
-LDADD = \
-	$(top_builddir)/src/mesa/libmesa.la \
-	$(PTHREAD_LIBS) \
-	$(DLOPEN_LIBS)
-
-TESTS = \
-	collision \
-	delete_and_lookup \
-	delete_management \
-	destroy_callback \
-	insert_and_lookup \
-	insert_many \
-	null_destroy \
-	random_entry \
-	remove_null \
-	replacement \
-	$()
-
-EXTRA_PROGRAMS = $(TESTS)
diff --git a/src/mesa/main/tests/hash_table/collision.c b/src/mesa/main/tests/hash_table/collision.c
deleted file mode 100644
index 9174c396151..00000000000
--- a/src/mesa/main/tests/hash_table/collision.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright © 2012 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-int
-main(int argc, char **argv)
-{
-   struct hash_table *ht;
-   const char *str1 = "test1";
-   const char *str2 = "test2";
-   struct hash_entry *entry1, *entry2;
-   uint32_t bad_hash = 5;
-   int i;
-
-   ht = _mesa_hash_table_create(NULL, _mesa_key_string_equal);
-
-   _mesa_hash_table_insert(ht, bad_hash, str1, NULL);
-   _mesa_hash_table_insert(ht, bad_hash, str2, NULL);
-
-   entry1 = _mesa_hash_table_search(ht, bad_hash, str1);
-   assert(entry1->key == str1);
-
-   entry2 = _mesa_hash_table_search(ht, bad_hash, str2);
-   assert(entry2->key == str2);
-
-   /* Check that we can still find #1 after inserting #2 */
-   entry1 = _mesa_hash_table_search(ht, bad_hash, str1);
-   assert(entry1->key == str1);
-
-   /* Remove the collided entry and look again. */
-   _mesa_hash_table_remove(ht, entry1);
-   entry2 = _mesa_hash_table_search(ht, bad_hash, str2);
-   assert(entry2->key == str2);
-
-   /* Put str1 back, then spam junk into the table to force a
-    * resize and make sure we can still find them both.
-    */
-   _mesa_hash_table_insert(ht, bad_hash, str1, NULL);
-   for (i = 0; i < 100; i++) {
-      char *key = malloc(10);
-      sprintf(key, "spam%d", i);
-      _mesa_hash_table_insert(ht, _mesa_hash_string(key), key, NULL);
-   }
-   entry1 = _mesa_hash_table_search(ht, bad_hash, str1);
-   assert(entry1->key == str1);
-   entry2 = _mesa_hash_table_search(ht, bad_hash, str2);
-   assert(entry2->key == str2);
-
-   _mesa_hash_table_destroy(ht, NULL);
-
-   return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/delete_and_lookup.c b/src/mesa/main/tests/hash_table/delete_and_lookup.c
deleted file mode 100644
index fc886ff4f4e..00000000000
--- a/src/mesa/main/tests/hash_table/delete_and_lookup.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-/* Return collisions, so we can test the deletion behavior for chained
- * objects.
- */
-static uint32_t
-badhash(const void *key)
-{
-	return 1;
-}
-
-int
-main(int argc, char **argv)
-{
-	struct hash_table *ht;
-	const char *str1 = "test1";
-	const char *str2 = "test2";
-	uint32_t hash_str1 = badhash(str1);
-	uint32_t hash_str2 = badhash(str2);
-	struct hash_entry *entry;
-
-	ht = _mesa_hash_table_create(NULL, _mesa_key_string_equal);
-
-	_mesa_hash_table_insert(ht, hash_str1, str1, NULL);
-	_mesa_hash_table_insert(ht, hash_str2, str2, NULL);
-
-	entry = _mesa_hash_table_search(ht, hash_str2, str2);
-	assert(strcmp(entry->key, str2) == 0);
-
-	entry = _mesa_hash_table_search(ht, hash_str1, str1);
-	assert(strcmp(entry->key, str1) == 0);
-
-	_mesa_hash_table_remove(ht, entry);
-
-	entry = _mesa_hash_table_search(ht, hash_str1, str1);
-	assert(entry == NULL);
-
-	entry = _mesa_hash_table_search(ht, hash_str2, str2);
-	assert(strcmp(entry->key, str2) == 0);
-
-	_mesa_hash_table_destroy(ht, NULL);
-
-	return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/delete_management.c b/src/mesa/main/tests/hash_table/delete_management.c
deleted file mode 100644
index b8d764019f4..00000000000
--- a/src/mesa/main/tests/hash_table/delete_management.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-static uint32_t
-key_value(const void *key)
-{
-   return *(const uint32_t *)key;
-}
-
-static bool
-uint32_t_key_equals(const void *a, const void *b)
-{
-   return key_value(a) == key_value(b);
-}
-
-int
-main(int argc, char **argv)
-{
-   struct hash_table *ht;
-   struct hash_entry *entry;
-   int size = 10000;
-   uint32_t keys[size];
-   uint32_t i;
-
-   ht = _mesa_hash_table_create(NULL, uint32_t_key_equals);
-
-   for (i = 0; i < size; i++) {
-      keys[i] = i;
-
-      _mesa_hash_table_insert(ht, i, keys + i, NULL);
-
-      if (i >= 100) {
-         uint32_t delete_value = i - 100;
-         entry = _mesa_hash_table_search(ht, delete_value,
-                                              &delete_value);
-         _mesa_hash_table_remove(ht, entry);
-      }
-   }
-
-   /* Make sure that all our entries were present at the end. */
-   for (i = size - 100; i < size; i++) {
-      entry = _mesa_hash_table_search(ht, i, keys + i);
-      assert(entry);
-      assert(key_value(entry->key) == i);
-   }
-
-   /* Make sure that no extra entries got in */
-   for (entry = _mesa_hash_table_next_entry(ht, NULL);
-        entry != NULL;
-        entry = _mesa_hash_table_next_entry(ht, entry)) {
-      assert(key_value(entry->key) >= size - 100 &&
-             key_value(entry->key) < size);
-   }
-   assert(ht->entries == 100);
-
-   _mesa_hash_table_destroy(ht, NULL);
-
-   return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/destroy_callback.c b/src/mesa/main/tests/hash_table/destroy_callback.c
deleted file mode 100644
index dce2b333234..00000000000
--- a/src/mesa/main/tests/hash_table/destroy_callback.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-static const char *str1 = "test1";
-static const char *str2 = "test2";
-static int delete_str1 = 0;
-static int delete_str2 = 0;
-
-static void
-delete_callback(struct hash_entry *entry)
-{
-   if (strcmp(entry->key, str1) == 0)
-      delete_str1 = 1;
-   else if (strcmp(entry->key, str2) == 0)
-      delete_str2 = 1;
-   else
-      abort();
-}
-
-int
-main(int argc, char **argv)
-{
-   struct hash_table *ht;
-   uint32_t hash_str1 = _mesa_hash_string(str1);
-   uint32_t hash_str2 = _mesa_hash_string(str2);
-
-   ht = _mesa_hash_table_create(NULL, _mesa_key_string_equal);
-
-   _mesa_hash_table_insert(ht, hash_str1, str1, NULL);
-   _mesa_hash_table_insert(ht, hash_str2, str2, NULL);
-
-   _mesa_hash_table_destroy(ht, delete_callback);
-
-   assert(delete_str1 && delete_str2);
-
-   return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/insert_and_lookup.c b/src/mesa/main/tests/hash_table/insert_and_lookup.c
deleted file mode 100644
index 402f3fd4002..00000000000
--- a/src/mesa/main/tests/hash_table/insert_and_lookup.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-int
-main(int argc, char **argv)
-{
-   struct hash_table *ht;
-   const char *str1 = "test1";
-   const char *str2 = "test2";
-   uint32_t hash_str1 = _mesa_hash_string(str1);
-   uint32_t hash_str2 = _mesa_hash_string(str2);
-   struct hash_entry *entry;
-
-   ht = _mesa_hash_table_create(NULL, _mesa_key_string_equal);
-
-   _mesa_hash_table_insert(ht, hash_str1, str1, NULL);
-   _mesa_hash_table_insert(ht, hash_str2, str2, NULL);
-
-   entry = _mesa_hash_table_search(ht, hash_str1, str1);
-   assert(strcmp(entry->key, str1) == 0);
-
-   entry = _mesa_hash_table_search(ht, hash_str2, str2);
-   assert(strcmp(entry->key, str2) == 0);
-
-   _mesa_hash_table_destroy(ht, NULL);
-
-   return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/insert_many.c b/src/mesa/main/tests/hash_table/insert_many.c
deleted file mode 100644
index b2122dcf96c..00000000000
--- a/src/mesa/main/tests/hash_table/insert_many.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-static uint32_t
-key_value(const void *key)
-{
-   return *(const uint32_t *)key;
-}
-
-static bool
-uint32_t_key_equals(const void *a, const void *b)
-{
-   return key_value(a) == key_value(b);
-}
-
-int
-main(int argc, char **argv)
-{
-   struct hash_table *ht;
-   struct hash_entry *entry;
-   int size = 10000;
-   uint32_t keys[size];
-   uint32_t i;
-
-   ht = _mesa_hash_table_create(NULL, uint32_t_key_equals);
-
-   for (i = 0; i < size; i++) {
-      keys[i] = i;
-
-      _mesa_hash_table_insert(ht, i, keys + i, NULL);
-   }
-
-   for (i = 0; i < size; i++) {
-      entry = _mesa_hash_table_search(ht, i, keys + i);
-      assert(entry);
-      assert(key_value(entry->key) == i);
-   }
-   assert(ht->entries == size);
-
-   _mesa_hash_table_destroy(ht, NULL);
-
-   return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/null_destroy.c b/src/mesa/main/tests/hash_table/null_destroy.c
deleted file mode 100644
index 3833464f454..00000000000
--- a/src/mesa/main/tests/hash_table/null_destroy.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "hash_table.h"
-
-int
-main(int argc, char **argv)
-{
-   _mesa_hash_table_destroy(NULL, NULL);
-
-   return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/random_entry.c b/src/mesa/main/tests/hash_table/random_entry.c
deleted file mode 100644
index 22cafa7e857..00000000000
--- a/src/mesa/main/tests/hash_table/random_entry.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright © 2009 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-static uint32_t
-key_value(const void *key)
-{
-   return *(const uint32_t *)key;
-}
-
-static bool
-uint32_t_key_equals(const void *a, const void *b)
-{
-   return key_value(a) == key_value(b);
-}
-
-static bool
-uint32_t_key_is_even(struct hash_entry *entry)
-{
-   return (key_value(entry->key) & 1) == 0;
-}
-
-int
-main(int argc, char **argv)
-{
-   struct hash_table *ht;
-   struct hash_entry *entry;
-   int size = 10000;
-   uint32_t keys[size];
-   uint32_t i, random_value;
-
-   ht = _mesa_hash_table_create(NULL, uint32_t_key_equals);
-
-   for (i = 0; i < size; i++) {
-      keys[i] = i;
-
-      _mesa_hash_table_insert(ht, i, keys + i, NULL);
-   }
-
-   /* Test the no-predicate case. */
-   entry = _mesa_hash_table_random_entry(ht, NULL);
-   assert(entry);
-
-   /* Check that we're getting different entries and that the predicate
-    * works.
-    */
-   for (i = 0; i < 100; i++) {
-      entry = _mesa_hash_table_random_entry(ht, uint32_t_key_is_even);
-      assert(entry);
-      assert((key_value(entry->key) & 1) == 0);
-      if (i == 0 || key_value(entry->key) != random_value)
-         break;
-      random_value = key_value(entry->key);
-   }
-   assert(i != 100);
-
-   _mesa_hash_table_destroy(ht, NULL);
-
-   return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/remove_null.c b/src/mesa/main/tests/hash_table/remove_null.c
deleted file mode 100644
index 90fb784ac40..00000000000
--- a/src/mesa/main/tests/hash_table/remove_null.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2011 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-int
-main(int argc, char **argv)
-{
-   struct hash_table *ht;
-
-   ht = _mesa_hash_table_create(NULL, _mesa_key_string_equal);
-
-   _mesa_hash_table_remove(ht, NULL);
-
-   _mesa_hash_table_destroy(ht, NULL);
-
-   return 0;
-}
diff --git a/src/mesa/main/tests/hash_table/replacement.c b/src/mesa/main/tests/hash_table/replacement.c
deleted file mode 100644
index 387cfc0fd94..00000000000
--- a/src/mesa/main/tests/hash_table/replacement.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright © 2011 Intel Corporation
- *
- * 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, sublicense,
- * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Eric Anholt <[email protected]>
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "hash_table.h"
-
-int
-main(int argc, char **argv)
-{
-   struct hash_table *ht;
-   char *str1 = strdup("test1");
-   char *str2 = strdup("test1");
-   uint32_t hash_str1 = _mesa_hash_string(str1);
-   uint32_t hash_str2 = _mesa_hash_string(str2);
-   struct hash_entry *entry;
-
-   assert(str1 != str2);
-
-   ht = _mesa_hash_table_create(NULL, _mesa_key_string_equal);
-
-   _mesa_hash_table_insert(ht, hash_str1, str1, str1);
-   _mesa_hash_table_insert(ht, hash_str2, str2, str2);
-
-   entry = _mesa_hash_table_search(ht, hash_str1, str1);
-   assert(entry);
-   assert(entry->data == str2);
-
-   _mesa_hash_table_remove(ht, entry);
-
-   entry = _mesa_hash_table_search(ht, hash_str1, str1);
-   assert(!entry);
-
-   _mesa_hash_table_destroy(ht, NULL);
-   free(str1);
-   free(str2);
-
-   return 0;
-}
diff --git a/src/mesa/main/vdpau.c b/src/mesa/main/vdpau.c
index 975b812cda5..e1c3e00ba5a 100644
--- a/src/mesa/main/vdpau.c
+++ b/src/mesa/main/vdpau.c
@@ -32,9 +32,9 @@
  */
 
 #include <stdbool.h>
+#include "util/hash_table.h"
 #include "context.h"
 #include "glformats.h"
-#include "hash_table.h"
 #include "set.h"
 #include "texobj.h"
 #include "teximage.h"