From patchwork Tue Jul 23 11:28:20 2024 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: 50706 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a742:0:b0:482:c625:d099 with SMTP id f2csp2559260vqm; Tue, 23 Jul 2024 04:28:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUNv5VzHDRUY1afq7DA+j9dOLnsxS0UMVuO+MMImH6s63wH+urbnucNvwm+JyWLEE7AKOIRrCw2idGC9kOZmyZ77m4RiRmfBWqJuQ== X-Google-Smtp-Source: AGHT+IFaNNA8ZHxSudrFbPMbGHSuS4t8FCX3v6l/1zQ57davj/34Y2R5Pcm46FY7P0H7vnsRZpXp X-Received: by 2002:a05:6402:234d:b0:5a2:2fa5:f145 with SMTP id 4fb4d7f45d1cf-5a47a61f4b0mr8003762a12.25.1721734114281; Tue, 23 Jul 2024 04:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721734114; cv=none; d=google.com; s=arc-20160816; b=k14yhwmpNG5frkAzcqjobD0sgPGPGPV3DZ7J1HL9yYGfPp4AalO4iiPH7F7ZP5rpA5 bgYy7za1IuNwV1jCm0GxIQxgd9xKVjUVTt8NvUViHPQlUj3mDoQyE8/TJDgUNc8zDHXF 4JXDbkFtN3QYOfvngmaNJm7IHr+c1q5eCynKMvpmsk0dQSDX1U9XKKx9j4rsLYDjdEHd B1wsB17fuNT+RTdHAPjP6SbCU6eZbAHtVPSYBwSEt6ydo4WUKGpVqt+Dr4mPHOVHUcJO V9x56OX8ub5jM2xwxBvMBtUfjYz2SSmi/ii5g0xby2lV6f1WdCOuCTe2p9kE23rtModn USRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=uMCCCtwGBZlKWgMu5zudEzoD1gbM2hgj7j0we2IbiUs=; fh=1uPTKUvRnOgiEaYgKGzgSxEgTIS1PbR5TNt1/RunOQM=; b=PYuy73rnGB7IYVIgvitEzGlMYnimG8Kfo59YxnV3HtH2AwjTIw7ElP6VNsvGG+ExwB +gUTMH0hL3bWRNlRjgx2xEEjTcLKZcu5GHZSaCM6p6MIwQYwf8my/SKXFH7DfD+exb8F TAhpp/G6pXwhgZRkCIZCQS0qzHmU5iz0Ub+AsYav6j7EBHRk7yCeVDgwnclz2vfJ3Whz flHT4u6z1UY6fM+thtyZYLpAKANKrI/4BU04VKiQ86EwbHQb8FIwj7qLbG8SEIPYVpjN UJ9S/FmxCO3NptNeOxsNYzpFdENKGtWpxdSWKjra+0f9hje/zI8Ma/GssfKzu5tY7pu6 5yPg==; dara=google.com 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=aMnwTj+F; 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; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5a309fffedfsi5932477a12.49.2024.07.23.04.28.33; Tue, 23 Jul 2024 04:28:34 -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.20230601.gappssmtp.com header.s=20230601 header.b=aMnwTj+F; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E0F568D57E; Tue, 23 Jul 2024 14:28:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ABCD689E58 for ; Tue, 23 Jul 2024 14:28:23 +0300 (EEST) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-52f0277daa5so3596443e87.0 for ; Tue, 23 Jul 2024 04:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1721734102; x=1722338902; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KL3c+IHG0UIaYwPfwtBs2SPjILTPfZ3V7Lk15/fAlhY=; b=aMnwTj+F2mBHWw6UzYn32iSeB7hMRUNW1IxWwzlXbWx8CslJg+8VbyuzjDVoxVmzBE wkICOu2ZpgJHIco3BF4PbdkHkP5g3uRvnK3zb3sHao8sPtAbxmCWozocme36aMtXaOW+ 3A3WnPds8TihsCJ0Uv2cT8lVe2Dtl0OkM0RRCCU6kjszsy09TgPiZjDv+zW5EeNBJo5Z GlBqqTqEGTmXLNIzRdAmoToSjStxb5otxsJ7gLL0wWaSok4cVOCL8y/ON2wFWYzwvW4l vCYkh5mmuHpXRY7V+oXula/eNZo4ErlO20DbKqAp9KlxDbB6a5wbZ1EBR3DDFOyKUqxe bdNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721734102; x=1722338902; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KL3c+IHG0UIaYwPfwtBs2SPjILTPfZ3V7Lk15/fAlhY=; b=EQ4em6/i0zbZ9dm8fbhW8lmFs6Ue7wKPCcpsYOeCY7yx2FUsALP34XwDRpfuJzkjub +95S1m6/XkEsy7xmsUF220I3xDG67xa4AboE7TkuPc9kf65Cz+qQLcmjNm1igENPGWjo mflOVsrn/V6TFYuIZ39lfCkLXySJ9Zaoz8NCLHStP9CIFr+l/ectEVEAirQC27TPzC1Y 2lbZa4ObZtbf8VzmHlLzKBj4fggGNfpsGelIbiymV6e9hE5Ouq5HkdKPse6dfJ14wMVS cD39ZHFsnq5KTk1Nj10Rw8M1EMKcfNGI5R0ADaApWGpUvjU9a9rJp8/ujOVwswEfa9UE U1mw== X-Gm-Message-State: AOJu0Yxswi5UM8neRKsl0GkVKLwi0G7VC/uy5qXk9iOqkPiOONtQZ+7E 6afT8lLjc/iktypQdERFTxqRb70RoIo4NZngPNStliN7e+fyofE8hLQlfVrn8KJ70fX/6uegOF0 tYw== X-Received: by 2002:a05:6512:1114:b0:52e:91ff:4709 with SMTP id 2adb3069b0e04-52efb63f078mr6592280e87.21.1721734102048; Tue, 23 Jul 2024 04:28:22 -0700 (PDT) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52f00af7cc5sm967180e87.85.2024.07.23.04.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 04:28:21 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Jul 2024 14:28:20 +0300 Message-Id: <20240723112821.2185107-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] aarch64: vvc: Fix compilation of alf.S with MSVC 2022 17.7 and older 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rzAy1gO0trPi Use the "ldur" instruction explicitly, instead of having the assembler implicitly convert "ldr" instructions to "ldur". This fixes build errors like these: libavcodec\aarch64\vvc\alf.o.asm(1023) : error A2518: operand 2: Memory offset must be aligned ldr q22, [x3, #24] libavcodec\aarch64\vvc\alf.o.asm(1024) : error A2518: operand 2: Memory offset must be aligned ldr q24, [x2, #24] libavcodec\aarch64\vvc\alf.o.asm(1393) : error A2518: operand 2: Memory offset must be aligned ldr q22, [x3, #24] libavcodec\aarch64\vvc\alf.o.asm(1394) : error A2518: operand 2: Memory offset must be aligned ldr q24, [x2, #24] --- libavcodec/aarch64/vvc/alf.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aarch64/vvc/alf.S b/libavcodec/aarch64/vvc/alf.S index beb36ac66b..828031cb90 100644 --- a/libavcodec/aarch64/vvc/alf.S +++ b/libavcodec/aarch64/vvc/alf.S @@ -81,8 +81,8 @@ .endif ldr q0, [clip] // clip ldr q1, [filter] // filter - ldr q22, [clip, #24] // clip - ldr q24, [filter, #24] // filter + ldur q22, [clip, #24] // clip + ldur q24, [filter, #24] // filter ldr x5, [pp] // x5: p0 ldr x6, [pp, #(5*8)] // x6: p5 From patchwork Tue Jul 23 11:28:21 2024 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: 50707 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:a742:0:b0:482:c625:d099 with SMTP id f2csp2559335vqm; Tue, 23 Jul 2024 04:28:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWj5oAS9ca6UodjbaB5wfQTiDyueHp6j8bJzzJ0RyVeuGreRBzd52Slt4Si/otxs+aO/pSyqMEmSYfxjsqqDV+K/3Xj0xfTNPTJpw== X-Google-Smtp-Source: AGHT+IGW4bDZFcYjDtAG/0b/Z34lAOZIpJWfeprkxg9StRKVj+5g5TEdweODbdNmTRfCRSCHUgCi X-Received: by 2002:a2e:bc26:0:b0:2ef:316e:8930 with SMTP id 38308e7fff4ca-2f01eacebe2mr22876061fa.42.1721734123287; Tue, 23 Jul 2024 04:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721734123; cv=none; d=google.com; s=arc-20160816; b=tBsdWYNkkEKsSSRphh4TjfWQ9db6w2kLCWihwUUi++Ejzul82yzLNGXOQJMhcqiNCN 4WX15eWhdiDREtmrL7KsyUUYcDWtXBUfy5XD9VScNKzfNeGM9NNnKOVBiTs7hVr2KFfy qHh7N+isW+PcNaWTfEPIyJXAhbsZRB9Ldf0XmQKoxTpEYdfW3Kb8Hbu2W/6JblDPY2SK PwVcaWFVJHiy/BL9r1twQLsR6xzy4h4iJZ2hXdDnk4zAV7qQEtEEeu7M4rebRITFMYOi X3WybuUlPitBXBtFgYJQ37rCimvmEExFTZeb254N4z26P7d0jXJVPgUXaRblf3WUN11a dKqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=u1SUFNdCqGszFGOEfRByrFGN8xDVoSstkrIMMKAsF0M=; fh=1uPTKUvRnOgiEaYgKGzgSxEgTIS1PbR5TNt1/RunOQM=; b=QcbkBIcuhyplqOTl61LhpX9+BNVirXQDjCmROJTeFERqV78y0L4/dqvugO+IlBJ8k+ v79R0uClI3T+Vt68+1z1xeZo5ikeGtwsVulfNB1JiOgGjHm1zvU+IqjcZxx3q2egsSmI 35wCYLlatGGkJqYhK8SfpgqSvB69x0DJvaqyhROMeecsM8NAHWk1MSjrcEtniO4rImVQ RMYy0HKEvGDCAgJkELJlAu5Ec2SoSb+Dhm0Gu2bOJLliTjijbCNNTFUB5RpmzmE4fNCu LBr0etZc4hvA702TXCkFXYV7KBc0RqiYPBCf+WKoIYPG296kpjr2aY9nxBRgGZOJ/pRP 8YUw==; dara=google.com 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=KpnwuOWJ; 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; dara=fail header.i=@gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ef2b360e90si13224541fa.412.2024.07.23.04.28.42; Tue, 23 Jul 2024 04:28:43 -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.20230601.gappssmtp.com header.s=20230601 header.b=KpnwuOWJ; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B75A068D20F; Tue, 23 Jul 2024 14:28:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDAD7689E58 for ; Tue, 23 Jul 2024 14:28:23 +0300 (EEST) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-52efd08e6d9so3867415e87.1 for ; Tue, 23 Jul 2024 04:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1721734103; x=1722338903; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kz/UODtAlgjj9oVXt8bDzJ5PkNizIhBX5kJBA2u3N/k=; b=KpnwuOWJvHpJiMkd4Acpvafz1Xu2PqZQwbONguuxV5TTYkAeDhaYPjn0o4aHW+RU7G ghAVftu0C3N+Y5O2D0rEzWqfox6WRNZitGYApXy0L+22zQcUwt2OzKU81N3KQX1LNyz4 jBYL5PnHtKYVxZqzPcVATroRlQJTWCKld4InitV6xKYQDN+lr3wZh6xUAneBE4/wuDhw EcsbMtpolHZcigWtXDf9Vo5CoQx/fKBFaGS/Yq0wjedY8Unykwc5cStKoIYAqIIihMNj HwLATcwUwVLKKTIJSeN5eAU4wgDzCEfH3dpWlcicKKQ0QDwC+Tkl4tv0PqdKb/MSVZRx 2eeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721734103; x=1722338903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kz/UODtAlgjj9oVXt8bDzJ5PkNizIhBX5kJBA2u3N/k=; b=fXn78tszxBJdKsIox76bHlxdSs9ERfdjwvDeweXNX//jSg+i3uepFm5kp4HDPS1J5n Z6hxQdECaMJLFrpZd+EhVuWktgMl6O+CujnXL+d8kKIAlMPWfVl7MXEBHHBcWAKpfTL8 +mV+8qR8S6jrlIRKbAuluQgdQuGF8SXGbESJ/paqOwx54ym5K2XpqfwxaT1thIXwycWQ gB3i0aYtA8vspebvhWt4s868O1ztgW6+H4kc/PcYRC1HJ+UiVC2mexwvsFGndsUSs1iB h1tU8zdumwmp6fn/F8EF955jQfCQVQwOIN4Q/gUxkzCHgW2dO1EZ65KD2KPxdfZLwUIb QZJA== X-Gm-Message-State: AOJu0Yyzrur10gmDpqJ9Qdbh+oHHbM4JNUL4HxFtJCq8rrrUUz6i2PED gh/XSZXRT9BAEQwV0hHjOWN4LB+Ht1f300YF4I180wySEL+h1tt1OO+w+txKhLiFmaOaQUZB3GJ CZw== X-Received: by 2002:a05:6512:1092:b0:52e:f950:31f3 with SMTP id 2adb3069b0e04-52fc404c1afmr2069139e87.35.1721734102705; Tue, 23 Jul 2024 04:28:22 -0700 (PDT) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52fc2b5165dsm436117e87.18.2024.07.23.04.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jul 2024 04:28:22 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Jul 2024 14:28:21 +0300 Message-Id: <20240723112821.2185107-2-martin@martin.st> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240723112821.2185107-1-martin@martin.st> References: <20240723112821.2185107-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] aarch64: vvc: Consistently use # for immediate constants 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Yo0neLga5wMS --- libavcodec/aarch64/vvc/alf.S | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/aarch64/vvc/alf.S b/libavcodec/aarch64/vvc/alf.S index 828031cb90..eec193302a 100644 --- a/libavcodec/aarch64/vvc/alf.S +++ b/libavcodec/aarch64/vvc/alf.S @@ -95,7 +95,7 @@ .else ldr q5, [x5] // curr .endif - movi v20.4s, 64 + movi v20.4s, #64 cbz is_near_vb, 1f shl v20.4s, v20.4s, #3 1: @@ -220,7 +220,7 @@ .else ldr d5, [x5] // curr .endif - movi v20.4s, 64 + movi v20.4s, #64 cbz is_near_vb, 1f shl v20.4s, v20.4s, #3 1: @@ -267,12 +267,12 @@ function ff_alf_filter_luma_kernel_8_neon, export=1 endfunc function ff_alf_filter_luma_kernel_12_neon, export=1 - mov w5, 4095 + mov w5, #4095 b 1f endfunc function ff_alf_filter_luma_kernel_10_neon, export=1 - mov w5, 1023 + mov w5, #1023 1: alf_filter_luma_kernel 2 endfunc @@ -282,12 +282,12 @@ function ff_alf_filter_chroma_kernel_8_neon, export=1 endfunc function ff_alf_filter_chroma_kernel_12_neon, export=1 - mov w5, 4095 + mov w5, #4095 b 1f endfunc function ff_alf_filter_chroma_kernel_10_neon, export=1 - mov w5, 1023 + mov w5, #1023 1: alf_filter_chroma_kernel 2 endfunc