From patchwork Sun May 12 10:03:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 48808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp505904pzb; Sun, 12 May 2024 03:05:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXY9x8jWgkyFknLvOglqYrHXPIIiKqJNjhiXKtwzF88tCRLDvaTMcWo23El7T0iXp+G8P9VmIBq9zv0KGdHZqWzUfW+Yj2iA2zf5g== X-Google-Smtp-Source: AGHT+IFGdsvcKI9RnXhtXkDEBYxLKYigVW3zTTEi0VDeWDa1Sp+8BWlJG8WXuFe8osrYyFdmAl4t X-Received: by 2002:a17:906:4f8d:b0:a59:beb2:62cc with SMTP id a640c23a62f3a-a5a2d6668b0mr377195066b.61.1715508304367; Sun, 12 May 2024 03:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715508304; cv=none; d=google.com; s=arc-20160816; b=umiT/9D23eGg3EaLho5RxqITZrYAgxc1huy509KbASLiiA+OZih0nZW1iGo3evmtPT LEkm/bF8DyUGWiB8FbAX8pNhl/XpkGttPoHRa2c+YqyGtjaS6CPa/wT+sV+Z6bI+uBQs D0qZlpLl3lL6Jcx7l7ODICUhuQm48ax1nU5MfbNmXN9Ev58DoqRh8G4T1oxRos9oixQF gR1qcK3Q3wv9FP45E7dcBD9L6zl79omRxDBPebZIFxcjKTvDyMniRAL5z9oatLspkOEF /XP13//SFnw3ZOQ6qLyy3BGkGttyfa7ZofeuRz0p+4eDhZeCCXFNkDnNrmoktlyVoelQ NgZQ== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=eAcbFFZF/nFM6iI/hZd8vKwVpbj08z+6JUrTl1TOaBM=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=oAF47WC/1VY/4sFPx81cjR2d5e9hsT8irTtYtlF4nJIlTcB1TV2Q2qTpThV92SKN0q 3kXZlpHaSWar/pE1FgWBiM3lIyRskZsyKSx8b1wbjghNWlu283EBgRE8TfCMuW8LfItn poEOmY+zDul8Xm37bJNjfNj5++9EsroiTy0XONTJ3yBWoU7yoGmQ/i/HH9xSJ9522FPz 6sbUhOgPhev3ifhW6ycTef5uo+NoQ3lywazUjrSwen+9ujqY+yQLHZLjmeq1Bn0aJbGF LUAu72Gbk//jOa28kNRinZ9qYqSO1xgeTwMpoTgaX6oxJDYCenswtB6OGJdVUMmdmcCa P+zQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Rcb1pD6V; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17c2d129si393506366b.1037.2024.05.12.03.05.03; Sun, 12 May 2024 03:05:04 -0700 (PDT) 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=@foxmail.com header.s=s201512 header.b=Rcb1pD6V; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 60AD868D66C; Sun, 12 May 2024 13:04:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-191.mail.qq.com (out203-205-221-191.mail.qq.com [203.205.221.191]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AA1968D5D9 for ; Sun, 12 May 2024 13:03:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715508220; bh=s+bGheSYOTk35OJEpmCr7mklE1OmsE1F5DJF+JnQ4X0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Rcb1pD6VniHFan00int8pUtTPbyKHdRRb9zT/1VVZzLTM0rihK0Z7W5V6bMKgwEqI V29BMwIFpWcEeoT2OQsQkgx5tAohztO46dX8oN4G7Gq2rzmEPasaqkai0IWbH+Lv++ H+JZ3FUUEEZGpS/MYnj2MOvYnqS0gyma9Zujxu5o= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id E135E56; Sun, 12 May 2024 18:03:33 +0800 X-QQ-mid: xmsmtpt1715508219t51f8ucvp Message-ID: X-QQ-XMAILINFO: N7h1OCCDntujX0cGn3oj3z5CGKeoK1ZX63c2EN8QFwpq4yokXCXGfFApCWZW70 lupLGREyR8y7DRTYGkR33L2W2BKke3jp5fOjkGJWyQD4rzURSOwVAqSrpUeMwcDTU/8Suk3W6SQU gH1r7E0Z7WKSO9w1tqBKfB7gzoCzmPvFErqE6mr+lvV2Jj/ot3TcXYYx45F1ONj4bZPH6A3DYqwU OglcBVqOcoOi3VMWlSHVV5qRb0PsAiMHrK3c4WkW3HjsnjwrBMfujrtuXUBR/k2BB42SnyoVoMuc CfUtC3UTNIfdZlkqVQceU6mohcah4hO7q4Kjg45PdBIKbxfXUKMv2a3xAyDZUIvjFuDvxjxpq559 P9XbGqkZ/uR82rra3F9KtL4AgXDikAU5+xUh02eXXEURj79jpWfoXcBDce+lwIzlCOXMvKffNgKX v8uOk3sNzlquHoTDs52RViLqaNw5cjohIAKD+dQd5pP2YzGc2Zguswcr92mnkyzY8xyCAFMKPm17 gkhakjK8ZN2lTkzVTV6GLX0E1LiUAfFJKwZ6hoyeJhYfSnnaxhRYElyzFu+hDekYmbGLgjoGaD4R bEbNDskqLs4/3kCoF4wjf5hAmQsGs53G4UqkA/aLeGwPjDitDGZJyQN3MF+QB9kx03ldXnbOQ6KD hDnm6mMMTbnt3httXEE5GfWTdPuCG8aJjK60AC4er0Hy07dx2osh74a2qyJsZC7cKXWGnD1+V2t/ wULGGOgrnZ1gXs55aG3Sy5GZxSx7tfR5jpHSdilIoyZEvZYUQT3viMEWVq6df3KTvOsxydCx+9oH 0whGQgeOF9cywZSX6EnZURuBWIa3FjwuK2B/fHTBIbHCAG6dh6/6b0U4eB+MAX6mgoY8qgXwo1Tc 3K1KmYnukHunHYYf8Jl2v4myKDmb1yzqdWLScz8cwwLwm7oMSBKcGHp4OVnGYnWDbJ1+2OmZKm7c DEkELt7/CUA/IchgM0NEFiuObuoj/7M6IO9osDPhY= X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 May 2024 18:03:30 +0800 X-OQ-MSGID: <20240512100331.995415-8-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240512100331.995415-1-uk7b@foxmail.com> References: <20240512100331.995415-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 8/9] lavc/vp9dsp: R-V V mc bilin hv 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: sunyuechi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yFew3ln5SkH7 From: sunyuechi C908: vp9_avg_bilin_4hv_8bpp_c: 11.0 vp9_avg_bilin_4hv_8bpp_rvv_i64: 3.7 vp9_avg_bilin_8hv_8bpp_c: 38.7 vp9_avg_bilin_8hv_8bpp_rvv_i64: 7.2 vp9_avg_bilin_16hv_8bpp_c: 147.0 vp9_avg_bilin_16hv_8bpp_rvv_i64: 14.2 vp9_avg_bilin_32hv_8bpp_c: 574.5 vp9_avg_bilin_32hv_8bpp_rvv_i64: 42.7 vp9_avg_bilin_64hv_8bpp_c: 2311.5 vp9_avg_bilin_64hv_8bpp_rvv_i64: 201.7 vp9_put_bilin_4hv_8bpp_c: 10.0 vp9_put_bilin_4hv_8bpp_rvv_i64: 3.2 vp9_put_bilin_8hv_8bpp_c: 35.2 vp9_put_bilin_8hv_8bpp_rvv_i64: 6.5 vp9_put_bilin_16hv_8bpp_c: 133.7 vp9_put_bilin_16hv_8bpp_rvv_i64: 13.0 vp9_put_bilin_32hv_8bpp_c: 538.2 vp9_put_bilin_32hv_8bpp_rvv_i64: 39.7 vp9_put_bilin_64hv_8bpp_c: 2114.0 vp9_put_bilin_64hv_8bpp_rvv_i64: 153.7 --- libavcodec/riscv/vp9_mc_rvv.S | 34 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp_init.c | 10 ++++++++++ 2 files changed, 44 insertions(+) diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S index c633809675..22ae194367 100644 --- a/libavcodec/riscv/vp9_mc_rvv.S +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -104,6 +104,39 @@ func ff_\op\()_bilin_\len\()\type\()_rvv, zve32x endfunc .endm +.macro bilin_hv len op +func ff_\op\()_bilin_\len\()hv_rvv, zve32x +.ifc \op,avg + csrwi vxrm, 0 +.endif + vsetvlstatic8 \len t0 64 + neg t1, a5 + neg t2, a6 + li t4, 8 + bilin_load v24, \len, put, h, a5 + add a2, a2, a3 +1: + addi a4, a4, -1 + bilin_load v4, \len, put, h, a5 + vwmulu.vx v16, v4, a6 + vwmaccsu.vx v16, t2, v24 + vwadd.wx v16, v16, t4 + vnsra.wi v16, v16, 4 + vadd.vv v0, v16, v24 +.ifc \op,avg + vle8.v v16, (a0) + vaaddu.vv v0, v0, v16 +.endif + vse8.v v0, (a0) + vmv.v.v v24, v4 + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + + ret +endfunc +.endm + const subpel_filters_regular .byte 0, 0, 0, 128, 0, 0, 0, 0 .byte 0, 1, -5, 126, 8, -3, 1, 0 @@ -334,6 +367,7 @@ endfunc .irp op put avg bilin_h_v \len \op h a5 bilin_h_v \len \op v a6 + bilin_hv \len \op .irp name regular sharp smooth .irp type h v epel \len \op \name \type 128 diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 0ae14879ea..a8e5759cd8 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -104,6 +104,16 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) dsp->mc[4][FILTER_BILINEAR ][0][1][0] = ff_put_bilin_4h_rvv; dsp->mc[4][FILTER_BILINEAR ][1][0][1] = ff_avg_bilin_4v_rvv; dsp->mc[4][FILTER_BILINEAR ][1][1][0] = ff_avg_bilin_4h_rvv; + dsp->mc[0][FILTER_BILINEAR ][0][1][1] = ff_put_bilin_64hv_rvv; + dsp->mc[0][FILTER_BILINEAR ][1][1][1] = ff_avg_bilin_64hv_rvv; + dsp->mc[1][FILTER_BILINEAR ][0][1][1] = ff_put_bilin_32hv_rvv; + dsp->mc[1][FILTER_BILINEAR ][1][1][1] = ff_avg_bilin_32hv_rvv; + dsp->mc[2][FILTER_BILINEAR ][0][1][1] = ff_put_bilin_16hv_rvv; + dsp->mc[2][FILTER_BILINEAR ][1][1][1] = ff_avg_bilin_16hv_rvv; + dsp->mc[3][FILTER_BILINEAR ][0][1][1] = ff_put_bilin_8hv_rvv; + dsp->mc[3][FILTER_BILINEAR ][1][1][1] = ff_avg_bilin_8hv_rvv; + dsp->mc[4][FILTER_BILINEAR ][0][1][1] = ff_put_bilin_4hv_rvv; + dsp->mc[4][FILTER_BILINEAR ][1][1][1] = ff_avg_bilin_4hv_rvv; if (flags & AV_CPU_FLAG_RVB_ADDR) { init_subpel2(0, 0, 1, v, put, 128);