From patchwork Wed Sep 28 07:13:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 38394 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp24259pzh; Wed, 28 Sep 2022 00:14:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5QcfBrDKrXXrkdOyZs3iNteuYt4fFK9O6D8yu6PGkgmQdalhrc8WduHg2XVs0BhrqEAc4F X-Received: by 2002:a17:906:a3c2:b0:783:19a2:74d3 with SMTP id ca2-20020a170906a3c200b0078319a274d3mr15826873ejb.288.1664349273612; Wed, 28 Sep 2022 00:14:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664349273; cv=none; d=google.com; s=arc-20160816; b=u8ZptszLENHjRzVU0bOm6IplFN+K9LxUOFSBeCohhuhR5j6fIQZ5WlMc1rZXAT0VBf XNh2s/TYYmWyECERGl5iG5/2GrTDHdJT57X3VyXBfrgXhvNK7BsVGXUPb9F7RAg8bHEP sY0A8s073IbXy6vf+8TeFcgUzDoel+E9oeiCvgYwZw4O4GQxN7R8uHprk5lOQIRsGhRX X+NBnnUK/ms3wvTLjIG+NjC9W1VkUO4Y9UKpPM/QnelqW1fC1GcZHeKE/Dm5QCuPdFku UrnB8Ilz1vRWEoDDlKAGVReoI07vHvv7YWRUr4QOcK8qHYko4v6IVrSohOebCGhHMm9c q3xg== 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=Y0JJheNXm8dN/KkLe+y32laOCHB+7VtM8jPyVy8oiVc=; b=OFg9Rhw0pnnDEXEpSVONG7pwZ7wQrnrqEhHFqri/mmhQXfECxDB5G4VFwcklykkwLQ JZWWhXGxVBEj1YTzlnCgFPcC7UxJdc55GtFyEZZ3UlIg4nYa7vIMXm7jBAgyHPrBYQRd SAdNYqv4bJQk4zinBxr2wK/G3NNr+x/5pAVrZYftFwcfrGH8lW6S2D+OnQ0l6GLFLj+g cN6aJ6IwwqLWT6MWl+PiiRphG9muNua4gjIGXpcrAXJ7b+R+jkazZoqDAwveGpBYOTu7 DUQImhQf6pgobLtZGhjzXprp6xyUkOqFrsQa0XSduGR8QNjRkcfuQ1rqu9hM6vBb2eLE +daA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=qMpskFwe; 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 fg15-20020a1709069c4f00b0076f7f824407si3178740ejc.948.2022.09.28.00.14.09; Wed, 28 Sep 2022 00:14:33 -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; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=qMpskFwe; 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 9ADAC68BA3D; Wed, 28 Sep 2022 10:14:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B6D568B353 for ; Wed, 28 Sep 2022 10:13:59 +0300 (EEST) Received: by mail-lf1-f50.google.com with SMTP id a2so19016943lfb.6 for ; Wed, 28 Sep 2022 00:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=wAM0OeGIlU0cVJUMEKMUYdHACjVrewVOr5oI8N35q9o=; b=qMpskFweKG7cGeHwp20Fs3mL6xsu/Ye/EFg8olpmR8HDcBqAZHZoXNn/ofQ3kBgKsp 3KC3FtIlqikqVkZAec+JeoDWevHu9svynFbBoqrnKm3mVsDlUXggNuLRuIqQNquL+ACJ G7P/KCH8lcY8upio+APYaNjFutvj+qhIVM9yFWl5zKDzJnjvHqE7fxRAdkZ9j7C8dsSt JgGrf9PtZ4cOnNN4UeRo+KCCZtJf5P7Xj7TpsegMBjSRwOx6DgoQByZ3jwGnfzcEjg3a AlQJ7SBQDSdWa3tghpnAzns3wQcE1sWY8IAuwMH4H+anmKi8ahQZdFbp/WnJGzlrT4jr OeBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=wAM0OeGIlU0cVJUMEKMUYdHACjVrewVOr5oI8N35q9o=; b=dx/bJ5iosJAiphfVMrUfpUDfnBcA6bSh5J5M/ts2waQxf0Czh9RyQ2lhqWxkKvsq6U pejPI3EvBZFupv9Ek/nyl8JwYqMaMy98ZOnxnBkQQKWwHmNrF2SqEi3Nx4lxAEXZJF0J 6MIDE+xfmEz3n/0grOw98EwjPzqnpjUYwY4seGjFr+Ixc5+IEbq6UJukwDgtsTdEwspT W97V1nGw7a+nxelC3MIjteP43V6ZRKar+v8bDX61jGseaXNHH9lonuZB1ORyhR6vW2mr tuvi76kggZNtNZV+PpnTOvlQWpuBRxHZpo8gfSZbJjm/iQPSuhR0+RiciPvUpm1SCxq5 3e+Q== X-Gm-Message-State: ACrzQf2xAGOniiSqYR/SbfmqzKDbcOqP0NqApHav2+7SilrgPJ2Lj1VY 5j7GEU8N2VTjpxH+QreR4ahJCaFxR7m8WDUe X-Received: by 2002:ac2:5451:0:b0:49e:bc93:3395 with SMTP id d17-20020ac25451000000b0049ebc933395mr13844643lfn.392.1664349238787; Wed, 28 Sep 2022 00:13:58 -0700 (PDT) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id g19-20020ac25393000000b0048a9e899693sm393986lfh.16.2022.09.28.00.13.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 28 Sep 2022 00:13:58 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2022 10:13:57 +0300 Message-Id: <20220928071357.40011-1-martin@martin.st> X-Mailer: git-send-email 2.37.0 (Apple Git-136) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] riscv: Use the correct path for including asm.S 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: RFaQbmjPJpLq Signed-off-by: Martin Storsjö --- This should hopefully fix the compile failures on fate, http://fate.ffmpeg.org/report.cgi?time=20220927222508&slot=riscv64-linux-gnu-gcc-12 and http://fate.ffmpeg.org/report.cgi?time=20220927225014&slot=riscv64-linux-gnu-clang-14. --- libavcodec/riscv/fmtconvert_rvv.S | 2 +- libavcodec/riscv/pixblockdsp_rvi.S | 2 +- libavcodec/riscv/vorbisdsp_rvv.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/riscv/fmtconvert_rvv.S b/libavcodec/riscv/fmtconvert_rvv.S index c79f80cc47..49893ec8d7 100644 --- a/libavcodec/riscv/fmtconvert_rvv.S +++ b/libavcodec/riscv/fmtconvert_rvv.S @@ -19,7 +19,7 @@ */ #include "config.h" -#include "../libavutil/riscv/asm.S" +#include "libavutil/riscv/asm.S" func ff_int32_to_float_fmul_scalar_rvv, zve32f NOHWF fmv.w.x fa0, a2 diff --git a/libavcodec/riscv/pixblockdsp_rvi.S b/libavcodec/riscv/pixblockdsp_rvi.S index 93ece4405e..e84170244b 100644 --- a/libavcodec/riscv/pixblockdsp_rvi.S +++ b/libavcodec/riscv/pixblockdsp_rvi.S @@ -19,7 +19,7 @@ */ #include "config.h" -#include "../libavutil/riscv/asm.S" +#include "libavutil/riscv/asm.S" func ff_get_pixels_8_rvi .irp row, 0, 1, 2, 3, 4, 5, 6, 7 diff --git a/libavcodec/riscv/vorbisdsp_rvv.S b/libavcodec/riscv/vorbisdsp_rvv.S index e8953fb548..bbe9c7dc6d 100644 --- a/libavcodec/riscv/vorbisdsp_rvv.S +++ b/libavcodec/riscv/vorbisdsp_rvv.S @@ -19,7 +19,7 @@ */ #include "config.h" -#include "../libavutil/riscv/asm.S" +#include "libavutil/riscv/asm.S" func ff_vorbis_inverse_coupling_rvv, zve32f fmv.w.x ft0, zero