From patchwork Wed Dec 1 03:52:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyou Yin X-Patchwork-Id: 31857 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp8672946iob; Tue, 30 Nov 2021 19:53:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/V4g9yFtMJfgfPKIpKEcWkKPP0iqrClLpMrnDHO6jMgoQka6Wx7/Ea+E3FU1KCAAJrr17 X-Received: by 2002:a17:906:478e:: with SMTP id cw14mr3949232ejc.46.1638330788514; Tue, 30 Nov 2021 19:53:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638330788; cv=none; d=google.com; s=arc-20160816; b=LKfTXXUDWp81RRAeuAeGU6ve3Q3FdUe0+lrZ9M9+lksNMrsa/f3E28nym4vLd4DDRJ sc1lZXOEl1GZVKBvVTHxjVhjGxmRi5v8+qJOd7RL7LgHRIYWXNvViaU5FwL1CW8WiIlQ 91ibfi13bJ0H+UVaIaAf1Bw+WxO3wOYwKBDg901QfSszP/vOTF5ydI8jfIEEwKuFnVf3 MFuFeGrp6xe/Mqiq4kvZ2yuKZc3tU8Y6GRePwLkIvmaeItETpTaqrUZ836jMNbiUt1Mg K+DTVNuU79r7AvNgYZvynYp6CcrwrFC8kQ+IkjvbXcbjgrzrnb/2Suydsh6rhRFsNVK0 oRUg== 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:delivered-to; bh=sduGCcAbMSufCMHGfFgJRx8R0agZZETRU/TJlTHmfEU=; b=gvKNuJPW6GCUBTdVk8rOQjvhrsraDgQfhNLt2FC8kf4APDF6scJUICwe10fbe0Strs 6OoYnd6l5WPtfS8MmfHy1AopO9duv8r9lGeL5oe/nOpKcgsHRfyrp8D35nOm6psD9RIV OdWQr8eFFXVUxtluDfXeNE687r7v00bf1o7KPNty9V3yELBqLoSU1f+dXmFEpmxGLDqL 3jsEBxgjWcO6+sARo+9GTkHgS8jjEFTlQxP79j8pFNCDO9lZFUq/N6sD3Ai5+xTnZMmh teAKlnI0ZSU2f/Df2oJ8zpn5p7XDqZfwikt0ffZLy9SnmxCZ97TyGzHfnfFhXmmatE6n K/8Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h23si26253248edw.73.2021.11.30.19.53.08; Tue, 30 Nov 2021 19:53:08 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A23A68AE87; Wed, 1 Dec 2021 05:52:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECD0B68AA83 for ; Wed, 1 Dec 2021 05:52:29 +0200 (EET) Received: from localhost (unknown [36.33.26.144]) by mail.loongson.cn (Coremail) with SMTP id AQAAf9Dxv8t78aZh9fABAA--.4592S3; Wed, 01 Dec 2021 11:52:27 +0800 (CST) From: Shiyou Yin To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Dec 2021 11:52:21 +0800 Message-Id: <20211201035221.18817-4-yinshiyou-hf@loongson.cn> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211201035221.18817-1-yinshiyou-hf@loongson.cn> References: <20211201035221.18817-1-yinshiyou-hf@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf9Dxv8t78aZh9fABAA--.4592S3 X-Coremail-Antispam: 1UD129KBjvJXoW3JrWUuF18uF47ZF45uw4fAFb_yoWxJF4Dpr WkGws3tw18ta17Cr97GF48GrnrCanYqr15Ka13tFW2k3yDJ3y8WFZF9FyxWFyrGF97Cry3 ur1jk3Wa9F17Xr7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkq14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gc CE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lc2xSY4AK67AK6r48 MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUXVWUAwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJV W8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAI cVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7VUUhID5UUUUU== X-CM-SenderInfo: p1lq2x5l1r3gtki6z05rqj20fqof0/ Subject: [FFmpeg-devel] [PATCH v2 3/3] avcodec: [loongarch] Optimize decode_significance/_8x8_loongarch. 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: Hao Chen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: noANCeR1jFP9 From: Hao Chen Decoding 1080P H264 from 168fps to 170fps. Signed-off-by: Shiyou Yin --- libavcodec/h264_cabac.c | 2 + libavcodec/loongarch/h264_cabac.c | 140 ++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 libavcodec/loongarch/h264_cabac.c diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 973b3419c4..040fa0a257 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -42,6 +42,8 @@ #if ARCH_X86 #include "x86/h264_cabac.c" +#elif ARCH_LOONGARCH64 +#include "loongarch/h264_cabac.c" #endif /* Cabac pre state table */ diff --git a/libavcodec/loongarch/h264_cabac.c b/libavcodec/loongarch/h264_cabac.c new file mode 100644 index 0000000000..d88743bed7 --- /dev/null +++ b/libavcodec/loongarch/h264_cabac.c @@ -0,0 +1,140 @@ +/* + * Loongson optimized cabac + * + * Copyright (c) 2021 Loongson Technology Corporation Limited + * Contributed by Hao Chen + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavcodec/cabac.h" +#include "cabac.h" + +#define decode_significance decode_significance_loongarch +static int decode_significance_loongarch(CABACContext *c, int max_coeff, + uint8_t *significant_coeff_ctx_base, int *index, int64_t last_off) +{ + void *end = significant_coeff_ctx_base + max_coeff - 1; + int64_t minusstart = -(int64_t)significant_coeff_ctx_base; + int64_t minusindex = 4 - (int64_t)index; + int64_t bit, tmp0, tmp1, tmp2, one = 1; + uint8_t *state = significant_coeff_ctx_base; + + __asm__ volatile( + "3:" +#if UNCHECKED_BITSTREAM_READER + GET_CABAC_LOONGARCH_UNCBSR +#else + GET_CABAC_LOONGARCH +#endif + "blt %[bit], %[one], 4f \n\t" + "add.d %[state], %[state], %[last_off] \n\t" +#if UNCHECKED_BITSTREAM_READER + GET_CABAC_LOONGARCH_UNCBSR +#else + GET_CABAC_LOONGARCH +#endif + "sub.d %[state], %[state], %[last_off] \n\t" + "add.d %[tmp0], %[state], %[minusstart] \n\t" + "st.w %[tmp0], %[index], 0 \n\t" + "bge %[bit], %[one], 5f \n\t" + "addi.d %[index], %[index], 4 \n\t" + "4: \n\t" + "addi.d %[state], %[state], 1 \n\t" + "blt %[state], %[end], 3b \n\t" + "add.d %[tmp0], %[state], %[minusstart] \n\t" + "st.w %[tmp0], %[index], 0 \n\t" + "5: \n\t" + "add.d %[tmp0], %[index], %[minusindex] \n\t" + "srli.d %[tmp0], %[tmp0], 2 \n\t" + : [bit]"=&r"(bit), [tmp0]"=&r"(tmp0), [tmp1]"=&r"(tmp1), [tmp2]"=&r"(tmp2), + [c_range]"+&r"(c->range), [c_low]"+&r"(c->low), [state]"+&r"(state), + [c_bytestream]"+&r"(c->bytestream), [index]"+&r"(index) + : [tables]"r"(ff_h264_cabac_tables), [end]"r"(end), [one]"r"(one), + [minusstart]"r"(minusstart), [minusindex]"r"(minusindex), + [last_off]"r"(last_off), +#if !UNCHECKED_BITSTREAM_READER + [c_bytestream_end]"r"(c->bytestream_end), +#endif + [lps_off]"i"(H264_LPS_RANGE_OFFSET), + [mlps_off]"i"(H264_MLPS_STATE_OFFSET + 128), + [norm_off]"i"(H264_NORM_SHIFT_OFFSET), + [cabac_mask]"r"(CABAC_MASK) + : "memory" + ); + + return (int)tmp0; +} + +#define decode_significance_8x8 decode_significance_8x8_loongarch +static int decode_significance_8x8_loongarch( + CABACContext *c, uint8_t *significant_coeff_ctx_base, + int *index, uint8_t *last_coeff_ctx_base, const uint8_t *sig_off) +{ + int64_t minusindex = 4 - (int64_t)index; + int64_t bit, tmp0, tmp1, tmp2, one = 1, end = 63, last = 0; + uint8_t *state = 0; + int64_t flag_offset = H264_LAST_COEFF_FLAG_OFFSET_8x8_OFFSET; + + __asm__ volatile( + "3: \n\t" + "ldx.bu %[tmp0], %[sig_off], %[last] \n\t" + "add.d %[state], %[tmp0], %[significant_coeff_ctx_base] \n\t" +#if UNCHECKED_BITSTREAM_READER + GET_CABAC_LOONGARCH_UNCBSR +#else + GET_CABAC_LOONGARCH +#endif + "blt %[bit], %[one], 4f \n\t" + "add.d %[tmp0], %[tables], %[flag_offset] \n\t" + "ldx.bu %[tmp1], %[tmp0], %[last] \n\t" + "add.d %[state], %[tmp1], %[last_coeff_ctx_base] \n\t" +#if UNCHECKED_BITSTREAM_READER + GET_CABAC_LOONGARCH_UNCBSR +#else + GET_CABAC_LOONGARCH +#endif + "st.w %[last], %[index], 0 \n\t" + "bge %[bit], %[one], 5f \n\t" + "addi.d %[index], %[index], 4 \n\t" + "4: \n\t" + "addi.d %[last], %[last], 1 \n\t" + "blt %[last], %[end], 3b \n\t" + "st.w %[last], %[index], 0 \n\t" + "5: \n\t" + "add.d %[tmp0], %[index], %[minusindex] \n\t" + "srli.d %[tmp0], %[tmp0], 2 \n\t" + : [bit]"=&r"(bit), [tmp0]"=&r"(tmp0), [tmp1]"=&r"(tmp1), + [tmp2]"=&r"(tmp2), [c_range]"+&r"(c->range), + [c_low]"+&r"(c->low), [state]"+&r"(state), [last]"+&r"(last), + [c_bytestream]"+&r"(c->bytestream), [index]"+&r"(index) + : [tables]"r"(ff_h264_cabac_tables), [end]"r"(end), + [one]"r"(one), [minusindex]"r"(minusindex), + [last_coeff_ctx_base]"r"(last_coeff_ctx_base), + [flag_offset]"r"(flag_offset), +#if !UNCHECKED_BITSTREAM_READER + [c_bytestream_end]"r"(c->bytestream_end), +#endif + [lps_off]"i"(H264_LPS_RANGE_OFFSET), [sig_off]"r"(sig_off), + [mlps_off]"i"(H264_MLPS_STATE_OFFSET + 128), + [norm_off]"i"(H264_NORM_SHIFT_OFFSET), + [cabac_mask]"r"(CABAC_MASK), + [significant_coeff_ctx_base]"r"(significant_coeff_ctx_base) + ); + + return (int)tmp0; +}