From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 87F5F4A21D for ; Mon, 25 Mar 2024 15:05:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A16D668D5FA; Mon, 25 Mar 2024 17:03:09 +0200 (EET) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F37968D432 for ; Mon, 25 Mar 2024 17:02:55 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-513d212f818so5020222e87.2 for ; Mon, 25 Mar 2024 08:02:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1711378974; x=1711983774; 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=aHDeqQpGHyl00wsfwhy6Z8pLpHFkCLLYnKNNYf+Ep5Q=; b=k0pKciJL4klS/mFeosXH62kShH9U8POHkjpUo1MFSuZB6flHdWsI4Jke+pb7uztjGj XYnz5BcTklUM5uI2MADyfRWbGHXgz3P07YgqHTHKSWwjJM1vvngc0Ew0pEyVqKc2vFXC 5VNZQrSfnquH8xRvXvRNJx4fOE1QoBAB3LtxHCH9iXEnliIVIE+v0utxtnTnjHK8pwOH YVgjgXiRVcCpR7R1eU3wWSx5lWfvdXN4LUjiMCH/8H+becYeotckRebAmwKECyqkyAoM PD/ZWnY8s+zfE4EXA+kc4kdYqrEkN4BDCjiQWHYYHFpqkzEGq2C8u3YDGFO3oCj6EFIv 2JbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711378974; x=1711983774; 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=aHDeqQpGHyl00wsfwhy6Z8pLpHFkCLLYnKNNYf+Ep5Q=; b=ouIfzJbw8hcJcTl2/CNTPBYwKkAKRu9yYDypSd8dC6N5hZcVGeiZFJvfxx7vUdZTKL RY3yXyKhcFpC1iqiTcDrp1FfC1ltbQd4NFQouJZnlg64UhPAOFhiyl6RuD2lPibAKfin TdD8UDMFenOlU6wH3AfG+ByecnT+7VvVFRiRsL3B68yaAexp67my46CU5qsL1kcaVoN7 ykLbP7C9ZZUIKljNJWjC/R1Mr54N8Gc7G1Q76EqGoh4zj+Tb0j1nDgu1z9H/g9KgpcKf /bYZR5W/ZUAhoD4DBVX2IXJSUf2u//FGGkssVbIsvvBUsi1QjvkheXYXlGCtCcOSCCy5 hSUA== X-Gm-Message-State: AOJu0YxGJywc7d1WkLukrCvX3rk5DF93AnrU29zrlxqQ4Q60YwpNOYAg yNpobEyyTeXL67ysgrQ4E/JJ0zgEpoa5Xa0v9/v71f8ZIQK5d1e7zT1GoTM6vOWn2gvvweElv0t ZMkqh X-Google-Smtp-Source: AGHT+IETTsLAU/T3FxK/iu6nkSaTf4/mfhGOngGjx2iwHULA8fqtd81EGUtdz4nrynxbbTBJoLewBw== X-Received: by 2002:a19:e046:0:b0:513:d1c7:7d37 with SMTP id g6-20020a19e046000000b00513d1c77d37mr4422125lfj.51.1711378974633; Mon, 25 Mar 2024 08:02:54 -0700 (PDT) Received: from localhost (host-114-191.parnet.fi. [77.234.114.191]) by smtp.gmail.com with ESMTPSA id c8-20020a056512238800b00515a71d887esm815827lfv.306.2024.03.25.08.02.54 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2024 08:02:54 -0700 (PDT) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Mar 2024 17:02:35 +0200 Message-Id: <20240325150243.59058-14-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240325150243.59058-1-martin@martin.st> References: <20240325150243.59058-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/21] aarch64: hevc: Produce epel_bi_hv functions for both neon and i8mm 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: Logan Lyu , "J . Dekker" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: In addition to just templating, this contains one change to ff_hevc_put_hevc_epel_bi_hv32_8, by setting the w6 register which ff_hevc_put_hevc_epel_h32_8_neon requires. AWS Graviton 3: put_hevc_epel_bi_hv4_8_c: 176.5 put_hevc_epel_bi_hv4_8_neon: 62.0 put_hevc_epel_bi_hv4_8_i8mm: 58.0 put_hevc_epel_bi_hv6_8_c: 343.7 put_hevc_epel_bi_hv6_8_neon: 109.7 put_hevc_epel_bi_hv6_8_i8mm: 105.7 put_hevc_epel_bi_hv8_8_c: 536.0 put_hevc_epel_bi_hv8_8_neon: 112.7 put_hevc_epel_bi_hv8_8_i8mm: 111.7 put_hevc_epel_bi_hv12_8_c: 1107.7 put_hevc_epel_bi_hv12_8_neon: 254.7 put_hevc_epel_bi_hv12_8_i8mm: 239.0 put_hevc_epel_bi_hv16_8_c: 1927.7 put_hevc_epel_bi_hv16_8_neon: 356.2 put_hevc_epel_bi_hv16_8_i8mm: 334.2 put_hevc_epel_bi_hv24_8_c: 4195.2 put_hevc_epel_bi_hv24_8_neon: 736.7 put_hevc_epel_bi_hv24_8_i8mm: 715.5 put_hevc_epel_bi_hv32_8_c: 7280.5 put_hevc_epel_bi_hv32_8_neon: 1287.7 put_hevc_epel_bi_hv32_8_i8mm: 1162.2 put_hevc_epel_bi_hv48_8_c: 16857.7 put_hevc_epel_bi_hv48_8_neon: 2836.2 put_hevc_epel_bi_hv48_8_i8mm: 2908.5 put_hevc_epel_bi_hv64_8_c: 29248.2 put_hevc_epel_bi_hv64_8_neon: 5051.7 put_hevc_epel_bi_hv64_8_i8mm: 4491.5 --- libavcodec/aarch64/hevcdsp_epel_neon.S | 62 +++++++++++------------ libavcodec/aarch64/hevcdsp_init_aarch64.c | 5 ++ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/libavcodec/aarch64/hevcdsp_epel_neon.S b/libavcodec/aarch64/hevcdsp_epel_neon.S index d0c6205e1c..cb17758a72 100644 --- a/libavcodec/aarch64/hevcdsp_epel_neon.S +++ b/libavcodec/aarch64/hevcdsp_epel_neon.S @@ -3792,14 +3792,6 @@ endfunc epel_uni_w_hv neon -#if HAVE_I8MM -ENABLE_I8MM - -epel_uni_w_hv neon_i8mm - -DISABLE_I8MM -#endif - function hevc_put_hevc_epel_bi_hv4_8_end_neon load_epel_filterh x7, x6 mov x10, #(MAX_PB_SIZE * 2) @@ -3978,10 +3970,8 @@ function hevc_put_hevc_epel_bi_hv32_8_end_neon ret endfunc -#if HAVE_I8MM -ENABLE_I8MM - -function ff_hevc_put_hevc_epel_bi_hv4_8_neon_i8mm, export=1 +.macro epel_bi_hv suffix +function ff_hevc_put_hevc_epel_bi_hv4_8_\suffix, export=1 add w10, w5, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -3994,14 +3984,14 @@ function ff_hevc_put_hevc_epel_bi_hv4_8_neon_i8mm, export=1 add w3, w5, #3 mov x4, x6 mov x5, x7 - bl X(ff_hevc_put_hevc_epel_h4_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h4_8_\suffix) ldp x4, x5, [sp, #16] ldp x0, x1, [sp, #32] ldp x7, x30, [sp], #48 b hevc_put_hevc_epel_bi_hv4_8_end_neon endfunc -function ff_hevc_put_hevc_epel_bi_hv6_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_bi_hv6_8_\suffix, export=1 add w10, w5, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -4014,14 +4004,14 @@ function ff_hevc_put_hevc_epel_bi_hv6_8_neon_i8mm, export=1 add w3, w5, #3 mov x4, x6 mov x5, x7 - bl X(ff_hevc_put_hevc_epel_h6_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h6_8_\suffix) ldp x4, x5, [sp, #16] ldp x0, x1, [sp, #32] ldp x7, x30, [sp], #48 b hevc_put_hevc_epel_bi_hv6_8_end_neon endfunc -function ff_hevc_put_hevc_epel_bi_hv8_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_bi_hv8_8_\suffix, export=1 add w10, w5, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -4034,14 +4024,14 @@ function ff_hevc_put_hevc_epel_bi_hv8_8_neon_i8mm, export=1 add w3, w5, #3 mov x4, x6 mov x5, x7 - bl X(ff_hevc_put_hevc_epel_h8_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h8_8_\suffix) ldp x4, x5, [sp, #16] ldp x0, x1, [sp, #32] ldp x7, x30, [sp], #48 b hevc_put_hevc_epel_bi_hv8_8_end_neon endfunc -function ff_hevc_put_hevc_epel_bi_hv12_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_bi_hv12_8_\suffix, export=1 add w10, w5, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -4054,14 +4044,14 @@ function ff_hevc_put_hevc_epel_bi_hv12_8_neon_i8mm, export=1 add w3, w5, #3 mov x4, x6 mov x5, x7 - bl X(ff_hevc_put_hevc_epel_h12_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h12_8_\suffix) ldp x4, x5, [sp, #16] ldp x0, x1, [sp, #32] ldp x7, x30, [sp], #48 b hevc_put_hevc_epel_bi_hv12_8_end_neon endfunc -function ff_hevc_put_hevc_epel_bi_hv16_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_bi_hv16_8_\suffix, export=1 add w10, w5, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -4074,14 +4064,14 @@ function ff_hevc_put_hevc_epel_bi_hv16_8_neon_i8mm, export=1 add w3, w5, #3 mov x4, x6 mov x5, x7 - bl X(ff_hevc_put_hevc_epel_h16_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h16_8_\suffix) ldp x4, x5, [sp, #16] ldp x0, x1, [sp, #32] ldp x7, x30, [sp], #48 b hevc_put_hevc_epel_bi_hv16_8_end_neon endfunc -function ff_hevc_put_hevc_epel_bi_hv24_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_bi_hv24_8_\suffix, export=1 add w10, w5, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -4094,14 +4084,14 @@ function ff_hevc_put_hevc_epel_bi_hv24_8_neon_i8mm, export=1 add w3, w5, #3 mov x4, x6 mov x5, x7 - bl X(ff_hevc_put_hevc_epel_h24_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h24_8_\suffix) ldp x4, x5, [sp, #16] ldp x0, x1, [sp, #32] ldp x7, x30, [sp], #48 b hevc_put_hevc_epel_bi_hv24_8_end_neon endfunc -function ff_hevc_put_hevc_epel_bi_hv32_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_bi_hv32_8_\suffix, export=1 str d8, [sp, #-16]! add w10, w5, #3 lsl x10, x10, #7 @@ -4115,20 +4105,21 @@ function ff_hevc_put_hevc_epel_bi_hv32_8_neon_i8mm, export=1 add w3, w5, #3 mov x4, x6 mov x5, x7 - bl X(ff_hevc_put_hevc_epel_h32_8_neon_i8mm) + mov w6, #32 + bl X(ff_hevc_put_hevc_epel_h32_8_\suffix) ldp x4, x5, [sp, #16] ldp x0, x1, [sp, #32] ldp x7, x30, [sp], #48 b hevc_put_hevc_epel_bi_hv32_8_end_neon endfunc -function ff_hevc_put_hevc_epel_bi_hv48_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_bi_hv48_8_\suffix, export=1 stp x6, x7, [sp, #-80]! stp x4, x5, [sp, #16] stp x2, x3, [sp, #32] stp x0, x1, [sp, #48] str x30, [sp, #64] - bl X(ff_hevc_put_hevc_epel_bi_hv24_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_bi_hv24_8_\suffix) ldp x4, x5, [sp, #16] ldp x2, x3, [sp, #32] ldp x0, x1, [sp, #48] @@ -4136,18 +4127,18 @@ function ff_hevc_put_hevc_epel_bi_hv48_8_neon_i8mm, export=1 add x0, x0, #24 add x2, x2, #24 add x4, x4, #48 - bl X(ff_hevc_put_hevc_epel_bi_hv24_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_bi_hv24_8_\suffix) ldr x30, [sp], #16 ret endfunc -function ff_hevc_put_hevc_epel_bi_hv64_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_bi_hv64_8_\suffix, export=1 stp x6, x7, [sp, #-80]! stp x4, x5, [sp, #16] stp x2, x3, [sp, #32] stp x0, x1, [sp, #48] str x30, [sp, #64] - bl X(ff_hevc_put_hevc_epel_bi_hv32_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_bi_hv32_8_\suffix) ldp x4, x5, [sp, #16] ldp x2, x3, [sp, #32] ldp x0, x1, [sp, #48] @@ -4155,10 +4146,19 @@ function ff_hevc_put_hevc_epel_bi_hv64_8_neon_i8mm, export=1 add x0, x0, #32 add x2, x2, #32 add x4, x4, #64 - bl X(ff_hevc_put_hevc_epel_bi_hv32_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_bi_hv32_8_\suffix) ldr x30, [sp], #16 ret endfunc +.endm + +epel_bi_hv neon + +#if HAVE_I8MM +ENABLE_I8MM + +epel_uni_w_hv neon_i8mm +epel_bi_hv neon_i8mm DISABLE_I8MM #endif diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index 948103aa09..6110a360d8 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -188,6 +188,10 @@ NEON8_FNPROTO(epel_bi_v, (uint8_t *dst, ptrdiff_t dststride, const uint8_t *src, ptrdiff_t srcstride, const int16_t *src2, int height, intptr_t mx, intptr_t my, int width),); +NEON8_FNPROTO(epel_bi_hv, (uint8_t *dst, ptrdiff_t dststride, + const uint8_t *src, ptrdiff_t srcstride, const int16_t *src2, + int height, intptr_t mx, intptr_t my, int width),); + NEON8_FNPROTO(epel_bi_hv, (uint8_t *dst, ptrdiff_t dststride, const uint8_t *src, ptrdiff_t srcstride, const int16_t *src2, int height, intptr_t mx, intptr_t my, int width), _i8mm); @@ -423,6 +427,7 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) NEON8_FNASSIGN(c->put_hevc_epel, 1, 1, epel_hv,); NEON8_FNASSIGN(c->put_hevc_epel_uni, 1, 1, epel_uni_hv,); NEON8_FNASSIGN(c->put_hevc_epel_uni_w, 1, 1, epel_uni_w_hv,); + NEON8_FNASSIGN(c->put_hevc_epel_bi, 1, 1, epel_bi_hv,); if (have_i8mm(cpu_flags)) { NEON8_FNASSIGN(c->put_hevc_epel, 0, 1, epel_h, _i8mm); -- 2.39.3 (Apple Git-146) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".