From patchwork Mon Mar 6 09:10:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxian Zhu X-Patchwork-Id: 40599 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2727355pzb; Mon, 6 Mar 2023 01:11:01 -0800 (PST) X-Google-Smtp-Source: AK7set8XoRlV2E7gBcdmsvKgt9v4192dmLezcLlbXCG4veAENa4gTncn2Rg2y7mZcpXYqzLakOEy X-Received: by 2002:a17:907:16a4:b0:8af:3fcc:2b05 with SMTP id hc36-20020a17090716a400b008af3fcc2b05mr13190034ejc.12.1678093861157; Mon, 06 Mar 2023 01:11:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678093861; cv=none; d=google.com; s=arc-20160816; b=Dv6t5IeqjeRviQs3Kl4dKXh4h9TRvyAvoal6hVq416qR1Uy0Bgc5L54lg3Res2vLmO C2ufaDJVDo+3YwayMJc9AA1HDbbhPGQ74EyaphrdXiCKWlliS6CbaRyiMq35t0ReRuLa 4rUqju6LEgNlAFr4+hD8OZ2LPKxWKXG0V8J6vIqcw0R1wD5snTxqor2xHzLWASJekVN7 q2SdX3+Lc3JXNwjqwYq3xGNVXRDxVfM2Arl2hCfV4Fo1vT1OTEVEpg7GtL+2nNthfHtV V4umPb0KlVhUhHFQYss7TVY+3vybCIfnS2FUaECcgrmbpaQBM0Vu21QUHDA92+ejPFQw iW+A== 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:message-id:from:mime-version:to:date :dkim-signature:delivered-to; bh=W09cvPYczclMWY4IPFXq55uPTOot9ISN5xC2amtCRb0=; b=EHm9z9w59AZD/hjYv8P2qwPE+tcPRfdjtP7zEip+Kee9+7w/hOvDMUtPH6AMw37xhG Myja2ReGU4OWWoAbhhTfGomRqGN02cpIoItrqYzrMZ90uvlxTiW1pHpNPaF9JCaYGC8M MHrqpd36SbtoFCWD+SyvOSk8E0Ai4mB5/I9oryaqZec9I3xMg4yTEw7QMIywWPAduFac IWMOvEv7bRmJx5MXpjIojuPgUle/YFUYjQj2p6ucAu3pXHPjxwB0zEylEvYQHYk2rb6W oQLaRdPxLM8lSK1cEKgjGtJbKkhP2sWqUlVFxMEDAUp8ZLzl2+sKnqCsPA56p/danuo+ d4gw== 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=CnhSYxCT; 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 v8-20020a170906858800b008e0bd541c60si6942060ejx.124.2023.03.06.01.11.00; Mon, 06 Mar 2023 01:11:01 -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=CnhSYxCT; 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 E87BB68BB98; Mon, 6 Mar 2023 11:10:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from s01.bc.feishu.cn (s01.bc.feishu.cn [103.149.242.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE29268AB9E for ; Mon, 6 Mar 2023 11:10:49 +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=1678093842; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=uWid1jn5vtbymZb5GXSEVCb4bfcYMYjdPkAI3nRB9BE=; b=CnhSYxCTgL4Xj0ixsj0CB0RGYjoRnSZVVnqrJL9M5/3DcbmryRHyhgZOeex19zkvoj6z+Y 3YiRokUtLANfLeD49vhxRiq6hnSShac9MY5WB8afAUeC/VL0Rqeg7ASPvwBtA6NDxt8eKo Dt/id8XW9XrfV61J1altncacl3kNpwrep1ABMBuQWY1M/Nfgn5CZUpoKmnU7Oz/GTBj0+V W9vsCekKV1tndbYPgKklUhFxQnNZFQ8Ks8fEvGnrCjWQ/vdq7eWeJZk16tlebI8EfGpYfl 5wYus/T3cOminYZjY4az5SzUUCVqrItHGRoIew/m+Ux65SE8z0CudoxCNCiZHQ== Date: Mon, 06 Mar 2023 17:10:32 +0800 To: Mime-Version: 1.0 X-Original-From: "Junxian Zhu" From: "Junxian Zhu" X-Lms-Return-Path: X-Mailer: git-send-email 2.39.2.windows.1 Message-Id: <20230306091009.1875-1-zhujunxian@oss.cipunited.com> 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: XTpMygNYNFrb 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 | 20 ++++-------- libavcodec/mips/mathops.h | 67 --------------------------------------- 2 files changed, 6 insertions(+), 81 deletions(-) delete mode 100644 libavcodec/mips/mathops.h diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index c89054d6ed..526ffe0eec 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,12 @@ 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; + t0 = (a > b) ? b : a ; + t1 = (a > b) ? a : b ; + t2 = (t0 > c) ? t0 : c; + t3 = (t1 > t2) ? t2 : t1; + return t3; } #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 */