From patchwork Thu Feb 22 01:09:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Worley X-Patchwork-Id: 46428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp55155pze; Wed, 21 Feb 2024 17:09:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWi/2xHjkkWayej1QzhfsIaJbffARiAMQavNqT9qZo4CUMZQ1Dqez91IZsYA+7OfDVytUkyglB888sMCbG10Kl2JtR2jHWqnabR6A== X-Google-Smtp-Source: AGHT+IFTWd34IYmAFyTbHm87+Ki2v+Xkv0zgJObQUEdGAIaJsHxhQJOW63MP6nqWBiC9sYNM3dzo X-Received: by 2002:a17:906:3055:b0:a3f:11d5:2b64 with SMTP id d21-20020a170906305500b00a3f11d52b64mr3723929ejd.7.1708564190957; Wed, 21 Feb 2024 17:09:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708564190; cv=none; d=google.com; s=arc-20160816; b=gGU9DYMcUD6DNXo798Mi+CROxXsm0Z5+2XI6UiDQbEbl1m7GGItdURjLjiOAuHR/M6 7B0icpDjJWmSvVCBeDDtJQjLoqcwtWghrGpiOUq6r4n3n91AiZlP4BXtHe9BaHXXLOc/ qTJRj/0bo/9+gAf8j/SB+igBRyyMhOSndtbe0Q2yEaZPKnximu/Ovs/tWhsmjq4LVNru UC8n21ZITsFrrKYLkYGgTQ9B20sChbaDXLIOrDwDRS0ULt5zZXDcTQCLA1OVx8FdtUk3 KZNOIlI9okPexWXqMb6sjF7AlnhL06ffUW8+hRPBe7PpI3smKq4xc2Gjh8yOD/pEakip sS9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=toVuaj/5S8m5MmC83TvZ8MuFgfFHf9CoxnUPjKhRXss=; fh=4o9WedBEbOrq7GvNs0s+TOKeyzmDZRM3O7oe6ZP6vYM=; b=Ve8CBXkN21y9qkkrwRYx2lzwnFgcYY6O1GAg9fYSF+MTppV09FgEImt+8DwctuheMC DPmT8jU345QXRiXwIv1ulT3FX4bynKGbqnjOdKGyHPcoHxnXlu0JLgd/dwokgUMD9Ivp Btj5ryaThtnF++XLLwPmdt/clOrm7pQCs3QSAnlaeqvUsim/i62ElQJ1DcwFFJLCKy9l mvQRt87QM0O/in8E/eX3xen16WxdIhMUyHEWuU7yAp46X4pniePudrBdqrpX22FXt7Xh Fa+opVVDU1HGd3UgxDzMcn1W61XvIs8beV+BJmuWcZe9SnJNVSxYti4YEzP18ybdR8yC jStA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=OXuddUom; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kl10-20020a170907994a00b00a3e73c92596si3630730ejc.171.2024.02.21.17.09.50; Wed, 21 Feb 2024 17:09:50 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=OXuddUom; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 372A868D1BC; Thu, 22 Feb 2024 03:09:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3788D68CE03 for ; Thu, 22 Feb 2024 03:09:34 +0200 (EET) Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-21e9589d4ffso687259fac.1 for ; Wed, 21 Feb 2024 17:09:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708564172; x=1709168972; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vKIzIPnaF74hTEBo6hTGII7uZnsVG1nelUp8vw/Df9M=; b=OXuddUomU/ziCGUIMZeTNzu2fZj8D0sMhvarnfpu3n9nt0v/L34/HCJEdcZ3VOMaRY 54IkV2h3RbEVFZmk0ZSamRjEwZZ8ts3j6CY6HDJrQ5y2XbAxlVYC591Z42yMTyzFOvGF CYyCHY9umPeBPNVSZWrVSe2epVucL3D2zX8cOt72Z1CulKi3YgwA0u/VO+DEuvMtp4cK Tzxl77eIAx/6teke1uVGoydWa2KGAGf/ckI366fBUqjQoZvhQpV224yZMSHLAz3EgwM5 sCdJbPbYJO0J6namoOo0u2zbEUpo1yesp79M8IC8rcTbHjPDWtxaW1P29nf18yLG5gT3 041A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708564172; x=1709168972; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vKIzIPnaF74hTEBo6hTGII7uZnsVG1nelUp8vw/Df9M=; b=PhdtYzKkR7MxyFn1npD6xa13+e1RbBo0zCP6FHFiTM/0m/ulYJJGkfxEOXmGxzZz3F fozyGiVfvlsb1ewLIqzXRFgcZD+kPNimbao+l7sL9i4Ngo1x+MOsB36u07C+HI0ycW3H Exmgf68NbPS7oBu+7w6GdCgEYdthvl+uSGVAXJbNEZzA4zIHEzoSASUbEPgIvJqup8zc 39vUkKJCd164x3Hu+OguEdkKKvOLk/Qx5liLOXlwGn0znwHW0heC5UUELLYCzb38RPsg ikMeKPujqQS4F8LmwBpBOFLj+u36VMBNVTPNkfMM+UAMv+9p8j0oddqWxFkmkqsy+Y7X mgDQ== X-Gm-Message-State: AOJu0YxrC63wznqpiEZqZef9qgw+MGsUp6BAnLnImjzP76E4Cl7Tm8x0 JnYtuH957WE/8FsNYZPAtRTx9sUJUIo33Lrvrk/Q3/RRxdOOS1q9QaAGjc3+ X-Received: by 2002:a05:6870:c48:b0:21e:45ff:120d with SMTP id lf8-20020a0568700c4800b0021e45ff120dmr16175392oab.44.1708564172037; Wed, 21 Feb 2024 17:09:32 -0800 (PST) Received: from localhost ([2607:fb90:9f8a:d954:c542:ca9a:41d4:eb18]) by smtp.gmail.com with UTF8SMTPSA id gq19-20020a056870d91300b0021e8424e466sm2615303oab.25.2024.02.21.17.09.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Feb 2024 17:09:31 -0800 (PST) From: Connor Worley To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Feb 2024 17:09:22 -0800 Message-Id: <20240222010922.67688-2-connorbworley@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240222010922.67688-1-connorbworley@gmail.com> References: <20240222010922.67688-1-connorbworley@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/2] lavc/dxvenc: migrate DXT1 encoder to lavu hashtable X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Connor Worley Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o3+DXJFegFI2 Offers a modest performance gain due to the switch from naive linear probling to robin hood. Signed-off-by: Connor Worley --- libavcodec/dxvenc.c | 121 ++++++++++++-------------------------------- 1 file changed, 33 insertions(+), 88 deletions(-) diff --git a/libavcodec/dxvenc.c b/libavcodec/dxvenc.c index 1ce2b1d014..980269657d 100644 --- a/libavcodec/dxvenc.c +++ b/libavcodec/dxvenc.c @@ -21,7 +21,7 @@ #include -#include "libavutil/crc.h" +#include "libavutil/hashtable.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" @@ -38,72 +38,9 @@ * appeared in the decompressed stream. Using a simple hash table (HT) * significantly speeds up the lookback process while encoding. */ -#define LOOKBACK_HT_ELEMS 0x40000 +#define LOOKBACK_HT_ELEMS 0x20202 #define LOOKBACK_WORDS 0x20202 -typedef struct HTEntry { - uint32_t key; - uint32_t pos; -} HTEntry; - -static void ht_init(HTEntry *ht) -{ - for (size_t i = 0; i < LOOKBACK_HT_ELEMS; i++) { - ht[i].pos = -1; - } -} - -static uint32_t ht_lookup_and_upsert(HTEntry *ht, const AVCRC *hash_ctx, - uint32_t key, uint32_t pos) -{ - uint32_t ret = -1; - size_t hash = av_crc(hash_ctx, 0, (uint8_t*)&key, 4) % LOOKBACK_HT_ELEMS; - for (size_t i = hash; i < hash + LOOKBACK_HT_ELEMS; i++) { - size_t wrapped_index = i % LOOKBACK_HT_ELEMS; - HTEntry *entry = &ht[wrapped_index]; - if (entry->key == key || entry->pos == -1) { - ret = entry->pos; - entry->key = key; - entry->pos = pos; - break; - } - } - return ret; -} - -static void ht_delete(HTEntry *ht, const AVCRC *hash_ctx, - uint32_t key, uint32_t pos) -{ - HTEntry *removed_entry = NULL; - size_t removed_hash; - size_t hash = av_crc(hash_ctx, 0, (uint8_t*)&key, 4) % LOOKBACK_HT_ELEMS; - - for (size_t i = hash; i < hash + LOOKBACK_HT_ELEMS; i++) { - size_t wrapped_index = i % LOOKBACK_HT_ELEMS; - HTEntry *entry = &ht[wrapped_index]; - if (entry->pos == -1) - return; - if (removed_entry) { - size_t candidate_hash = av_crc(hash_ctx, 0, (uint8_t*)&entry->key, 4) % LOOKBACK_HT_ELEMS; - if ((wrapped_index > removed_hash && (candidate_hash <= removed_hash || candidate_hash > wrapped_index)) || - (wrapped_index < removed_hash && (candidate_hash <= removed_hash && candidate_hash > wrapped_index))) { - *removed_entry = *entry; - entry->pos = -1; - removed_entry = entry; - removed_hash = wrapped_index; - } - } else if (entry->key == key) { - if (entry->pos <= pos) { - entry->pos = -1; - removed_entry = entry; - removed_hash = wrapped_index; - } else { - return; - } - } - } -} - typedef struct DXVEncContext { AVClass *class; @@ -120,10 +57,8 @@ typedef struct DXVEncContext { DXVTextureFormat tex_fmt; int (*compress_tex)(AVCodecContext *avctx); - const AVCRC *crc_ctx; - - HTEntry color_lookback_ht[LOOKBACK_HT_ELEMS]; - HTEntry lut_lookback_ht[LOOKBACK_HT_ELEMS]; + struct AVHashtableContext *color_ht; + struct AVHashtableContext *lut_ht; } DXVEncContext; /* Converts an index offset value to a 2-bit opcode and pushes it to a stream. @@ -158,27 +93,32 @@ static int dxv_compress_dxt1(AVCodecContext *avctx) DXVEncContext *ctx = avctx->priv_data; PutByteContext *pbc = &ctx->pbc; uint32_t *value; - uint32_t color, lut, idx, color_idx, lut_idx, prev_pos, state = 16, pos = 2, op = 0; + uint32_t color, lut, idx, color_idx, lut_idx, prev_pos, state = 16, pos = 0, op = 0; - ht_init(ctx->color_lookback_ht); - ht_init(ctx->lut_lookback_ht); + av_hashtable_clear(ctx->color_ht); + av_hashtable_clear(ctx->lut_ht); bytestream2_put_le32(pbc, AV_RL32(ctx->tex_data)); + av_hashtable_set(ctx->color_ht, ctx->tex_data, &pos); + pos++; bytestream2_put_le32(pbc, AV_RL32(ctx->tex_data + 4)); - - ht_lookup_and_upsert(ctx->color_lookback_ht, ctx->crc_ctx, AV_RL32(ctx->tex_data), 0); - ht_lookup_and_upsert(ctx->lut_lookback_ht, ctx->crc_ctx, AV_RL32(ctx->tex_data + 4), 1); + av_hashtable_set(ctx->lut_ht, ctx->tex_data + 4, &pos); + pos++; while (pos + 2 <= ctx->tex_size / 4) { idx = 0; + color_idx = 0; + lut_idx = 0; color = AV_RL32(ctx->tex_data + pos * 4); - prev_pos = ht_lookup_and_upsert(ctx->color_lookback_ht, ctx->crc_ctx, color, pos); - color_idx = prev_pos != -1 ? pos - prev_pos : 0; + if (av_hashtable_get(ctx->color_ht, &color, &prev_pos)) + color_idx = pos - prev_pos; + av_hashtable_set(ctx->color_ht, &color, &pos); + if (pos >= LOOKBACK_WORDS) { uint32_t old_pos = pos - LOOKBACK_WORDS; - uint32_t old_color = AV_RL32(ctx->tex_data + old_pos * 4); - ht_delete(ctx->color_lookback_ht, ctx->crc_ctx, old_color, old_pos); + if (av_hashtable_get(ctx->color_ht, ctx->tex_data + old_pos * 4, &prev_pos) && prev_pos <= old_pos) + av_hashtable_delete(ctx->color_ht, ctx->tex_data + old_pos * 4); } pos++; @@ -187,13 +127,14 @@ static int dxv_compress_dxt1(AVCodecContext *avctx) idx = color_idx; } else { idx = 0; - prev_pos = ht_lookup_and_upsert(ctx->lut_lookback_ht, ctx->crc_ctx, lut, pos); - lut_idx = prev_pos != -1 ? pos - prev_pos : 0; + if (av_hashtable_get(ctx->lut_ht, &lut, &prev_pos)) + lut_idx = pos - prev_pos; + av_hashtable_set(ctx->lut_ht, &lut, &pos); } if (pos >= LOOKBACK_WORDS) { uint32_t old_pos = pos - LOOKBACK_WORDS; - uint32_t old_lut = AV_RL32(ctx->tex_data + old_pos * 4); - ht_delete(ctx->lut_lookback_ht, ctx->crc_ctx, old_lut, old_pos); + if (av_hashtable_get(ctx->lut_ht, ctx->tex_data + old_pos * 4, &prev_pos) && prev_pos <= old_pos) + av_hashtable_delete(ctx->lut_ht, ctx->tex_data + old_pos * 4); } pos++; @@ -305,11 +246,12 @@ static av_cold int dxv_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - ctx->crc_ctx = av_crc_get_table(AV_CRC_32_IEEE); - if (!ctx->crc_ctx) { - av_log(avctx, AV_LOG_ERROR, "Could not initialize CRC table.\n"); - return AVERROR_BUG; - } + ret = av_hashtable_alloc(&ctx->color_ht, sizeof(uint32_t), sizeof(uint32_t), LOOKBACK_HT_ELEMS); + if (ret < 0) + return ret; + ret = av_hashtable_alloc(&ctx->lut_ht, sizeof(uint32_t), sizeof(uint32_t), LOOKBACK_HT_ELEMS); + if (ret < 0) + return ret; return 0; } @@ -320,6 +262,9 @@ static av_cold int dxv_close(AVCodecContext *avctx) av_freep(&ctx->tex_data); + av_hashtable_freep(&ctx->color_ht); + av_hashtable_freep(&ctx->lut_ht); + return 0; }