From patchwork Fri Dec 15 13:05:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 45162 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp5635353pzf; Fri, 15 Dec 2023 05:05:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IHDa5R6CrIWHXq2vk8OZrsc1EgavKWZY/3PnUKGF1JOgoj0fj6ZqjtuwIPocZoqd1HMj8yB X-Received: by 2002:a17:906:b3a4:b0:9dd:7133:881 with SMTP id uh36-20020a170906b3a400b009dd71330881mr2571747ejc.40.1702645524136; Fri, 15 Dec 2023 05:05:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702645524; cv=none; d=google.com; s=arc-20160816; b=UbLgg6UWyC5VI93zuIUw48bIdfb736Btouxw5jJpJKDnHsMoT6iKQXSU7B9Ew4Pwc8 M2ekqz7VR6byY9JSC40ddzV2ESZnrZ3tcwI0lYqo8NJB//mbsgIaaEjphdIScvo5icXz htjviza3Gmk81HQ98O66VLuaycbnOVmf/kPMizU5VxIh3euGVrCf0c4nBdQaOBXRXxcW FvO0VrUitpQCuLscfrnEd8fNB2cgbKNmTS/EK7X+sLgPZjoxX6kgCgUYMDXSsRXn80QW vMgIMnP0arRtd8fYlESgpxYuJ3TOyc/xHYJ/G4bw/E+bC17PYgk+OJWJmrjGGvT65pgA i6+Q== 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 :dkim-signature:delivered-to; bh=9fPIn0ZPuwNipfCGWS1zc7aQXkIfUFS37INtmUCLo+U=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VFxCSuvvwfDx61WvyUU/o/JBi1RzHp39LYGS6XEkWgbGNGDonoZZTTN3bgnm8AuHaV q1TAaky6mNRLgJIYTGOJh/LYrfnZaygCii2NUpiQWWxenbJiEWkbroXFdohU6Gulk4CI F/ZEqurdnDT95SJLeHET7Z/QNf8zlmtADjzN962dSmDsY8GVMY0EkgVqhQxAg38hIX1i z8daoFHZBFJoeBCI3uk4K9hYUIvrbEAM3TaGbFJEmhPsHowJMXrlIZDb0Adbbce251C7 J/cXQk/MZmRZ8GfXrTA/JrTNkUuez3rED4SgRMK1V8zAtcrhTZXEAtEBCT1LfuHCvJ04 3WCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=Ywg3NrJ1; 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 m10-20020a1709062b8a00b00a22f1120795si2973669ejg.183.2023.12.15.05.05.21; Fri, 15 Dec 2023 05:05:24 -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; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=Ywg3NrJ1; 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 E5F0C68D2B6; Fri, 15 Dec 2023 15:05:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1442B68CDF7 for ; Fri, 15 Dec 2023 15:05:12 +0200 (EET) Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-50bce78f145so686306e87.0 for ; Fri, 15 Dec 2023 05:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1702645511; x=1703250311; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=DVVHca4BetQylSV3YF89XFXP46CZ9ZytbRNz1F/U7RQ=; b=Ywg3NrJ1176i2SXf3Iy+S0Wth1AAf0BsIMeQnSXwlBK8X9ZTwh4C+PoTikSsjRWlZ2 a1d8z2lYthJsHcFzv+J4E8riW0h5apBF57yMSvwN44JMtQFxGjmH5phakoJIbWxom0v4 dnsER0r2cnOw0cXU1yKVzTFPHR1vwVryWCbZUeUwiJEEC9NVolqb+69WfxG5oQHEQDJp VJ3ZEQIkrQ0PB6Lf4kT6oKqkb8YPadKpim+b7B/V05id9QY7oORPnMZKrdYTatzERhw+ ZS/SYtQey7o+xOW2VTTqR8sGxZllDvdL39+eUwIZiH5wE3FRf+ShtcYHPBWcMdTpe2Nd xZBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702645511; x=1703250311; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DVVHca4BetQylSV3YF89XFXP46CZ9ZytbRNz1F/U7RQ=; b=fHF5+xMY3QUitaOaeTqN3RQSIntpUfQV6lhqJfnSsb4whb2XES0cKJKyFc3pocyn+l ppLOMnXTrITJSDLPafeK2aoe+r6eOONARV5Rud9BZEJ9M9Y8Ik9TLxRIlNlmTVqMAGHc QSBgYjLyHsL+A/e6OSG2U7MNSh+Q+WrJ3xN3NvE3WzbHAEsoMTBHS9mtvCs16C0HQJTP oXU1vQK/sPRB6zT4npkginYmQnuWCNSKNwR06bAO8+JtW72JJGQ2WZbwpQaimu4XxtFb s+Z+fvfqhlysd3XcBowqTR0BUxTy4dD1kuHrU3aeVNX4TZP0etog1etz6SPQ9tSn67an TDFA== X-Gm-Message-State: AOJu0YxgC6uP0dBxyLpMwfcAr/bRsfr6SPnLIkSakXtAEMod0N0uQB/R WOVSdKQyLAvZPG8QRL6jUAgeoCIF6Oi3Wo/l/thRfA== X-Received: by 2002:a05:6512:304c:b0:50b:f51a:299d with SMTP id b12-20020a056512304c00b0050bf51a299dmr3546711lfb.18.1702645511176; Fri, 15 Dec 2023 05:05:11 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id i11-20020a056512340b00b0050aabf7a82csm2157081lfr.160.2023.12.15.05.05.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Dec 2023 05:05:10 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Dec 2023 15:05:10 +0200 Message-Id: <20231215130510.127977-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] riscv: Tweak names of cpu flags, print flags in libavutil/tests/cpu 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: Uk8OflgCWbO9 The names of the cpu flags are pased by the libavutil eval functions - names with dashes are parsed as a subtraction. Replace dashes with underscores. Add these cpu flags to libavutil/tests/cpu, so that the detected cpu flags also get printed when run, also as part of the fate-cpu test. --- libavutil/cpu.c | 10 +++++----- libavutil/tests/cpu.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 1e0607d581..8c1acc5e72 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -186,12 +186,12 @@ int av_parse_cpu_caps(unsigned *flags, const char *s) { "rvi", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVI }, .unit = "flags" }, { "rvf", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVF }, .unit = "flags" }, { "rvd", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVD }, .unit = "flags" }, - { "rvv-i32", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_I32 }, .unit = "flags" }, - { "rvv-f32", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_F32 }, .unit = "flags" }, - { "rvv-i64", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_I64 }, .unit = "flags" }, + { "rvv_i32", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_I32 }, .unit = "flags" }, + { "rvv_f32", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_F32 }, .unit = "flags" }, + { "rvv_i64", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_I64 }, .unit = "flags" }, { "rvv", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVV_F64 }, .unit = "flags" }, - { "rvb-addr",NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVB_ADDR }, .unit = "flags" }, - { "rvb-basic",NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVB_BASIC }, .unit = "flags" }, + { "rvb_addr",NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVB_ADDR }, .unit = "flags" }, + { "rvb_basic",NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_RVB_BASIC }, .unit = "flags" }, #endif { NULL }, }; diff --git a/libavutil/tests/cpu.c b/libavutil/tests/cpu.c index 200f20388a..1cabd15b72 100644 --- a/libavutil/tests/cpu.c +++ b/libavutil/tests/cpu.c @@ -84,6 +84,16 @@ static const struct { #elif ARCH_LOONGARCH { AV_CPU_FLAG_LSX, "lsx" }, { AV_CPU_FLAG_LASX, "lasx" }, +#elif ARCH_RISCV + { AV_CPU_FLAG_RVI, "rvi" }, + { AV_CPU_FLAG_RVF, "rvf" }, + { AV_CPU_FLAG_RVD, "rvd" }, + { AV_CPU_FLAG_RVB_ADDR, "rvb_addr" }, + { AV_CPU_FLAG_RVB_BASIC, "rvb_basic" }, + { AV_CPU_FLAG_RVV_I32, "rvv_i32" }, + { AV_CPU_FLAG_RVV_F32, "rvv_f32" }, + { AV_CPU_FLAG_RVV_I64, "rvv_i64" }, + { AV_CPU_FLAG_RVV_F64, "rvv" }, #endif { 0 } };