From patchwork Tue Feb 6 10:57:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Connor Worley X-Patchwork-Id: 46071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1320578pzh; Tue, 6 Feb 2024 02:58:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrn1VrnIMKh5RbrUJY2rUI0Aa5mElahQnTb6ebMy8Ei38ANf0RDbeDtlsdea0sXDTAbtwf X-Received: by 2002:a17:906:d18b:b0:a38:2ad:e458 with SMTP id c11-20020a170906d18b00b00a3802ade458mr1341935ejz.29.1707217101907; Tue, 06 Feb 2024 02:58:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707217101; cv=none; d=google.com; s=arc-20160816; b=hIzBU657/FgQqXA3j4IxfFB+eQWRMY+C+/u3ORcjislbO+k/4RUZ+LyLEVgj+DWfqp yxaNaL9gQxmb4wq2bTXCmF65rP2cOu6eqdze0QZUxNtHFxybOPrgDcgfyyn/Rc7HeI27 2mca0HuUWNcGWmfu+YeX5+0gsVWpS/Z90soB32OSxji8tM2wFTTAmxbMhxCTrJtA18NZ 6dQ3312Iq4ijSlFsgN1yYSjQPn2WkmZwLvDXiFhgD9/ht5PFjwAtONK4pvfQQ5tYVsTO MgKCVq1snVnky8NtHLFfqdQJwdaUBurB1ePXPZ+7N/bdFVNh/p/kh7cLMdHVsEH9m5ps oPWg== 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=Yl+KiG1+ZPUpP69q+ev1a0D1TjSG8e7jHkFMl9nSEAw=; fh=+lhFRxN09WE0v5u3t4IIqWsrGrpfKUfQxw53WhQJ1J0=; b=sS9PytfSVqIbceEUT42Tk44cXbD0mp2tfHbyAkOrtIOarWYWK51kLhsp80VzRJK+9Y gc4D2Hc5VuYGuf/UrMuUN3N4mtSwfu4XUh0CkD/8N1WfQNCFU3qPo0b5d74vw7Rpk1TN FbMAh4LXKbhWq2JWSPg+RWlT18AIu/m4JQOdPWFYfGWEUaJKpbFeRnRCVQmyx3/OAJAT 9Z2IVYfqyYdDg0SAKwveteRZlh2ww3MKIHq6EcPAmOLjCGY+8Ho+yQ+a13gVMS7m2NYy fcewxutofehjAG+z1Z1zkbICKZxXSa39PdVoCj64TNqzAoGB0QEK3GlaEfjXBmP03CL3 cOlQ==; 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=Gwx6thyP; 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 X-Forwarded-Encrypted: i=0; AJvYcCUgcn1TvKa8naIS3HctAI7qU1yAj0GOT0cjWtQvvjCR/klC26u+kuBYL/dPR/9K8FCOGxTYXlgNQhhYY3zv5qhIgEl+IYo9EoEQotV65sPJw8V4pxUOhYgyuee4FKPOXAZllKOGsl6qpJEAFrwiPxyNbcfRgeBYKzq5teI3Vg3NFJYIWtDHKnblqgTZY5LlChugNoS2amT690wg9riwdjBSx6v5KGklviaAv2jAt20+wLrgdkcPqcIG7vFuWZ+EE08qVKECJQzSy/Le9qK2dwmP7FOlh7UkRoo1qZwr1TSvUZtL2tEyYnqZQ0dUByKCTC2bwYsoUWXuAL/Ppwbzih74MTW2nuVcPYsZFdHZUXlnwxV+WNOkO+yHf+vuVA0TBCW5xUJqXdU/l67xV9dRqEyzLXInlm0o9ixemvW6TTEA4/GhVAjz25NpC2fN0gnm8VU1ZgHIFzUUy8Pn1AAx7wfvA+WKDOrvNFswxkSz0FCwcz5rUibkTiLLlQbLLGTlLyWNqSydyz7ADfdafuNwqLGlBGGO0p304i8ujebNDF8haeAgixOQjFoum0rKjRlKmAO9+hKi+ahV7j8dRNNGgyXeepkxy1sxC7zDWvTkqacT/V5p6g4gX9S83WiDSgH0jjp3/fZtGdG5cEAiWuzYmpdBwww3e/f9MXmVaOsVxn9OCwsQndA4zDHplXHOaRXaikJ7UZmC3poVW9DnDcCQDe4RS1JCPwxa0C4j3MfPiz+sQTbaXiAHZ9FKPOfR5WUklWxdTBFPeRhZRGF8wHbDddbBQmuuw7TW1u10nFclvNjhp1I+cqz6d/x/9EU/CN/ljbYnPW/undHV19LI7d8VQnO0YQPn5qd/G8st5bKcWcSbg6n08m1R3e2V0avE3BqrnkEfIrWjuG9WhaCaVwL5eE8/v9x4dpyNMQ6zSi1D0Nm1n5gR3wxeZsrGMNUZQW5vLv1jf4 liD9Bb137kIiT6L6/1dYyki417QTd2EdDfPclqnlXVegMkv42TpsiVnmn3TtYHpXcnZkN2VzZPGnpL5PPpg7IMa5x3tloYlFGKIed1N5AOaGLPsbbVhVHWVbNh0Fl2beVO3lEa5HSaHSV3/aoYE9uTPC99+apeUvIgiilNRlyfAFwRfovlHVhO0kYWwAkzFWecNGKWxCfU2FFm76WweyeoD35/XOR7G3UBtxsWB8RFPX8g8I70ItWNncCDVFuHApQlmUh2U8I4mbQq/9vSQ9UCApi6vd9qTFNxXbXh+adjvUXWs6waXzhCICrVcCw7FezIclBWRtHHRe7o2PwIIGIjJHc8sZeu5k2WlWd1591PqAzFTIVGoabK+EI3N+zf9U1NZOKeiHtzKsAiBYUtdKPimdl5bAaSmumwJtylReAJfgCcnk10yHIlLHI5qGge5utFGlY3C5HhL1Izi6h3J7VEroRydGs402jVgFkmqg7ydXXdOfOKo/LdqYqtFYV9uWRTBJi9CHTeT115/cVCmEjSRXNsS2+7wBZSUZL3i72Was5nYkOc9uZGvL/jabxWfNcDWcaKv5wFuffIbAv47gghkrfyyhqSuIpgXgxRMOQvsYaKg8m5CBQ5Hkl4Kqw= Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u24-20020a170906409800b00a37d9853c39si942642ejj.738.2024.02.06.02.58.21; Tue, 06 Feb 2024 02:58:21 -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=Gwx6thyP; 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 467D568D164; Tue, 6 Feb 2024 12:58:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE4FB68D01B for ; Tue, 6 Feb 2024 12:58:05 +0200 (EET) Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-363b5ce4260so13010745ab.0 for ; Tue, 06 Feb 2024 02:58:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707217083; x=1707821883; 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=npj2AOyecchkLxk7f0JZvuGQ0rxxasL2JuuM4/IT3S0=; b=Gwx6thyPbFIYYXERGTMx2R6gbrkMNybnzEvmR5qDBm5xojscmqfdzDrwAo+7kYGMIg I3TWDA7RRUdRfW3tvdZXC2TmdhYHkx0i6JzWM8SJYqWwoVtWt2hMDFDuvlI++VvnBcaI wWPooDeQB6oF+YEk1rmjEqtmTsKfygORqVY6wisbtd/ptmOAlruyMBCfiPY0pMAL53KC QTioL8eSjXcMyeS4Sv69pL3jyqG+gpkWfpfg1/Ri6LbqvhCB8hnWWrD/KzAPbfAE+03A fbns960FFmcRCeGUq/DA6+JfSFQL0CqC0f2zbv3ACjaaYPdSAJesr1mNmcivhFWZjBxT NVGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707217083; x=1707821883; 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=npj2AOyecchkLxk7f0JZvuGQ0rxxasL2JuuM4/IT3S0=; b=J+7F0PiZZTS/ojbLnXYHpQH1syLzLjlTV9p4UNJ7ts9wrxgDXbgPXjfppnxS7n+Gru 3ysWf1Y8ai7lISab8olWgBZ464fX5nNv1PCnKnp1X6eeP6lgStw2J+ZycqLi24esMR0x vZsGCBWheXf03tMdedmVvGCdnB/YMOYWasAQ7QoBZFj1jgRRcsEqXYADNKcsZso6KkyJ DrjVno8cx1tXvtYfK9FTscLLF7/dD9P7xJS1v3Wsf2LWRnX7Mj46v+SLRoR7ZUacojak QpfNlH9Cd7N8WU6WiGEGdDUNJwm5J/XNU9NeM84bTh6buS4LWmoRUU1YgUwnhH4eBbSq Nhnw== X-Gm-Message-State: AOJu0YzRWmgYcZz6iD56ROW0tzWfE9627S9BivTSdSyZlHkuSGYqzcZV G+Mk932K3M7SzNUhJRsughbA6HTYyqq5agWm8iKJPmNbClgW2zXP3wkaW2g/dzM= X-Received: by 2002:a92:d312:0:b0:363:9ce7:42ed with SMTP id x18-20020a92d312000000b003639ce742edmr2194656ila.22.1707217083134; Tue, 06 Feb 2024 02:58:03 -0800 (PST) Received: from localhost ([2601:647:4600:84e0:11ee:353:31ea:3350]) by smtp.gmail.com with UTF8SMTPSA id h17-20020a656391000000b005cfbdf71baasm1562362pgv.47.2024.02.06.02.58.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Feb 2024 02:58:02 -0800 (PST) From: Connor Worley To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 02:57:54 -0800 Message-Id: <20240206105754.94877-2-connorbworley@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240206105754.94877-1-connorbworley@gmail.com> References: <20240206105754.94877-1-connorbworley@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: FpQpDPXdm8Kp 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 b274175689..ebc48aace3 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" @@ -37,76 +37,13 @@ * 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 enum DXVTextureFormat { DXV_FMT_DXT1 = MKBETAG('D', 'X', 'T', '1'), }; -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; @@ -123,10 +60,8 @@ typedef struct DXVEncContext { enum 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. @@ -161,27 +96,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++; @@ -190,13 +130,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++; @@ -298,11 +239,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, 4, 4, LOOKBACK_HT_ELEMS); + if (ret < 0) + return ret; + ret = av_hashtable_alloc(&ctx->lut_ht, 4, 4, LOOKBACK_HT_ELEMS); + if (ret < 0) + return ret; return 0; } @@ -313,6 +255,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; }