From patchwork Mon Mar 6 02:38:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Junxian Zhu X-Patchwork-Id: 40593 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2553378pzb; Sun, 5 Mar 2023 18:39:02 -0800 (PST) X-Google-Smtp-Source: AK7set/dI6noaBOYFqWZkmQRGDbW4NzHVJtauZQtKg2f27c6TMa2CD94b9cn27QR6sWFN65lQKZr X-Received: by 2002:a17:907:3e07:b0:8b1:2867:380 with SMTP id hp7-20020a1709073e0700b008b128670380mr12662355ejc.22.1678070342568; Sun, 05 Mar 2023 18:39:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678070342; cv=none; d=google.com; s=arc-20160816; b=UhCsyZz09gqVrTbRFVROtHQIOdY0tWTU8YzUzxd0Kvh4D/HvRXjbezqmogmwP0bw1m cVqSAcClnqUmjIsIgtn/ioNXa/OzXQkLqWserOsq8ScwpNgzNOTJGv7xS/5u31w3N8FO 4t9lVFoMrp2EpGYquVsRuuiGiukgg3ZH6uiet9fEhDC+PQKh5nW7ATcMcqglbhbVMyK6 4RmYFhbeyvpHZYWxtxYrgJf/5Y8n/JxzE/q3THmq5U2WJTQLNRODGMAsgHD6jssb8ymq yhb/AnOuR6e7cXGD7af1iGA33nQPROHR6hjURle36JVF9AIh10ReWEPdfvIWSF5PRT7n SIEA== 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:from:message-id:to:date :dkim-signature:delivered-to; bh=W09cvPYczclMWY4IPFXq55uPTOot9ISN5xC2amtCRb0=; b=0MBq2FXvE6/pU7LOUc+TDZtMruqYiOLMpaJOeipy+5IWFFATXHJB7lWVq4qyNFc5qc ensmKA1ItUTRyK/kVeefbN5UbP2Dbjiis1vtbwsBvhhIATCEW2RlKkpJflRpTQuL2u5r XoMvSD8HY4iTw3AhUITEQDBti6XqBweL8uzmkjkUFN3pu79RKl6qGlP39rR0VJOOS7Ej IOhNyeUHIX8PwFw/iGaZmgD6FR6VWUlSIRzRa6m54pu1BBry3EDg0vNrV/p1ik/rT7dw heXYwQKi7S4RtimGh/pC9gTMbzIF/flteXYt07CtGSw9zbAWIfzfB7uJH6nlRnWZ0zLJ zV5g== 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=3EN7NrDR; 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 w22-20020aa7d296000000b004c05692aeeasi9079739edq.221.2023.03.05.18.39.01; Sun, 05 Mar 2023 18:39:02 -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=3EN7NrDR; 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 47DDF68BA4A; Mon, 6 Mar 2023 04:38:57 +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.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 751A168A238 for ; Mon, 6 Mar 2023 04:38: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=1678070320; h=from:subject:mime-version:from:date:message-id:subject:to:cc: reply-to:content-type:mime-version:in-reply-to:message-id; bh=IEpf3XHYD3alZBNGO7F3Clg+jwteMLVoA8W65yaqdPE=; b=3EN7NrDRZNbKJil4alyNzXUQ8wictKD4/flBI2rhAD6h9PP0gENBgrJcn3bYvITtGfHiWy nYSD5OD4L0p07VZEdY5IakU9yqTMZ8LtZj70vKSBwbfHN/DDt+1OINdjbHc6AxAdoXGZjq fMq8UhpdUZF/e5kbggRy3U8rnP1ZbNeH8/tqwkrBUwIFLkm5QUlxpIjRhU/2lyvrwy521x +jyPVLkJpCL7SoAqQ5vw8POFWChtr+1eFE3Kiw7Li/4gcsKQDk2hFgebmfibZcBBFm8NXP hWlyYJsjzTBzHhteVRKMpai02oHmzxW9BLG5lkCaMHTE0vBwrQbjSpnidojbOg== Date: Mon, 06 Mar 2023 10:38:40 +0800 X-Lms-Return-Path: To: Message-Id: <20230306023819.1014-1-zhujunxian@oss.cipunited.com> From: "Junxian Zhu" Mime-Version: 1.0 X-Original-From: "Junxian Zhu" X-Mailer: git-send-email 2.39.2.windows.1 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH v2] 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: B6NhQvd39WyS 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 */