From patchwork Sat Nov 18 20:16:17 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: 44712 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6a89:b0:181:818d:5e7f with SMTP id bi9csp718293pzb; Sat, 18 Nov 2023 12:16:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IExnGOj+MrqH7OP78tN9euSwydtCdKIwAiTt1PaRI/elQCBuhFOYgJzGFlFv+l8HUcr3cwX X-Received: by 2002:a2e:8e38:0:b0:2c5:d49:ee9f with SMTP id r24-20020a2e8e38000000b002c50d49ee9fmr1847167ljk.1.1700338590730; Sat, 18 Nov 2023 12:16:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700338590; cv=none; d=google.com; s=arc-20160816; b=uU6zN6DLYWmfAhMOwxOqNUGerQyZgyjzB77pBzlBAUXdi74261Zhqca1bPkIR8Sbn9 Bcged8O3Jdg/cU8cYdDnwcgduVGvSsLH0h4DPTZy5RsNjAac6kAjcMcFdYB4n/fcKsmy i7AXwV2nsWQEUH1DbA4eDwJlntv39y3kl8iJXsUaBoVTcgMJTrxtCzuJ7moecQQCGRc1 WKcw2+MFcnVZ3/Rrw2eVryQmujEXxyJbyuCsdLH4SxchwHZsOOBifT2xkLHYT4jLtf7n 2oAMMsyBs1rTNyX1dfB7thvTr85LZsQZg1CYaZVz6u28DHa6Z79Y1lItpGp0yzW3tjcc T3Dg== 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=n3re11tD4J6fqDfO2b3VnGd4lORhQPYf1lxd0NWKUGE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=IUnWjB8TUK0A7laUYO4xQHdYc1bCAwX0pIWnWouHT0kaR9AoRJXHbC5WOyFJclcaqb qDttgMEtGRIjiE1e04xDzvMrwaZl1Wy4NDSVLgNmGlgEKTJp8LZGgM4nKXGtfgvQFUIJ LYLeH780abhWxlc6ySJfua09KxTj7M/B95q7anfKlHxY7RyWrOIwkLamIsy4hAaGKNOX /UuYb7tBBAGqdOHZsd5ToA+Fuq4CqZt5mC+O+b1zqBqLmuh58708hiloumtnuZ13/bic d3uRnEh6kLItU22QhAlxdIzgIOlvpbKtZ0PAYH4UGscLVzTG5S7cVT49yTFkgi49/ldz kAqA== 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 h23-20020a170906591700b009e63570bc24si2812634ejq.717.2023.11.18.12.16.29; Sat, 18 Nov 2023 12:16:30 -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; 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 E1EF268CBED; Sat, 18 Nov 2023 22:16:25 +0200 (EET) 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 1EBD368CBD4 for ; Sat, 18 Nov 2023 22:16:19 +0200 (EET) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 81120C000E for ; Sat, 18 Nov 2023 22:16:18 +0200 (EET) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Nov 2023 22:16:17 +0200 Message-ID: <20231118201618.91940-1-remi@remlab.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] riscv: indent code 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: JZLAAHDP8Zj1 This reindents code to prepare for the next changeset. No functional changes. --- libavutil/riscv/cpu.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libavutil/riscv/cpu.c b/libavutil/riscv/cpu.c index 460d3e9f91..984293aef0 100644 --- a/libavutil/riscv/cpu.c +++ b/libavutil/riscv/cpu.c @@ -32,21 +32,23 @@ int ff_get_cpu_flags_riscv(void) { int ret = 0; #if HAVE_GETAUXVAL - const unsigned long hwcap = getauxval(AT_HWCAP); + { + const unsigned long hwcap = getauxval(AT_HWCAP); - if (hwcap & HWCAP_RV('I')) - ret |= AV_CPU_FLAG_RVI; - if (hwcap & HWCAP_RV('F')) - ret |= AV_CPU_FLAG_RVF; - if (hwcap & HWCAP_RV('D')) - ret |= AV_CPU_FLAG_RVD; - if (hwcap & HWCAP_RV('B')) - ret |= AV_CPU_FLAG_RVB_ADDR | AV_CPU_FLAG_RVB_BASIC; + if (hwcap & HWCAP_RV('I')) + ret |= AV_CPU_FLAG_RVI; + if (hwcap & HWCAP_RV('F')) + ret |= AV_CPU_FLAG_RVF; + if (hwcap & HWCAP_RV('D')) + ret |= AV_CPU_FLAG_RVD; + if (hwcap & HWCAP_RV('B')) + ret |= AV_CPU_FLAG_RVB_ADDR | AV_CPU_FLAG_RVB_BASIC; - /* The V extension implies all Zve* functional subsets */ - if (hwcap & HWCAP_RV('V')) - ret |= AV_CPU_FLAG_RVV_I32 | AV_CPU_FLAG_RVV_I64 - | AV_CPU_FLAG_RVV_F32 | AV_CPU_FLAG_RVV_F64; + /* The V extension implies all Zve* functional subsets */ + if (hwcap & HWCAP_RV('V')) + ret |= AV_CPU_FLAG_RVV_I32 | AV_CPU_FLAG_RVV_I64 + | AV_CPU_FLAG_RVV_F32 | AV_CPU_FLAG_RVV_F64; + } #endif #ifdef __riscv_i