From patchwork Mon Nov 21 12:44:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 39376 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2163377pzb; Mon, 21 Nov 2022 04:47:17 -0800 (PST) X-Google-Smtp-Source: AA0mqf4ctIQKIgPY5upCtnjmUnKEtP27IC0OdOhTBEdm+NwPW5bHxrAhuI5NFMuKYIfuv5A8kfvp X-Received: by 2002:a17:906:560e:b0:7a2:335e:90e2 with SMTP id f14-20020a170906560e00b007a2335e90e2mr15100123ejq.712.1669034836889; Mon, 21 Nov 2022 04:47:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669034836; cv=none; d=google.com; s=arc-20160816; b=zXyvt8VNiZhfA/UAyMvvdxX9DX4hI85T4TsMq6JN1j11ocg6isB11moH7KMzx0Wr2l 1qQJuLANIFIvu5bzueKg5Ci37v8+oL4GjKGOLdXETAOvCsS6UeUBESSuIaanQEH4ULXk lRSr92d3CyBzDTbitPLA/fUZDIK9PV+44R8LusQvCw/zBxv7/1tpBatsYQWFH407LmDc 1jTAJAbYM28A7AzA4L/nPkaRvmX/PT3HaMYITMMgDN9d9bSPhsPNpNtFR2ZuNqqJgaY5 o4jHm67bNpiLJFE1yohcDzJy8jfdMwUv01rp++RgE8cL6+vK2IgaeMGhVnuiSgYpWCxB e9Sw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Zlc9YL/PO/ApjExSCN8d0mF2jw6uCFR8ttEGLl9GcgU=; b=HT7eRqpaDWWFEPxfrLPsQr0FEcwZV+y2UKcpArfw6H5/wMLCzX4m1bWH7QcCKVDjJs ed1+u3vuBOdt4d1vA3kbNLcwnLHaD+mGs+yf7kLYyhQdfQCp7aZqlRkXS2vfhxi1lX5M Wf66i7Y9mYRBVvbUQaaKiCYuK7EO5bODJYAlYvlDarcWB2l4JCRprQfiDGnIo9n8czKv qCT+LSPQyxqSZN/PBe3dII73k0k3SWrinxZbBZm19u+HM5I1E0n1w5+NW97OnyOYzCfm jZATdH/dT8hnKqgP/OyiBYay7LVkCvf2GWo3hr1Df5WAmVC0kC+7v7SsvUGNCFr+oOzb VhcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@obe-tv.20210112.gappssmtp.com header.s=20210112 header.b=JJ3GDTZ+; 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 d7-20020a056402516700b0046844a19058si8403450ede.288.2022.11.21.04.47.14; Mon, 21 Nov 2022 04:47:16 -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=@obe-tv.20210112.gappssmtp.com header.s=20210112 header.b=JJ3GDTZ+; 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 11CD268BD2B; Mon, 21 Nov 2022 14:46:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7B5468BBE9 for ; Mon, 21 Nov 2022 14:46:46 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id s5so2483348wru.1 for ; Mon, 21 Nov 2022 04:46:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=obe-tv.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qQMXRztU5KymF01a9CI7+oX6XLN2nPddYv+8cc7Id9A=; b=JJ3GDTZ+ETpX/8juaMuGrQ3ByNJS25DRWoy13P3DA8zdwQ4RVr9Hhwx6G1pj8UUbEc VPOekMeTeTAGc321FHp9TtzDHDjTq4fX5W3xVMPOMXvaU93/A96uGXtpIeOMiYikZP1G ueE+RVCXj5lPhRjH9rvt0748v1ZfFQP/gRAaU/ekCk6Ai8zSbm8r8hCn8r6m41O95srq VkYft5K6OATbM599ZvZqXRfthaZbbonP1DUqSB9OFD/RoWYZCoxxOP5z5k/AulM/IhbP Nlii3Dp/bXTIZt/MJqM61GyBNHyEX968EjFeDp/G82Wnx17IGXyQuugBY1MHbLpaaoDy NJRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qQMXRztU5KymF01a9CI7+oX6XLN2nPddYv+8cc7Id9A=; b=O2usFWogjkjwwKs7EEBX6so0tSOu43HXExvJS52wAs/s2rPqor6zMgI/rYsvlFC4f3 RvyqrF8Oy2/Xr1/IMkwNsk232cj2FRJIGISptkM7PO72x/e36DivHoQHqPDAYZ3/WdTV 9geCjUz2z2bGNDTti5TyZbxiwowtl462eNOoRFGAiP2jRB1BYWXM9R5TBlNOuXYQGbCi LBJOQRHsgRMXO6JUTKxqQRU1lHdL01Zmfah9Cvet+DjHzS37+PiGvbvmVnvIw88DXcBj mu+o2t4b1Y/7B/OR65Ded3+FTXZphM3zz6lpItXOsqi+70osLaGRVnK13OaBUCVxVnOR VnHA== X-Gm-Message-State: ANoB5plWx0mBOUZWpA1Vw+dH/HjMSNoSDdgyPIcf654waCvHONDwOWsd yTU50mN6BQjX19vE6A1SXa+OZa1//yNukg== X-Received: by 2002:adf:eb05:0:b0:225:8c57:88d0 with SMTP id s5-20020adfeb05000000b002258c5788d0mr10982251wrn.625.1669034806097; Mon, 21 Nov 2022 04:46:46 -0800 (PST) Received: from Dana.systemlords.lan (d51A44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id v10-20020adfe28a000000b0023647841c5bsm11384358wri.60.2022.11.21.04.46.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Nov 2022 04:46:45 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Nov 2022 13:44:08 +0100 Message-Id: <20221121124408.1577897-3-jdarnley@obe.tv> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221121124408.1577897-1-jdarnley@obe.tv> References: <20221121124408.1577897-1-jdarnley@obe.tv> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/v210enc: add new 10-bit function for avx512 avx512icl 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: a53XBdsACzP+ avx512 on Skylake-X (Xeon D-2123IT): 1.19x faster (970±91.2 vs. 817±104.4 decicycles) compared with avx2 avx512icl on Ice Lake (Xeon Silver 4316): 2.52x faster (1350±5.3 vs. 535±9.5 decicycles) compared with avx2 --- libavcodec/x86/v210enc.asm | 99 +++++++++++++++++++++++++++++++++++ libavcodec/x86/v210enc_init.c | 12 +++++ 2 files changed, 111 insertions(+) diff --git a/libavcodec/x86/v210enc.asm b/libavcodec/x86/v210enc.asm index c2ad3d72c0..9cee954619 100644 --- a/libavcodec/x86/v210enc.asm +++ b/libavcodec/x86/v210enc.asm @@ -56,6 +56,36 @@ v210enc_8_permd: dd 0,1,4,5, 1,2,5,6 v210enc_8_mult: db 4, 0, 64, 0 v210enc_8_mask: dd 255<<12 +icl_perm_y: ; vpermb does not set bytes to zero when the high bit is set unlike pshufb +%assign i 0 +%rep 8 + db -1,i+0,i+1,-1 , i+2,i+3,i+4,i+5 + %assign i i+6 +%endrep + +icl_perm_uv: ; vpermb does not set bytes to zero when the high bit is set unlike pshufb +%assign i 0 +%rep 4 + db i+0,i+1,i+32,i+33 , -1,i+2,i+3,-1 , i+34,i+35,i+4,i+5 , -1,i+36,i+37,-1 + %assign i i+6 +%endrep + +icl_perm_y_kmask: times 8 db 0b1111_0110 +icl_perm_uv_kmask: times 8 db 0b0110_1111 + +icl_shift_y: times 10 dw 2,0,4 + times 4 db 0 ; padding to 64 bytes +icl_shift_uv: times 5 dw 0,2,4 + times 2 db 0 ; padding to 32 bytes + times 5 dw 4,0,2 + times 2 db 0 ; padding to 32 bytes + +v210enc_10_permd_y: dd 0,1,2,-1 , 3,4,5,-1 +v210enc_10_shufb_y: db -1,0,1,-1 , 2,3,4,5 , -1,6,7,-1 , 8,9,10,11 +v210enc_10_permd_uv: dd 0,1,4,5 , 1,2,5,6 +v210enc_10_shufb_uv: db 0,1, 8, 9 , -1,2,3,-1 , 10,11,4,5 , -1,12,13,-1 + db 2,3,10,11 , -1,4,5,-1 , 12,13,6,7 , -1,14,15,-1 + SECTION .text %macro v210_planar_pack_10 0 @@ -113,6 +143,75 @@ INIT_YMM avx2 v210_planar_pack_10 %endif +%macro v210_planar_pack_10_new 0 + +cglobal v210_planar_pack_10, 5, 5, 8+2*notcpuflag(avx512icl), y, u, v, dst, width + lea yq, [yq+2*widthq] + add uq, widthq + add vq, widthq + neg widthq + + %if cpuflag(avx512icl) + movu m6, [icl_perm_y] + movu m7, [icl_perm_uv] + kmovq k1, [icl_perm_y_kmask] + kmovq k2, [icl_perm_uv_kmask] + %else + movu m6, [v210enc_10_permd_y] + VBROADCASTI128 m7, [v210enc_10_shufb_y] + movu m8, [v210enc_10_permd_uv] + movu m9, [v210enc_10_shufb_uv] + %endif + movu m2, [icl_shift_y] + movu m3, [icl_shift_uv] + VBROADCASTI128 m4, [v210_enc_min_10] ; only ymm sized + VBROADCASTI128 m5, [v210_enc_max_10] ; only ymm sized + + .loop: + movu m0, [yq + widthq*2] + %if cpuflag(avx512icl) + movu ym1, [uq + widthq*1] + vinserti32x8 zm1, [vq + widthq*1], 1 + %else + movu xm1, [uq + widthq*1] + vinserti128 ym1, [vq + widthq*1], 1 + %endif + CLIPW m0, m4, m5 + CLIPW m1, m4, m5 + + vpsllvw m0, m2 + vpsllvw m1, m3 + %if cpuflag(avx512icl) + vpermb m0{k1}{z}, m6, m0 + vpermb m1{k2}{z}, m7, m1 + %else + vpermd m0, m6, m0 + pshufb m0, m7 + vpermd m1, m8, m1 + pshufb m1, m9 + %endif + por m0, m1 + + movu [dstq], m0 + add dstq, mmsize + add widthq, (mmsize*3)/8 + jl .loop +RET + +%endmacro + +%if ARCH_X86_64 +%if HAVE_AVX512_EXTERNAL +INIT_YMM avx512 +v210_planar_pack_10_new +%endif +%endif + +%if HAVE_AVX512ICL_EXTERNAL +INIT_ZMM avx512icl +v210_planar_pack_10_new +%endif + %macro v210_planar_pack_8 0 ; v210_planar_pack_8(const uint8_t *y, const uint8_t *u, const uint8_t *v, uint8_t *dst, ptrdiff_t width) diff --git a/libavcodec/x86/v210enc_init.c b/libavcodec/x86/v210enc_init.c index 6e9f8c6e61..5d1ebcb893 100644 --- a/libavcodec/x86/v210enc_init.c +++ b/libavcodec/x86/v210enc_init.c @@ -37,6 +37,12 @@ void ff_v210_planar_pack_10_ssse3(const uint16_t *y, const uint16_t *u, void ff_v210_planar_pack_10_avx2(const uint16_t *y, const uint16_t *u, const uint16_t *v, uint8_t *dst, ptrdiff_t width); +void ff_v210_planar_pack_10_avx512(const uint16_t *y, const uint16_t *u, + const uint16_t *v, uint8_t *dst, + ptrdiff_t width); +void ff_v210_planar_pack_10_avx512icl(const uint16_t *y, const uint16_t *u, + const uint16_t *v, uint8_t *dst, + ptrdiff_t width); av_cold void ff_v210enc_init_x86(V210EncContext *s) { @@ -60,10 +66,16 @@ av_cold void ff_v210enc_init_x86(V210EncContext *s) if (EXTERNAL_AVX512(cpu_flags)) { s->sample_factor_8 = 2; s->pack_line_8 = ff_v210_planar_pack_8_avx512; +#ifdef ARCH_X86_64 + s->sample_factor_10 = 2; + s->pack_line_10 = ff_v210_planar_pack_10_avx512; +#endif } if (EXTERNAL_AVX512ICL(cpu_flags)) { s->sample_factor_8 = 4; s->pack_line_8 = ff_v210_planar_pack_8_avx512icl; + s->sample_factor_10 = 4; + s->pack_line_10 = ff_v210_planar_pack_10_avx512icl; } }