From patchwork Tue Mar 7 09:08:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxian Zhu X-Patchwork-Id: 40604 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3578546pzb; Tue, 7 Mar 2023 01:09:00 -0800 (PST) X-Google-Smtp-Source: AK7set8M0qUklvSp3voYvezIKc5k/BrcLFgYBZw/XMcJRuUMX7hfqwadcbw+jcDxQUIbI/gfx41z X-Received: by 2002:a17:907:6e01:b0:8e0:4baf:59d7 with SMTP id sd1-20020a1709076e0100b008e04baf59d7mr17533662ejc.31.1678180139832; Tue, 07 Mar 2023 01:08:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678180139; cv=none; d=google.com; s=arc-20160816; b=RZjXlf9906RMI2oSUOW8FfGhO8Fwb29aGqigahsXBEEI9892hK7Fdmg6A1WNW5g5Rj 9C37DAkNIXO+yQIewXtioimOuD67JiYKw5PaUYqVE4wfQrfF3+ZogGXeUfdYZ6C4zYyj 0ARY8gaSPVRai2ME/tJERyLTAFm2/+Ie7emIKPCx9/acIe7X7UPCcCF/q1ZYFfOo7UOG xVuc0F+0U3M7UDaUOU+alF9pUPUhWfbBT3Uzgg4N7/0yOSUXYR7fUFCcXq6Uscr5els9 HVZkJIIA12o6fcVVVJhlu7tGGWLwU9Tl03nHtHrJw/v0rPVdCMUWBS9qIo5trriSG6en 5mkA== 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:date:from:to:message-id :dkim-signature:delivered-to; bh=aAqx5BQ7FjBCkaeLnXGo1QHCsP9Mc1Tae7+NX6L3jDc=; b=BZl05omKfApQFK+rv/cptfJMtagu4oURQIYqDxTcZC/Go6QTJ3A11U/J1UKuD6fklJ zUZt5FOcKSMZZqq8VwchIb4rRrAMCFT7oUYbAboyUcqhiPkAwDpmeOUFWuavVyJySxJx W283g8yxvTMpfuHrHU2mzx4LWZh2tPemO1Py+E80PnB2/rp7qXF8NV2GQMkfjcKhiK42 sf7F9IGfbbnt2KA2UuGLCEy3decQb6/jdLQxYuza6m2Pw6tRR0TIZlniNFupX3xJi2fM lCWX8iwUA17SJNM/CPH5j9aCLZ3gnmUT0l3Mk9CKQka5dhdP6uGKnuhnpaiq6l4Z7rue tGRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@oss-cipunited-com.20200927.dkim.feishu.cn header.s=s1 header.b=qhdG0uXB; 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 kb13-20020a1709070f8d00b008e0363188c7si12339108ejc.890.2023.03.07.01.08.59; Tue, 07 Mar 2023 01:08:59 -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=@oss-cipunited-com.20200927.dkim.feishu.cn header.s=s1 header.b=qhdG0uXB; 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 95AE668BCE9; Tue, 7 Mar 2023 11:08:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from v03.bc.feishu.cn (v03.bc.feishu.cn [101.36.218.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBFEB68BCE3 for ; Tue, 7 Mar 2023 11:08:46 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=s1; d=oss-cipunited-com.20200927.dkim.feishu.cn; t=1678180118; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=PsGVUVrdU+rS3cbtYU8tn53H38QF9LNQ5zZxDPpNCNs=; b=qhdG0uXBCIX+HqfwucNYWCN0B8yUm6t9qUlEW7vshRriA4hhmWIUj6CwnGUjCY64Wk+ic7 xNXeyoc3UyaE4TW6whN8vqUMfXl9cdx+lfNiwJVzo+2ymkJmvtSk2Z3kx7SlVaSGzUVw+M qff8XtgRO8Ky9fQaq+hCxmfnBuVmr2qUMVQoImv0CBiyu1E8Wk/Hdb3qslGf2VHGWzdHeD dxSg7HrlmzGJwbTxl7aw96HZRK3JOXAXIMxCtRq1fT+7f5bLedz5PezW5EN19VNnK6uWZi Zi7TMtZuQ0YFCKT3XnGqXHTp1iVx378SdQmLww7YZ9iQ+bmTgXtjIgwoC9O4WQ== Message-Id: <20230307090806.2003-1-zhujunxian@oss.cipunited.com> X-Original-From: "Junxian Zhu" To: X-Lms-Return-Path: From: "Junxian Zhu" X-Mailer: git-send-email 2.39.2.windows.1 Date: Tue, 07 Mar 2023 17:08:27 +0800 Mime-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH v3] avcodec/mathops: Optimize generic mid_pred function 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: Junxian Zhu , jiaxun.yang@flygoat.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oODe2WIYJ6XE From: Junxian Zhu Rewrite mid_pred function in generic mathops.h, reduce branch jump to improve performance. And because nowadays new version compiler can compile enough short asmbbely code as handwritting in these function, so remove specified optimized mips inline asmbbely mathops.h. Signed-off-by: Junxian Zhu --- libavcodec/mathops.h | 19 +++-------- libavcodec/mips/mathops.h | 67 --------------------------------------- 2 files changed, 5 insertions(+), 81 deletions(-) delete mode 100644 libavcodec/mips/mathops.h diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index c89054d6ed..f2ba4fabce 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -41,8 +41,6 @@ extern const uint8_t ff_zigzag_scan[16+1]; # include "arm/mathops.h" #elif ARCH_AVR32 # include "avr32/mathops.h" -#elif ARCH_MIPS -# include "mips/mathops.h" #elif ARCH_PPC # include "ppc/mathops.h" #elif ARCH_X86 @@ -98,18 +96,11 @@ static av_always_inline unsigned UMULH(unsigned a, unsigned b){ #define mid_pred mid_pred static inline av_const int mid_pred(int a, int b, int c) { - if(a>b){ - if(c>b){ - if(c>a) b=a; - else b=c; - } - }else{ - if(b>c){ - if(c>a) b=c; - else b=a; - } - } - return b; + int t0,t1,t2,t3; + int t0 = FFMIN(a, b); + int t1 = FFMAX(a, b); + int t2 = FFMAX(t0, c); + return FFMIN(t1, t2); } #endif diff --git a/libavcodec/mips/mathops.h b/libavcodec/mips/mathops.h deleted file mode 100644 index bb9dc8375a..0000000000 --- a/libavcodec/mips/mathops.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2009 Mans Rullgard - * Copyright (c) 2015 Zhou Xiaoyong - * - * 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 - */ - -#ifndef AVCODEC_MIPS_MATHOPS_H -#define AVCODEC_MIPS_MATHOPS_H - -#include -#include "config.h" -#include "libavutil/common.h" - -#if HAVE_INLINE_ASM - -#if HAVE_LOONGSON3 - -#define MULH MULH -static inline av_const int MULH(int a, int b) -{ - int c; - __asm__ ("dmult %1, %2 \n\t" - "mflo %0 \n\t" - "dsrl %0, %0, 32 \n\t" - : "=r"(c) - : "r"(a),"r"(b) - : "hi", "lo"); - return c; -} - -#define mid_pred mid_pred -static inline av_const int mid_pred(int a, int b, int c) -{ - int t = b; - __asm__ ("sgt $8, %1, %2 \n\t" - "movn %0, %1, $8 \n\t" - "movn %1, %2, $8 \n\t" - "sgt $8, %1, %3 \n\t" - "movz %1, %3, $8 \n\t" - "sgt $8, %0, %1 \n\t" - "movn %0, %1, $8 \n\t" - : "+&r"(t),"+&r"(a) - : "r"(b),"r"(c) - : "$8"); - return t; -} - -#endif /* HAVE_LOONGSON3 */ - -#endif /* HAVE_INLINE_ASM */ - -#endif /* AVCODEC_MIPS_MATHOPS_H */