From patchwork Fri Sep 29 17:16:39 2023 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: 44031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp701146pzg; Fri, 29 Sep 2023 10:16:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHgmOdFuu4F2vucUulXltlxgYkzGIUcxY/g271TgLGVYgfaBDrmL7Ik7fjk95DpjDdXUmHZ X-Received: by 2002:a17:906:3ca1:b0:9a5:cf6f:3efc with SMTP id b1-20020a1709063ca100b009a5cf6f3efcmr4054940ejh.77.1696007813051; Fri, 29 Sep 2023 10:16:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696007813; cv=none; d=google.com; s=arc-20160816; b=l1TTmgFC7336l4WaREsG+5uhusYaWwCuMihZl5CCdivkT+eqhR8AXK9kamhH2TdD1b f28csC3Tpyb2qMxDJ6gSFfkDBpCKs3YhUFT+qjGMRJzPvh/cw4zAWdJ8auDNMowgsZzV iCzfTbYQ/bvkUprOaePSQzr5ygt/40td+K9/ModSZnH9XwOgMaGDEVuc5qQYXMMzDRVU JHojRHWU39VabYW8RRkfoWb/3h1erRdbxp7cLlGg0nlwbYddLZUs0KOptTunEmteH3eH 2yusmVcDF9d9l1YXZvvHtsAC7ea7tBRSAIVESIrKBKE6YIlUBnno5vxtIKwkKKtLu38L ND9Q== 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=7iTxrGrQIRPp1aqup4YB6Jr+uQBvI2+V19sxp2vF/T4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Y2KjKjA8M1mFwcpF8WPukTofnHbvqP8knbGFWZCVNUDEwLf56jN6HRS307Zh+QlTtV rtLp9ZBOPLfBfSFJT18dQcvlRivwuQfdH5KhXupaXeB7e5sUn8Oo6hc3GAYH/5x3NUTd EMN5H7mJWoonKMgCWtoT7ZPkcXWZmwwmOtewTNR2piVczT6PrTww9bZewAGs+SDww1HF WsgVZI25AfkeVKprhgDwIg/mGgFsdjGXirMvRG69isOjXjKLxECoUc85LDrDXPweQ74c ranu0kaAdHQ6b4p13qFXWm4Bt5adyzYcxrgow07fLW97PZ8RGtAjj3GJDcTHFdlw5vmZ 3dWQ== 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 tl4-20020a170907c30400b009b291699dcbsi9421493ejc.237.2023.09.29.10.16.51; Fri, 29 Sep 2023 10:16:53 -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 A73C468CC96; Fri, 29 Sep 2023 20:16:48 +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 C95BF68CC83 for ; Fri, 29 Sep 2023 20:16:41 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 5E533C009A for ; Fri, 29 Sep 2023 20:16:41 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Sep 2023 20:16:39 +0300 Message-Id: <20230929171641.85165-1-remi@remlab.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] riscv: factor out the bswap32 assembler 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: vRFQ2qYNV3Jh --- libavcodec/riscv/bswapdsp_rvb.S | 43 +--------------------- libavutil/riscv/bswap_rvb.S | 65 +++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 libavutil/riscv/bswap_rvb.S diff --git a/libavcodec/riscv/bswapdsp_rvb.S b/libavcodec/riscv/bswapdsp_rvb.S index 91b47bf82d..0786bd3f36 100644 --- a/libavcodec/riscv/bswapdsp_rvb.S +++ b/libavcodec/riscv/bswapdsp_rvb.S @@ -20,49 +20,10 @@ #include "config.h" #include "libavutil/riscv/asm.S" +#include "libavutil/riscv/bswap_rvb.S" #if (__riscv_xlen >= 64) func ff_bswap32_buf_rvb, zbb - andi t0, a1, 4 - beqz t0, 1f - /* Align a1 (input) to 64-bit */ - lwu t0, (a1) - addi a0, a0, 4 - rev8 t0, t0 - addi a2, a2, -1 - srli t0, t0, __riscv_xlen - 32 - addi a1, a1, 4 - sw t0, -4(a0) -1: - andi a3, a2, -2 - sh2add a2, a2, a0 - beqz a3, 3f - sh2add a3, a3, a0 -2: /* 2 elements (64 bits) at a time on a 64-bit boundary */ - ld t0, (a1) - addi a0, a0, 8 - rev8 t0, t0 -#if (__riscv_xlen == 64) - srli t2, t0, 32 - sw t0, -4(a0) -#else - srli t1, t0, __riscv_xlen - 64 - srli t2, t0, __riscv_xlen - 32 - sw t1, -4(a0) -#endif - addi a1, a1, 8 - sw t2, -8(a0) - bne a0, a3, 2b -3: - beq a0, a2, 5f -4: /* Process last element */ - lwu t0, (a1) - addi a0, a0, 4 - rev8 t0, t0 - addi a1, a1, 4 - srli t0, t0, __riscv_xlen - 32 - sw t0, -4(a0) -5: - ret + bswap32_rvb a0, a1, a2 endfunc #endif diff --git a/libavutil/riscv/bswap_rvb.S b/libavutil/riscv/bswap_rvb.S new file mode 100644 index 0000000000..b391e2f9f1 --- /dev/null +++ b/libavutil/riscv/bswap_rvb.S @@ -0,0 +1,65 @@ +/* + * Copyright © 2022 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 + */ + +#if (__riscv_xlen >= 64) + .macro bswap32_rvb out, in, count + andi t0, \count, 4 + beqz t0, 1f + /* Align input to 64-bit */ + lwu t0, (\in) + addi \out, \out, 4 + rev8 t0, t0 + addi \count, \count, -1 + srli t0, t0, __riscv_xlen - 32 + addi \in, \in, 4 + sw t0, -4(\out) +1: + andi t3, \count, -2 + sh2add \count, \count, \out + beqz t3, 3f + sh2add t3, t3, \out +2: /* 2 elements (64 bits) at a time on a 64-bit boundary */ + ld t0, (\in) + addi \out, \out, 8 + rev8 t0, t0 +#if (__riscv_xlen == 64) + srli t2, t0, 32 + sw t0, -4(\out) +#else + srli t1, t0, __riscv_xlen - 64 + srli t2, t0, __riscv_xlen - 32 + sw t1, -4(\out) +#endif + addi \in, \in, 8 + sw t2, -8(\out) + bne \out, t3, 2b +3: + beq \out, \count, 5f +4: /* Process last element */ + lwu t0, (\in) + addi \out, \out, 4 + rev8 t0, t0 + addi \in, \in, 4 + srli t0, t0, __riscv_xlen - 32 + sw t0, -4(\out) +5: + ret + .endm +#endif