From patchwork Tue Jul 18 18:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 42807 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:b813:b0:130:ccc6:6c4b with SMTP id fi19csp697955pzb; Tue, 18 Jul 2023 11:53:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlEuBguh4yXq3fdp6W0xHZu590EJbS1lboY9WVKhJCckoj6wywqfm1umg7lv9wlfrdB0+xln X-Received: by 2002:a17:906:290:b0:999:37ff:be94 with SMTP id 16-20020a170906029000b0099937ffbe94mr165648ejf.71.1689706407456; Tue, 18 Jul 2023 11:53:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689706407; cv=none; d=google.com; s=arc-20160816; b=oHecXcb5eU0La4MKs5/RUfSSqRam6RG9vTyzcAr5wiYXcvgxbVR3jbZN1/ucpgM71d F4QzONPXv6N3A/ykk0eOg3tJFXQAQCcoeVREuD1M8PsUbLndKJTEgqoO1F3gw0MwJW6J 6YYemLCtSjo5Yk5zMrFDHNKsi7/vXSJGr9eLHKxKgrJXiBnmPImIan1Aj6I+dnIGLNeM wWwaiFyQrgYVI+fUq3jd7i6EEq2qqxnNTo3hp04PvhCqHSaXXDkCU4PdA2x/wsFXCuKS zAvQnGja5LLd63lONi1cijA4zbSHwpanKMJ+7VM+k5SKOldgDIPwdOgRh6u4GaObiWdW oF8A== 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:message-id:date:to:from :delivered-to; bh=zWOfBHtfWoz9G4WxhGLSonGx5yXsKop0hWDcbrIHxZc=; fh=hQcp50obTJ8bXC1it5NuEN23RGKfx0/zZ3s2gmreL+A=; b=IBtXG1gr8eiMzALm2PtKTt2Trtp4LS/aF+HO7wJuCEZQ6aiT24RD43F2n3EjGLiubL K/ITmqmyrpKxsOUgtrhlnQ4/bpAtAzt4Hh49AYndrzxVH5bBtMhrT1LxLpkktKDX0yiF eyJbmaEKdsQXeCfLYFP/yemB/vsiB/qypbAheY2XrbyCC5ysVC0s4v6hge43+DmBBSka Es/reRppcaPFIhyu6Na4yuikNWPAfvMPuqgNjo2moOMEPIEAhhuM8oIMyrIoRpVmnSKu GbOz6JuWRb9rxK/StIUj4ox90rcPsku01kJYIvWLDzmv6Ugb7KU2l7umgV44zswlzFOP AMEg== 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 bo13-20020a170906d04d00b00997e1a43c28si1231708ejb.381.2023.07.18.11.53.23; Tue, 18 Jul 2023 11:53:27 -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 BD68168C540; Tue, 18 Jul 2023 21:53:02 +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 C8F0368C2EC for ; Tue, 18 Jul 2023 21:52:54 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 1F6A1C00AD for ; Tue, 18 Jul 2023 21:52:54 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Jul 2023 21:52:52 +0300 Message-Id: <20230718185253.18927-2-remi@remlab.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] swscale/rgb2rgb2: rework RISC-V V shuffle_bytes_{0321, 2103} 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: wory1OMLgZlO This avoids strided loads. Before: shuffle_bytes_0321_rvv_i32: 307.7 shuffle_bytes_2103_rvv_i32: 308.7 After: shuffle_bytes_0321_rvv_i32: 59.7 shuffle_bytes_2103_rvv_i32: 61.5 --- libswscale/riscv/rgb2rgb_rvv.S | 45 +++++++++++++++------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/libswscale/riscv/rgb2rgb_rvv.S b/libswscale/riscv/rgb2rgb_rvv.S index 8f30d760cb..366f80c1c3 100644 --- a/libswscale/riscv/rgb2rgb_rvv.S +++ b/libswscale/riscv/rgb2rgb_rvv.S @@ -21,38 +21,33 @@ #include "libavutil/riscv/asm.S" func ff_shuffle_bytes_0321_rvv, zve32x - addi t1, a0, 3 - addi t2, a0, 2 - addi t3, a0, 1 + li t1, 0x00ff00ff + j 1f +endfunc + +func ff_shuffle_bytes_2103_rvv, zve32x + li t1, ~0x00ff00ff 1: + not t2, t1 srai a2, a2, 2 - li t4, 4 2: - vsetvli t0, a2, e8, m1, ta, ma - sub a2, a2, t0 - vlse8.v v8, (a0), t4 - sh2add a0, t0, a0 - vlse8.v v9, (t1), t4 - sh2add t1, t0, t1 - vlse8.v v10, (t2), t4 - sh2add t2, t0, t2 - vlse8.v v11, (t3), t4 - sh2add t3, t0, t3 - vsseg4e8.v v8, (a1) - sh2add a1, t0, a1 - bnez a2, 2b + vsetvli t0, a2, e32, m8, ta, ma + vle32.v v8, (a0) + sub a2, a2, t0 + vand.vx v16, v8, t2 + sh2add a0, t0, a0 + vand.vx v8, v8, t1 + vsrl.vi v24, v16, 16 + vsll.vi v16, v16, 16 + vor.vv v8, v8, v24 + vor.vv v8, v16, v8 + vse32.v v8, (a1) + sh2add a1, t0, a1 + bnez a2, 2b ret endfunc -func ff_shuffle_bytes_2103_rvv, zve32x - addi t1, a0, 1 - addi t2, a0, 0 - addi t3, a0, 3 - addi a0, a0, 2 - j 1b -endfunc - func ff_shuffle_bytes_1230_rvv, zve32x addi t1, a0, 2 addi t2, a0, 3