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 B50784A216 for ; Mon, 25 Mar 2024 15:04:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5BD668D5DE; Mon, 25 Mar 2024 17:03:01 +0200 (EET) 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 D5C7168D502 for ; Mon, 25 Mar 2024 17:02:53 +0200 (EET) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-513ccc70a6dso7617261e87.1 for ; Mon, 25 Mar 2024 08:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1711378973; x=1711983773; 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=R690unAoAk+klKzyMm3DUxBFdVIUouznRkXbDoqLnxo=; b=wbCSN3mfvo1JEhpyD262lev8YxvGdzA1N+aDzw7hf0/2JnHzTU1Xt3isYLmtrhoBix FWKkNh522hSQLC4PJO+t/2olufiSv/VG/QvKL3frzskdPuWI7BcMz+fxyCml3aA1h8SY QDw3luO8VOGaVZVFGMyE7PvlUktuU/MRMNJ4iku19+8t/21Y97eDkk47zNIX1POUEG5m wArjnxkD3gn+aF9jtOFTO8ZWuXe9wVaMcolUuXmyaKaVkLpR+bbJb5Hs2spWHbPbZQTa qP/GxDs2332WpKj/Rk0h8qm/Ivj/N/xUmhQRRuUBaMqf1+wUSlxJ2dD3nKqBvOYI3guZ XTyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711378973; x=1711983773; 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=R690unAoAk+klKzyMm3DUxBFdVIUouznRkXbDoqLnxo=; b=BlTVBSWd7Ej2sDyC0jTNE61/KiDv6Q3Kd3xiQN6iuPMb1+weAQREUzwzpsuDSFZfnF DgtSKo6Y96RWFElJGQd4PmjumxGGabZF0vVOwf1ZR54hDiqIhLwhzvjLtt9N7fbCWnfj +NrvVetU/KmVTpLpNF9GzLnEVE4HOtCJC9epeZ5FfCvu34KWB3OHUVD7KS/vMKGH/M2e V9j1UnzBQ00IPPgMAiCVTVby53H+MuS2SGl+AC7gPGdh9jG3S+ccZ7AJ6TmwdCo+EKWq xTt0H/Ve8hNA8MHCm7fwMYlsf6x6G3pG6pu6i/SNYnOh3AIBMIahkqQaMGBL26beJh3B gaSg== X-Gm-Message-State: AOJu0YxO0bhIvWsYjLHtBa7beSJKqL4Opg3l51vPcb2qD3RMFQEEuDgR QBunXTENYzIqX8ww7VINkBTnO+LSx5CYETelx3VlfgdXg9yzNPiVnogjLnT8/qj3PGveVEeluvs 0RIdr X-Google-Smtp-Source: AGHT+IFAaAwksz0Fx7DpwHtPtW3rpOQ8X97FUs1n+ceSmKOGwjtxUlpQPYxaQp0CFItagavh38eKHg== X-Received: by 2002:a05:6512:545:b0:513:cc18:d4c6 with SMTP id h5-20020a056512054500b00513cc18d4c6mr6781919lfl.41.1711378973089; Mon, 25 Mar 2024 08:02:53 -0700 (PDT) Received: from localhost (host-114-191.parnet.fi. [77.234.114.191]) by smtp.gmail.com with ESMTPSA id o22-20020a056512231600b00513ea009dfesm1095479lfu.168.2024.03.25.08.02.52 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2024 08:02:52 -0700 (PDT) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Mar 2024 17:02:33 +0200 Message-Id: <20240325150243.59058-12-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 11/21] aarch64: hevc: Produce epel_uni_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: AWS Graviton 3: put_hevc_epel_uni_hv4_8_c: 163.5 put_hevc_epel_uni_hv4_8_neon: 59.7 put_hevc_epel_uni_hv4_8_i8mm: 57.5 put_hevc_epel_uni_hv6_8_c: 344.7 put_hevc_epel_uni_hv6_8_neon: 105.0 put_hevc_epel_uni_hv6_8_i8mm: 102.7 put_hevc_epel_uni_hv8_8_c: 552.2 put_hevc_epel_uni_hv8_8_neon: 111.2 put_hevc_epel_uni_hv8_8_i8mm: 104.0 put_hevc_epel_uni_hv12_8_c: 1195.0 put_hevc_epel_uni_hv12_8_neon: 248.7 put_hevc_epel_uni_hv12_8_i8mm: 229.5 put_hevc_epel_uni_hv16_8_c: 1910.2 put_hevc_epel_uni_hv16_8_neon: 339.5 put_hevc_epel_uni_hv16_8_i8mm: 323.2 put_hevc_epel_uni_hv24_8_c: 4048.2 put_hevc_epel_uni_hv24_8_neon: 737.7 put_hevc_epel_uni_hv24_8_i8mm: 713.7 put_hevc_epel_uni_hv32_8_c: 6865.7 put_hevc_epel_uni_hv32_8_neon: 1285.0 put_hevc_epel_uni_hv32_8_i8mm: 1206.0 put_hevc_epel_uni_hv48_8_c: 15830.5 put_hevc_epel_uni_hv48_8_neon: 2844.7 put_hevc_epel_uni_hv48_8_i8mm: 2914.0 put_hevc_epel_uni_hv64_8_c: 27912.7 put_hevc_epel_uni_hv64_8_neon: 4970.5 put_hevc_epel_uni_hv64_8_i8mm: 4653.7 --- libavcodec/aarch64/hevcdsp_epel_neon.S | 67 +++++++++++------------ libavcodec/aarch64/hevcdsp_init_aarch64.c | 5 ++ 2 files changed, 38 insertions(+), 34 deletions(-) diff --git a/libavcodec/aarch64/hevcdsp_epel_neon.S b/libavcodec/aarch64/hevcdsp_epel_neon.S index 024464723b..876db9d449 100644 --- a/libavcodec/aarch64/hevcdsp_epel_neon.S +++ b/libavcodec/aarch64/hevcdsp_epel_neon.S @@ -2460,14 +2460,6 @@ endfunc epel_hv neon -#if HAVE_I8MM -ENABLE_I8MM - -epel_hv neon_i8mm - -DISABLE_I8MM -#endif - function hevc_put_hevc_epel_uni_hv4_8_end_neon load_epel_filterh x6, x5 mov x10, #(MAX_PB_SIZE * 2) @@ -2596,10 +2588,8 @@ function hevc_put_hevc_epel_uni_hv24_8_end_neon 2: ret endfunc -#if HAVE_I8MM -ENABLE_I8MM - -function ff_hevc_put_hevc_epel_uni_hv4_8_neon_i8mm, export=1 +.macro epel_uni_hv suffix +function ff_hevc_put_hevc_epel_uni_hv4_8_\suffix, export=1 add w10, w4, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -2611,14 +2601,14 @@ function ff_hevc_put_hevc_epel_uni_hv4_8_neon_i8mm, export=1 mov x2, x3 add w3, w4, #3 mov x4, x5 - bl X(ff_hevc_put_hevc_epel_h4_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h4_8_\suffix) ldp x4, x6, [sp, #16] ldp x0, x1, [sp, #32] ldr x30, [sp], #48 b hevc_put_hevc_epel_uni_hv4_8_end_neon endfunc -function ff_hevc_put_hevc_epel_uni_hv6_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_uni_hv6_8_\suffix, export=1 add w10, w4, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -2630,14 +2620,14 @@ function ff_hevc_put_hevc_epel_uni_hv6_8_neon_i8mm, export=1 mov x2, x3 add w3, w4, #3 mov x4, x5 - bl X(ff_hevc_put_hevc_epel_h6_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h6_8_\suffix) ldp x4, x6, [sp, #16] ldp x0, x1, [sp, #32] ldr x30, [sp], #48 b hevc_put_hevc_epel_uni_hv6_8_end_neon endfunc -function ff_hevc_put_hevc_epel_uni_hv8_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_uni_hv8_8_\suffix, export=1 add w10, w4, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -2649,14 +2639,14 @@ function ff_hevc_put_hevc_epel_uni_hv8_8_neon_i8mm, export=1 mov x2, x3 add w3, w4, #3 mov x4, x5 - bl X(ff_hevc_put_hevc_epel_h8_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h8_8_\suffix) ldp x4, x6, [sp, #16] ldp x0, x1, [sp, #32] ldr x30, [sp], #48 b hevc_put_hevc_epel_uni_hv8_8_end_neon endfunc -function ff_hevc_put_hevc_epel_uni_hv12_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_uni_hv12_8_\suffix, export=1 add w10, w4, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -2668,14 +2658,14 @@ function ff_hevc_put_hevc_epel_uni_hv12_8_neon_i8mm, export=1 mov x2, x3 add w3, w4, #3 mov x4, x5 - bl X(ff_hevc_put_hevc_epel_h12_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h12_8_\suffix) ldp x4, x6, [sp, #16] ldp x0, x1, [sp, #32] ldr x30, [sp], #48 b hevc_put_hevc_epel_uni_hv12_8_end_neon endfunc -function ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_uni_hv16_8_\suffix, export=1 add w10, w4, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -2687,14 +2677,14 @@ function ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm, export=1 mov x2, x3 add w3, w4, #3 mov x4, x5 - bl X(ff_hevc_put_hevc_epel_h16_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h16_8_\suffix) ldp x4, x6, [sp, #16] ldp x0, x1, [sp, #32] ldr x30, [sp], #48 b hevc_put_hevc_epel_uni_hv16_8_end_neon endfunc -function ff_hevc_put_hevc_epel_uni_hv24_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_uni_hv24_8_\suffix, export=1 add w10, w4, #3 lsl x10, x10, #7 sub sp, sp, x10 // tmp_array @@ -2706,20 +2696,20 @@ function ff_hevc_put_hevc_epel_uni_hv24_8_neon_i8mm, export=1 mov x2, x3 add w3, w4, #3 mov x4, x5 - bl X(ff_hevc_put_hevc_epel_h24_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_h24_8_\suffix) ldp x4, x6, [sp, #16] ldp x0, x1, [sp, #32] ldr x30, [sp], #48 b hevc_put_hevc_epel_uni_hv24_8_end_neon endfunc -function ff_hevc_put_hevc_epel_uni_hv32_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_uni_hv32_8_\suffix, export=1 stp x5, x6, [sp, #-64]! stp x3, x4, [sp, #16] stp x1, x2, [sp, #32] stp x0, x30, [sp, #48] mov x7, #16 - bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix) ldp x5, x6, [sp] ldp x3, x4, [sp, #16] ldp x1, x2, [sp, #32] @@ -2727,19 +2717,19 @@ function ff_hevc_put_hevc_epel_uni_hv32_8_neon_i8mm, export=1 add x0, x0, #16 add x2, x2, #16 mov x7, #16 - bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix) ldr x30, [sp, #56] add sp, sp, #64 ret endfunc -function ff_hevc_put_hevc_epel_uni_hv48_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_uni_hv48_8_\suffix, export=1 stp x5, x6, [sp, #-64]! stp x3, x4, [sp, #16] stp x1, x2, [sp, #32] stp x0, x30, [sp, #48] mov x7, #24 - bl X(ff_hevc_put_hevc_epel_uni_hv24_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_uni_hv24_8_\suffix) ldp x5, x6, [sp] ldp x3, x4, [sp, #16] ldp x1, x2, [sp, #32] @@ -2747,19 +2737,19 @@ function ff_hevc_put_hevc_epel_uni_hv48_8_neon_i8mm, export=1 add x0, x0, #24 add x2, x2, #24 mov x7, #24 - bl X(ff_hevc_put_hevc_epel_uni_hv24_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_uni_hv24_8_\suffix) ldr x30, [sp, #56] add sp, sp, #64 ret endfunc -function ff_hevc_put_hevc_epel_uni_hv64_8_neon_i8mm, export=1 +function ff_hevc_put_hevc_epel_uni_hv64_8_\suffix, export=1 stp x5, x6, [sp, #-64]! stp x3, x4, [sp, #16] stp x1, x2, [sp, #32] stp x0, x30, [sp, #48] mov x7, #16 - bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix) ldp x5, x6, [sp] ldp x3, x4, [sp, #16] ldp x1, x2, [sp, #32] @@ -2767,7 +2757,7 @@ function ff_hevc_put_hevc_epel_uni_hv64_8_neon_i8mm, export=1 add x0, x0, #16 add x2, x2, #16 mov x7, #16 - bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix) ldp x5, x6, [sp] ldp x3, x4, [sp, #16] ldp x1, x2, [sp, #32] @@ -2775,7 +2765,7 @@ function ff_hevc_put_hevc_epel_uni_hv64_8_neon_i8mm, export=1 add x0, x0, #32 add x2, x2, #32 mov x7, #16 - bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix) ldp x5, x6, [sp] ldp x3, x4, [sp, #16] ldp x1, x2, [sp, #32] @@ -2783,12 +2773,21 @@ function ff_hevc_put_hevc_epel_uni_hv64_8_neon_i8mm, export=1 add x0, x0, #48 add x2, x2, #48 mov x7, #16 - bl X(ff_hevc_put_hevc_epel_uni_hv16_8_neon_i8mm) + bl X(ff_hevc_put_hevc_epel_uni_hv16_8_\suffix) ldr x30, [sp, #56] add sp, sp, #64 ret endfunc +.endm + +epel_uni_hv neon + +#if HAVE_I8MM +ENABLE_I8MM + +epel_hv neon_i8mm +epel_uni_hv neon_i8mm function ff_hevc_put_hevc_epel_uni_w_h4_8_neon_i8mm, export=1 EPEL_UNI_W_H_HEADER diff --git a/libavcodec/aarch64/hevcdsp_init_aarch64.c b/libavcodec/aarch64/hevcdsp_init_aarch64.c index 87e321da71..447ae80bfb 100644 --- a/libavcodec/aarch64/hevcdsp_init_aarch64.c +++ b/libavcodec/aarch64/hevcdsp_init_aarch64.c @@ -209,6 +209,10 @@ NEON8_FNPROTO(epel_uni_v, (uint8_t *dst, ptrdiff_t dststride, const uint8_t *src, ptrdiff_t srcstride, int height, intptr_t mx, intptr_t my, int width),); +NEON8_FNPROTO(epel_uni_hv, (uint8_t *dst, ptrdiff_t _dststride, + const uint8_t *src, ptrdiff_t srcstride, + int height, intptr_t mx, intptr_t my, int width),); + NEON8_FNPROTO(epel_uni_hv, (uint8_t *dst, ptrdiff_t _dststride, const uint8_t *src, ptrdiff_t srcstride, int height, intptr_t mx, intptr_t my, int width), _i8mm); @@ -412,6 +416,7 @@ av_cold void ff_hevc_dsp_init_aarch64(HEVCDSPContext *c, const int bit_depth) NEON8_FNASSIGN_SHARED_32(c->put_hevc_epel_uni_w, 0, 1, epel_uni_w_h,); NEON8_FNASSIGN(c->put_hevc_epel, 1, 1, epel_hv,); + NEON8_FNASSIGN(c->put_hevc_epel_uni, 1, 1, epel_uni_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".