ac/surface: cache DCC retile maps (v2)
authorMarek Olšák <marek.olsak@amd.com>
Tue, 9 Jun 2020 08:55:19 +0000 (04:55 -0400)
committerMarge Bot <eric+marge@anholt.net>
Wed, 10 Jun 2020 15:35:46 +0000 (15:35 +0000)
This reduces overhead when resizing windows or when allocating
similar image sizes over and over again.

v2: optimize the memory footprint of the cache

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5398>

src/amd/common/ac_surface.c
src/amd/common/ac_surface.h
src/gallium/drivers/radeonsi/si_texture.c

index a3f54d84106bca0368bc389abea423719a40a2a0..0e9604affef5d8693de21ff6f21ea1fb26072371 100644 (file)
 #include "amd_family.h"
 #include "addrlib/src/amdgpu_asic_addr.h"
 #include "ac_gpu_info.h"
+#include "util/hash_table.h"
 #include "util/macros.h"
+#include "util/simple_mtx.h"
 #include "util/u_atomic.h"
 #include "util/u_math.h"
+#include "util/u_memory.h"
 #include "sid.h"
 
 #include <errno.h>
 
 struct ac_addrlib {
        ADDR_HANDLE handle;
+
+       /* The cache of DCC retile maps for reuse when allocating images of
+        * similar sizes.
+        */
+       simple_mtx_t dcc_retile_map_lock;
+       struct hash_table *dcc_retile_maps;
+};
+
+struct dcc_retile_map_key {
+       enum radeon_family family;
+       unsigned retile_width;
+       unsigned retile_height;
+       bool rb_aligned;
+       bool pipe_aligned;
+       unsigned dcc_retile_num_elements;
+       ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT input;
 };
 
+static uint32_t dcc_retile_map_hash_key(const void *key)
+{
+       return _mesa_hash_data(key, sizeof(struct dcc_retile_map_key));
+}
+
+static bool dcc_retile_map_keys_equal(const void *a, const void *b)
+{
+       return memcmp(a, b, sizeof(struct dcc_retile_map_key)) == 0;
+}
+
+static void dcc_retile_map_free(struct hash_entry *entry)
+{
+       free((void*)entry->key);
+       free(entry->data);
+}
+
+static uint32_t *ac_compute_dcc_retile_map(struct ac_addrlib *addrlib,
+                                          const struct radeon_info *info,
+                                          unsigned retile_width, unsigned retile_height,
+                                          bool rb_aligned, bool pipe_aligned, bool use_uint16,
+                                          unsigned dcc_retile_num_elements,
+                                          const ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT *in)
+{
+       unsigned dcc_retile_map_size = dcc_retile_num_elements * (use_uint16 ? 2 : 4);
+       struct dcc_retile_map_key key;
+
+       assert(in->numFrags == 1 && in->numSlices == 1 && in->numMipLevels == 1);
+
+       memset(&key, 0, sizeof(key));
+       key.family = info->family;
+       key.retile_width = retile_width;
+       key.retile_height = retile_height;
+       key.rb_aligned = rb_aligned;
+       key.pipe_aligned = pipe_aligned;
+       key.dcc_retile_num_elements = dcc_retile_num_elements;
+       memcpy(&key.input, in, sizeof(*in));
+
+       simple_mtx_lock(&addrlib->dcc_retile_map_lock);
+
+       /* If we have already computed this retile map, get it from the hash table. */
+       struct hash_entry *entry = _mesa_hash_table_search(addrlib->dcc_retile_maps, &key);
+       if (entry) {
+               uint32_t *map = entry->data;
+               simple_mtx_unlock(&addrlib->dcc_retile_map_lock);
+               return map;
+       }
+
+       ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT addrin;
+       memcpy(&addrin, in, sizeof(*in));
+
+       ADDR2_COMPUTE_DCC_ADDRFROMCOORD_OUTPUT addrout = {};
+       addrout.size = sizeof(addrout);
+
+       void *dcc_retile_map = malloc(dcc_retile_map_size);
+       if (!dcc_retile_map) {
+               simple_mtx_unlock(&addrlib->dcc_retile_map_lock);
+               return NULL;
+       }
+
+       unsigned index = 0;
+
+       for (unsigned y = 0; y < retile_height; y += in->compressBlkHeight) {
+               addrin.y = y;
+
+               for (unsigned x = 0; x < retile_width; x += in->compressBlkWidth) {
+                       addrin.x = x;
+
+                       /* Compute src DCC address */
+                       addrin.dccKeyFlags.pipeAligned = pipe_aligned;
+                       addrin.dccKeyFlags.rbAligned = rb_aligned;
+                       addrout.addr = 0;
+
+                       if (Addr2ComputeDccAddrFromCoord(addrlib->handle, &addrin, &addrout) != ADDR_OK) {
+                               simple_mtx_unlock(&addrlib->dcc_retile_map_lock);
+                               return NULL;
+                       }
+
+                       if (use_uint16)
+                               ((uint16_t*)dcc_retile_map)[index * 2] = addrout.addr;
+                       else
+                               ((uint32_t*)dcc_retile_map)[index * 2] = addrout.addr;
+
+                       /* Compute dst DCC address */
+                       addrin.dccKeyFlags.pipeAligned = 0;
+                       addrin.dccKeyFlags.rbAligned = 0;
+                       addrout.addr = 0;
+
+                       if (Addr2ComputeDccAddrFromCoord(addrlib->handle, &addrin, &addrout) != ADDR_OK) {
+                               simple_mtx_unlock(&addrlib->dcc_retile_map_lock);
+                               return NULL;
+                       }
+
+                       if (use_uint16)
+                               ((uint16_t*)dcc_retile_map)[index * 2 + 1] = addrout.addr;
+                       else
+                               ((uint32_t*)dcc_retile_map)[index * 2 + 1] = addrout.addr;
+
+                       assert(index * 2 + 1 < dcc_retile_num_elements);
+                       index++;
+               }
+       }
+       /* Fill the remaining pairs with the last one (for the compute shader). */
+       for (unsigned i = index * 2; i < dcc_retile_num_elements; i++) {
+               if (use_uint16)
+                       ((uint16_t*)dcc_retile_map)[i] = ((uint16_t*)dcc_retile_map)[i - 2];
+               else
+                       ((uint32_t*)dcc_retile_map)[i] = ((uint32_t*)dcc_retile_map)[i - 2];
+       }
+
+       /* Insert the retile map into the hash table, so that it can be reused and
+        * the computation can be skipped for similar image sizes.
+        */
+       _mesa_hash_table_insert(addrlib->dcc_retile_maps,
+                               mem_dup(&key, sizeof(key)), dcc_retile_map);
+
+       simple_mtx_unlock(&addrlib->dcc_retile_map_lock);
+       return dcc_retile_map;
+}
+
 static void *ADDR_API allocSysMem(const ADDR_ALLOCSYSMEM_INPUT * pInput)
 {
        return malloc(pInput->sizeInBytes);
@@ -135,12 +273,17 @@ struct ac_addrlib *ac_addrlib_create(const struct radeon_info *info,
        }
 
        addrlib->handle = addrCreateOutput.hLib;
+       simple_mtx_init(&addrlib->dcc_retile_map_lock, mtx_plain);
+       addrlib->dcc_retile_maps = _mesa_hash_table_create(NULL, dcc_retile_map_hash_key,
+                                                          dcc_retile_map_keys_equal);
        return addrlib;
 }
 
 void ac_addrlib_destroy(struct ac_addrlib *addrlib)
 {
        AddrDestroy(addrlib->handle);
+       simple_mtx_destroy(&addrlib->dcc_retile_map_lock);
+       _mesa_hash_table_destroy(addrlib->dcc_retile_maps, dcc_retile_map_free);
        free(addrlib);
 }
 
@@ -1376,16 +1519,60 @@ static int gfx9_compute_miptree(struct ac_addrlib *addrlib,
                                surf->u.gfx9.dcc_retile_use_uint16 =
                                        surf->u.gfx9.display_dcc_size <= UINT16_MAX + 1 &&
                                        surf->dcc_size <= UINT16_MAX + 1;
+
+                               /* Align the retile map size to get more hash table hits and
+                                * decrease the maximum memory footprint when all retile maps
+                                * are cached in the hash table.
+                                */
+                               unsigned retile_dim[2] = {in->width, in->height};
+
+                               for (unsigned i = 0; i < 2; i++) {
+                                       /* Increase the alignment as the size increases.
+                                        * Greater alignment increases retile compute work,
+                                        * but decreases maximum memory footprint for the cache.
+                                        *
+                                        * With this alignment, the worst case memory footprint of
+                                        * the cache is:
+                                        *   1920x1080: 55 MB
+                                        *   2560x1440: 99 MB
+                                        *   3840x2160: 305 MB
+                                        *
+                                        * The worst case size in MB can be computed in Haskell as follows:
+                                        *   (sum (map get_retile_size (map get_dcc_size (deduplicate (map align_pair
+                                        *       [(i*16,j*16) | i <- [1..maxwidth`div`16], j <- [1..maxheight`div`16]]))))) `div` 1024^2
+                                        *     where
+                                        *       alignment x = if x <= 512 then 16 else if x <= 1024 then 32 else if x <= 2048 then 64 else 128
+                                        *       align x = (x + (alignment x) - 1) `div` (alignment x) * (alignment x)
+                                        *       align_pair e = (align (fst e), align (snd e))
+                                        *       deduplicate = map head . groupBy (\ a b -> ((fst a) == (fst b)) && ((snd a) == (snd b))) . sortBy compare
+                                        *       get_dcc_size e = ((fst e) * (snd e) * bpp) `div` 256
+                                        *       get_retile_size dcc_size = dcc_size * 2 * (if dcc_size <= 2^16 then 2 else 4)
+                                        *       bpp = 4; maxwidth = 3840; maxheight = 2160
+                                        */
+                                       if (retile_dim[i] <= 512)
+                                               retile_dim[i] = align(retile_dim[i], 16);
+                                       else if (retile_dim[i] <= 1024)
+                                               retile_dim[i] = align(retile_dim[i], 32);
+                                       else if (retile_dim[i] <= 2048)
+                                               retile_dim[i] = align(retile_dim[i], 64);
+                                       else
+                                               retile_dim[i] = align(retile_dim[i], 128);
+
+                                       /* Don't align more than the DCC pixel alignment. */
+                                       assert(dout.metaBlkWidth >= 128 && dout.metaBlkHeight >= 128);
+                               }
+
                                surf->u.gfx9.dcc_retile_num_elements =
-                                       DIV_ROUND_UP(in->width, dout.compressBlkWidth) *
-                                       DIV_ROUND_UP(in->height, dout.compressBlkHeight) * 2;
+                                       DIV_ROUND_UP(retile_dim[0], dout.compressBlkWidth) *
+                                       DIV_ROUND_UP(retile_dim[1], dout.compressBlkHeight) * 2;
                                /* Align the size to 4 (for the compute shader). */
                                surf->u.gfx9.dcc_retile_num_elements =
                                        align(surf->u.gfx9.dcc_retile_num_elements, 4);
 
                                if (!(surf->flags & RADEON_SURF_IMPORTED)) {
                                        /* Compute address mapping from non-displayable to displayable DCC. */
-                                       ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT addrin = {};
+                                       ADDR2_COMPUTE_DCC_ADDRFROMCOORD_INPUT addrin;
+                                       memset(&addrin, 0, sizeof(addrin));
                                        addrin.size             = sizeof(addrin);
                                        addrin.swizzleMode      = din.swizzleMode;
                                        addrin.resourceType     = din.resourceType;
@@ -1401,53 +1588,18 @@ static int gfx9_compute_miptree(struct ac_addrlib *addrlib,
                                        addrin.metaBlkWidth     = dout.metaBlkWidth;
                                        addrin.metaBlkHeight    = dout.metaBlkHeight;
                                        addrin.metaBlkDepth     = dout.metaBlkDepth;
-                                       addrin.dccRamSliceSize  = dout.dccRamSliceSize;
-
-                                       ADDR2_COMPUTE_DCC_ADDRFROMCOORD_OUTPUT addrout = {};
-                                       addrout.size = sizeof(addrout);
+                                       addrin.dccRamSliceSize  = 0; /* Don't care for non-layered images. */
 
                                        surf->u.gfx9.dcc_retile_map =
-                                               malloc(surf->u.gfx9.dcc_retile_num_elements * 4);
+                                               ac_compute_dcc_retile_map(addrlib, info,
+                                                                         retile_dim[0], retile_dim[1],
+                                                                         surf->u.gfx9.dcc.rb_aligned,
+                                                                         surf->u.gfx9.dcc.pipe_aligned,
+                                                                         surf->u.gfx9.dcc_retile_use_uint16,
+                                                                         surf->u.gfx9.dcc_retile_num_elements,
+                                                                         &addrin);
                                        if (!surf->u.gfx9.dcc_retile_map)
                                                return ADDR_OUTOFMEMORY;
-
-                                       unsigned index = 0;
-
-                                       for (unsigned y = 0; y < in->height; y += dout.compressBlkHeight) {
-                                               addrin.y = y;
-
-                                               for (unsigned x = 0; x < in->width; x += dout.compressBlkWidth) {
-                                                       addrin.x = x;
-
-                                                       /* Compute src DCC address */
-                                                       addrin.dccKeyFlags.pipeAligned = surf->u.gfx9.dcc.pipe_aligned;
-                                                       addrin.dccKeyFlags.rbAligned = surf->u.gfx9.dcc.rb_aligned;
-                                                       addrout.addr = 0;
-
-                                                       ret = Addr2ComputeDccAddrFromCoord(addrlib->handle, &addrin, &addrout);
-                                                       if (ret != ADDR_OK)
-                                                               return ret;
-
-                                                       surf->u.gfx9.dcc_retile_map[index * 2] = addrout.addr;
-
-                                                       /* Compute dst DCC address */
-                                                       addrin.dccKeyFlags.pipeAligned = 0;
-                                                       addrin.dccKeyFlags.rbAligned = 0;
-                                                       addrout.addr = 0;
-
-                                                       ret = Addr2ComputeDccAddrFromCoord(addrlib->handle, &addrin, &addrout);
-                                                       if (ret != ADDR_OK)
-                                                               return ret;
-
-                                                       surf->u.gfx9.dcc_retile_map[index * 2 + 1] = addrout.addr;
-
-                                                       assert(index * 2 + 1 < surf->u.gfx9.dcc_retile_num_elements);
-                                                       index++;
-                                               }
-                                       }
-                                       /* Fill the remaining pairs with the last one (for the compute shader). */
-                                       for (unsigned i = index * 2; i < surf->u.gfx9.dcc_retile_num_elements; i++)
-                                               surf->u.gfx9.dcc_retile_map[i] = surf->u.gfx9.dcc_retile_map[i - 2];
                                }
                        }
                }
index ad8e3e53eb26e5a19c00d9639ed15e499783d61f..5dce25365becc2d6564a838295af4676bbe97e14 100644 (file)
@@ -179,7 +179,7 @@ struct gfx9_surf_layout {
     uint16_t                    display_dcc_pitch_max;  /* (mip chain pitch - 1) */
     bool                        dcc_retile_use_uint16; /* if all values fit into uint16_t */
     uint32_t                    dcc_retile_num_elements;
-    uint32_t                    *dcc_retile_map;
+    void                        *dcc_retile_map;
 };
 
 struct radeon_surf {
index 242a23df1007a27a40f457e909c57f87b055fa25..45b4b84a6a806e815dcb376c7a34bcd837d66ebf 100644 (file)
@@ -802,13 +802,9 @@ static bool si_texture_get_handle(struct pipe_screen *screen, struct pipe_contex
 
 static void si_texture_destroy(struct pipe_screen *screen, struct pipe_resource *ptex)
 {
-   struct si_screen *sscreen = (struct si_screen *)screen;
    struct si_texture *tex = (struct si_texture *)ptex;
    struct si_resource *resource = &tex->buffer;
 
-   if (sscreen->info.chip_class >= GFX9)
-      free(tex->surface.u.gfx9.dcc_retile_map);
-
    si_texture_reference(&tex->flushed_depth_texture, NULL);
 
    if (tex->cmask_buffer != &tex->buffer) {
@@ -1163,20 +1159,14 @@ static struct si_texture *si_texture_create_object(struct pipe_screen *screen,
           */
          bool use_uint16 = tex->surface.u.gfx9.dcc_retile_use_uint16;
          unsigned num_elements = tex->surface.u.gfx9.dcc_retile_num_elements;
+         unsigned dcc_retile_map_size = num_elements * (use_uint16 ? 2 : 4);
          struct si_resource *buf = si_aligned_buffer_create(screen, 0, PIPE_USAGE_STREAM,
-                                                            num_elements * (use_uint16 ? 2 : 4),
+                                                            dcc_retile_map_size,
                                                             sscreen->info.tcc_cache_line_size);
-         uint32_t *ui = (uint32_t *)sscreen->ws->buffer_map(buf->buf, NULL, PIPE_TRANSFER_WRITE);
-         uint16_t *us = (uint16_t *)ui;
+         void *map = sscreen->ws->buffer_map(buf->buf, NULL, PIPE_TRANSFER_WRITE);
 
-         /* Upload the retile map into a staging buffer. */
-         if (use_uint16) {
-            for (unsigned i = 0; i < num_elements; i++)
-               us[i] = tex->surface.u.gfx9.dcc_retile_map[i];
-         } else {
-            for (unsigned i = 0; i < num_elements; i++)
-               ui[i] = tex->surface.u.gfx9.dcc_retile_map[i];
-         }
+         /* Upload the retile map into the staging buffer. */
+         memcpy(map, tex->surface.u.gfx9.dcc_retile_map, dcc_retile_map_size);
 
          /* Copy the staging buffer to the buffer backing the texture. */
          struct si_context *sctx = (struct si_context *)sscreen->aux_context;
@@ -1218,8 +1208,6 @@ static struct si_texture *si_texture_create_object(struct pipe_screen *screen,
 
 error:
    FREE(tex);
-   if (sscreen->info.chip_class >= GFX9)
-      free(surface->u.gfx9.dcc_retile_map);
    return NULL;
 }