From patchwork Tue Jun 4 20:14:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 49562 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d153:0:b0:460:55fa:d5ed with SMTP id bt19csp133410vqb; Tue, 4 Jun 2024 13:14:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUKBV2RjR+jHvWg7PPmhHwZ3cclDRfsvdS+vMSWIWgmA/KlCpL6DXMNAg0R6WuTHIgZZOq12M0E2leQbC2uta495SVZZrzj70Oj0g== X-Google-Smtp-Source: AGHT+IGkAHzhMM1s7BxT355J004t1Kyps0u1VWxHiDBl5dSi479FNn0xaTHmSBWM29Ecl5B/rLjz X-Received: by 2002:a17:907:30c8:b0:a67:a2e0:9dd9 with SMTP id a640c23a62f3a-a699f3515f5mr29725966b.2.1717532091573; Tue, 04 Jun 2024 13:14:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717532091; cv=none; d=google.com; s=arc-20160816; b=HWfe/iSk8vvNjLEwluFbHVPxtiuQVibyMzpyKCLi2RNqup2V2+75YQaiAlaw6I9fY3 t2Yl48DfaEvfPDsw83o65swOsIiS5+IsMTLAzgU2+84vdfMJTXcBDHpOhSs+Pc/EP6tU vNu5aIwmGf4MpZQjNMqxdmwC+CuXIuThVD4kA03GQeLF7+OvFdUjofogUUtRQMCsZYY+ +Gsm+1EgNk8vVOspE4hivdheMhUYJAjWmjxDFe6A1jxWooXFbPuoP4zZrKjw3i5OAT7O /YG462wripVPrnHqQrxgANYc+RFQnrPwFDs0O6nA723Sph2tNKLYTtMOAZSm0fssEIz+ WlQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=rX/KLhin9J/kk1/u6Ditv9v7AE/EQcpPwsuMdq+UWfM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VGanwfEtLHYFhQmgkGVoFv/sgX/VdvUiHhMDUjFzFDl9I1YuYdmaaYOibj/5u8Kfbz +eyzk7EBHwkPf2f6+XAGho0q9+iPxGpyxwVVoZ6Jp+ZiRaNMA4MvCOf7gIOaVRPIgmEg YfiQZDvfi7PmW9OPfWNKAssyaIKrZaeDeGrCDzZLRnKHqlsDt8mFq75sISyZJ624NBuI +ZrYheQ7StyVv9w+IgBzbN8jDCrkKekI5U9O3I9/WTbNlp//um5Y+z1+abk8bOLITaoq lKAhcCt/C+2Pjk6fFMafzsbztwgmhG6mydegt0klxX6MYdFM0rdC+S6O1Y2khIby8od+ ok9g==; dara=google.com 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 a640c23a62f3a-a68ad6646bfsi389797966b.1049.2024.06.04.13.14.50; Tue, 04 Jun 2024 13:14:51 -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; 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 F0AC268D6DB; Tue, 4 Jun 2024 23:14:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA27068D371 for ; Tue, 4 Jun 2024 23:14:40 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 8C388C0138 for ; Tue, 4 Jun 2024 23:14:40 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2024 23:14:39 +0300 Message-ID: <20240604201440.38501-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240604200514.37736-1-remi@remlab.net> References: <20240604200514.37736-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2 1/1] sws/input: add R-V V rgb24ToY 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: myuIhotxVhYk T-Head C908: rgb24_to_y_8_c: 2.0 rgb24_to_y_8_rvv_i32: 2.7 rgb24_to_y_128_c: 26.2 rgb24_to_y_128_rvv_i32: 9.2 rgb24_to_y_1080_c: 219.5 rgb24_to_y_1080_rvv_i32: 76.2 rgb24_to_y_1280_c: 276.2 rgb24_to_y_1280_rvv_i32: 89.7 rgb24_to_y_1920_c: 389.7 rgb24_to_y_1920_rvv_i32: 134.2 SpacemiT X60: rgb24_to_y_8_c: 1.7 rgb24_to_y_8_rvv_i32: 2.2 rgb24_to_y_128_c: 23.2 rgb24_to_y_128_rvv_i32: 4.2 rgb24_to_y_1080_c: 195.0 rgb24_to_y_1080_rvv_i32: 34.0 rgb24_to_y_1280_c: 231.0 rgb24_to_y_1280_rvv_i32: 40.0 rgb24_to_y_1920_c: 346.2 rgb24_to_y_1920_rvv_i32: 60.0 --- Changes since version 1: - Use fused multiply-adds. --- libswscale/riscv/Makefile | 6 +++-- libswscale/riscv/input.S | 49 +++++++++++++++++++++++++++++++++++ libswscale/riscv/swscale.c | 40 ++++++++++++++++++++++++++++ libswscale/swscale.c | 2 ++ libswscale/swscale_internal.h | 1 + 5 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 libswscale/riscv/input.S create mode 100644 libswscale/riscv/swscale.c diff --git a/libswscale/riscv/Makefile b/libswscale/riscv/Makefile index 48afaf62aa..d1b0eae367 100644 --- a/libswscale/riscv/Makefile +++ b/libswscale/riscv/Makefile @@ -1,3 +1,5 @@ -OBJS += riscv/rgb2rgb.o +OBJS += riscv/rgb2rgb.o \ + riscv/swscale.o RV-OBJS += riscv/rgb2rgb_rvb.o -RVV-OBJS += riscv/rgb2rgb_rvv.o +RVV-OBJS += riscv/input.o \ + riscv/rgb2rgb_rvv.o diff --git a/libswscale/riscv/input.S b/libswscale/riscv/input.S new file mode 100644 index 0000000000..0355cfe4ab --- /dev/null +++ b/libswscale/riscv/input.S @@ -0,0 +1,49 @@ +/* + * Copyright © 2024 Rémi Denis-Courmont. + * + * 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 "libavutil/riscv/asm.S" + +func ff_rgb24ToY_rvv, zve32x + csrwi vxrm, 0 + lw t1, 0(a5) # RY + lw t2, 4(a5) # GY + lw t3, 8(a5) # BY + li t4, 32 << (15 - 1) +1: + vsetvli t0, a4, e32, m8, ta, ma + vlseg3e8.v v0, (a1) + sub a4, a4, t0 + vzext.vf4 v8, v0 + sh1add t5, t0, t0 # t1 = 3 * t0 + vzext.vf4 v16, v2 + vzext.vf4 v24, v4 + add a1, t5, a1 + vmul.vx v8, v8, t1 + vmacc.vx v8, t2, v16 + vmacc.vx v8, t3, v24 + vadd.vx v8, v8, t4 + vsetvli zero, zero, e16, m4, ta, ma + vnclipu.wi v0, v8, 15 - 6 + vse16.v v0, (a0) + sh1add a0, t0, a0 + bnez a4, 1b + + ret +endfunc diff --git a/libswscale/riscv/swscale.c b/libswscale/riscv/swscale.c new file mode 100644 index 0000000000..71f01a8a5a --- /dev/null +++ b/libswscale/riscv/swscale.c @@ -0,0 +1,40 @@ +/* + * 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 "config.h" +#include "libavutil/attributes.h" +#include "libavutil/riscv/cpu.h" +#include "libswscale/swscale_internal.h" + +void ff_rgb24ToY_rvv(uint8_t *dst, const uint8_t *src, const uint8_t *, + const uint8_t *, int width, uint32_t *coeffs, void *); + +av_cold void ff_sws_init_swscale_riscv(SwsContext *c) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + switch (c->srcFormat) { + case AV_PIX_FMT_RGB24: + c->lumToYV12 = ff_rgb24ToY_rvv; + break; + } + } +#endif +} diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 2795429b6c..9736734881 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -602,6 +602,8 @@ void ff_sws_init_scale(SwsContext *c) ff_sws_init_swscale_arm(c); #elif ARCH_LOONGARCH64 ff_sws_init_swscale_loongarch(c); +#elif ARCH_RISCV + ff_sws_init_swscale_riscv(c); #endif } diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index d4b0c3cee2..5007dd422f 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -988,6 +988,7 @@ void ff_sws_init_swscale_x86(SwsContext *c); void ff_sws_init_swscale_aarch64(SwsContext *c); void ff_sws_init_swscale_arm(SwsContext *c); void ff_sws_init_swscale_loongarch(SwsContext *c); +void ff_sws_init_swscale_riscv(SwsContext *c); void ff_hyscale_fast_c(SwsContext *c, int16_t *dst, int dstWidth, const uint8_t *src, int srcW, int xInc);