From patchwork Fri Jul 14 10:08:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Kelly X-Patchwork-Id: 42670 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp3549950pzb; Fri, 14 Jul 2023 03:08:51 -0700 (PDT) X-Google-Smtp-Source: APBJJlEE7iCYl0YldgTxlWgOMxg3WKwY6u9q3oFKzL6H6G9j5GQVGpc0+3m4LOLHtw13veKMVbyB X-Received: by 2002:aa7:c14e:0:b0:51d:a4b1:d430 with SMTP id r14-20020aa7c14e000000b0051da4b1d430mr4172573edp.3.1689329330961; Fri, 14 Jul 2023 03:08:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689329330; cv=none; d=google.com; s=arc-20160816; b=dzIYzdrfuVH6Q68/JIiJumoL3Svi1yBiogQL4J99zUftKGHgG2i/ASw0Ry1er4aknA 5ekOcmgi/Llr6ny3rUdh4Bq2gjGgze+lskrX3NrdDvVqjXUAt01KddlA2+i8HN8cc0rS xIVBxVQb6/Z7wQtaRxvQGS2S7xlIpT/7zpOwDWRqudttsoaPyY42s62Hm97oU/DbPK+H +zokGAXtqnLhFmNX3nZj2CPRtXW1dDLROVK1a8DSs+oe4iSC41lIG3nUCqfsjWhZ7TWg vDzV39BNHchRdHobOB7cPI7fihV2WEJXA4Y0VKAtDDEPqLc8Ot8F73L9x7Mau3wSocSy 9gBQ== 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:to:from:message-id:mime-version:date :dkim-signature:delivered-to; bh=BYweeqGWnEKt/atsT4uHqe+cBHpTHbQYtAaKYCyC3Uk=; fh=/dichZGS11g2zj1pQZN5I1lofI3DSP0AKY/Bo6XKkZk=; b=adCdxmsPQeLtshdFsjr0FuxIfeFTJqt/1fydyd6TMuDhuVVfmV+5XDNapu/Ptf/QE0 bP30e3fxWBIYhKv+0Y6w0mWAQ0PD4mMvttGdfxVYgfP99tkeBsKMYdp6v0TQarBdB7pM 0n5+fGy5Bhha8F00kjCeTnnhK94opXL5YmUUUu6t+4tx5dxbqqg7TxuAQ5yv5Sl8TYtm AAu7yMSsQxSIVavyJ2gyWSfWUI0ZTtSnj6C+5M7PkGE1hipbDN4/5EHwHke0OZ2zGV0S CqU+mNdrz7KcOH48Nk1cNoDRGtsNj4brSEdQQnbxuYjPKj1P2+lJzie0VM3cI6mVAPHO arHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20221208 header.b=xynIrao4; 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 l10-20020a056402344a00b0051ff079876fsi3183476edc.621.2023.07.14.03.08.50; Fri, 14 Jul 2023 03:08:50 -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=@google.com header.s=20221208 header.b=xynIrao4; 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 2D86068C63F; Fri, 14 Jul 2023 13:08:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f73.google.com (mail-ed1-f73.google.com [209.85.208.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22CBA68C3A3 for ; Fri, 14 Jul 2023 13:08:41 +0300 (EEST) Received: by mail-ed1-f73.google.com with SMTP id 4fb4d7f45d1cf-50bf847b267so1169775a12.3 for ; Fri, 14 Jul 2023 03:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689329320; x=1691921320; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=NI6aO9Mz5EmmiYEsYbma5t56XbRBKfNcsPBwDUBmIrI=; b=xynIrao4xVu5iTfmuThTLprCEehK+xei0wv/f084UfKsfVAr/ve9+fV5CrFRO5pVlX ilv4TEkXUkU7OoKVSjUsuMlz3tfUcu9Z7DGiMIK+YEdDrKPwy1uomVPSV/vKClpjsD4Q eUwiF4/kN9ENJG3FU5edriJzubyZ+5od9h4DMq2ZN2OBGvDxbq0t8dIVQJDkl6gR9wGI 8wkJHBHD26Uwss0U5QFcAGxshesuOIipNFTvv/PtyKcrGqpYPxllQ5wAADQR7EFNwxp7 puEvHWQKr301e/SYdWU/NnXYemotZHtldGSBYxO1z4koVl5xHR62snvcLAylLLDXkWpq xtVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689329320; x=1691921320; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=NI6aO9Mz5EmmiYEsYbma5t56XbRBKfNcsPBwDUBmIrI=; b=G6O0ATk32qillYmYohhdzSqwLyVMVtTK9yK5rtc6+mwpr8V5mFGBWk/brusAY9K4Zg B5kTu5t1ho79IDIf68rOCQ2lzT9PgeleoguFSoc/4xTXjnPnp6Stzdyg0VWwq8m6M0b/ xLZ8mdtfqioEhRYgyamttQ+j4ucXnueotUOunvPhIHIhMdpMKM2HIlgpP8B+Pmv4ZLvn pQWwBwK5bRu3ghD/HPKnAh5c++G1jPH4ZABe8xwpAt7BUsEv3rCVHyzl8VmstXKR6lVK z727UyLJ4rgmFNhhS0xg0Q5JHN+KTqEmVxWfOknTijO3D4bsZoKBkuYLZVnug0jRi+vm eK8Q== X-Gm-Message-State: ABy/qLY+SHLOw5E4SRuQQSubf6eX1rYRXBUcPs2JRqCfL3rWSzvpfBSD zsBZCWp+QZLl/Kr0JvWNSEGrm+aQBxAc0HGnyvbRDpbc+IrqM0CmFuBiouMFGKMUS3TXgYy7Tfs /Dp1fjrgfP3cARWd9unU0LzqeSXdOiV/KutH/5HdGSq1Ka1IUezbsncUnyBtSi9AS88Md8s0= X-Received: from alankelly0.zrh.corp.google.com ([2a00:79e0:9e:2:4c42:89a0:4fe0:9543]) (user=alankelly job=sendgmr) by 2002:a50:8ac3:0:b0:51e:51a6:29bc with SMTP id k3-20020a508ac3000000b0051e51a629bcmr17148edk.3.1689329320295; Fri, 14 Jul 2023 03:08:40 -0700 (PDT) Date: Fri, 14 Jul 2023 12:08:34 +0200 Mime-Version: 1.0 X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog Message-ID: <20230714100836.474580-1-alankelly@google.com> From: Alan Kelly To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/3] swscale/x86/yuv2yuvX: Add yuv2yuvX avx512 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: Alan Kelly Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 47rNSPkqsZn1 --- libswscale/x86/swscale.c | 7 +++++++ libswscale/x86/yuv2yuvX.asm | 19 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index 8c67bf4fab..52423a1199 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -225,6 +225,9 @@ YUV2YUVX_FUNC(sse3, 32, mmxext) #if HAVE_AVX2_EXTERNAL YUV2YUVX_FUNC(avx2, 64, sse3) #endif +#if ARCH_X86_64 && HAVE_AVX512_EXTERNAL +YUV2YUVX_FUNC(avx512, 128, avx2) +#endif #define SCALE_FUNC(filter_n, from_bpc, to_bpc, opt) \ void ff_hscale ## from_bpc ## to ## to_bpc ## _ ## filter_n ## _ ## opt( \ @@ -467,6 +470,10 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c) #if HAVE_AVX2_EXTERNAL if (EXTERNAL_AVX2_FAST(cpu_flags)) c->yuv2planeX = yuv2yuvX_avx2; +#endif +#if ARCH_X86_64 && HAVE_AVX512_EXTERNAL + if (EXTERNAL_AVX512(cpu_flags)) + c->yuv2planeX = yuv2yuvX_avx512; #endif } #if ARCH_X86_32 && !HAVE_ALIGNED_STACK diff --git a/libswscale/x86/yuv2yuvX.asm b/libswscale/x86/yuv2yuvX.asm index 369c850674..57bfa09d66 100644 --- a/libswscale/x86/yuv2yuvX.asm +++ b/libswscale/x86/yuv2yuvX.asm @@ -22,6 +22,10 @@ %include "libavutil/x86/x86util.asm" +SECTION_RODATA 64 + +permutation: dq 0, 2, 4, 6, 1, 3, 5, 7 + SECTION .text ;----------------------------------------------------------------------------- @@ -50,6 +54,10 @@ cglobal yuv2yuvX, 7, 7, 8, filter, filterSize, src, dest, dstW, dither, offset %else movq xm3, [ditherq] %endif ; avx2 + +%if cpuflag(avx512) + mova m15, [permutation] +%endif cmp offsetd, 0 jz .offset @@ -109,7 +117,10 @@ cglobal yuv2yuvX, 7, 7, 8, filter, filterSize, src, dest, dstW, dither, offset packuswb m6, m6, m1 %endif mov srcq, [filterq] -%if cpuflag(avx2) +%if cpuflag(avx512) + vpermt2q m3, m15, m3 + vpermt2q m6, m15, m6 +%elif cpuflag(avx2) vpermq m3, m3, 216 vpermq m6, m6, 216 %endif @@ -131,4 +142,10 @@ YUV2YUVX_FUNC %if HAVE_AVX2_EXTERNAL INIT_YMM avx2 YUV2YUVX_FUNC +%if HAVE_AVX512_EXTERNAL +%if ARCH_X86_64 +INIT_ZMM avx512 +YUV2YUVX_FUNC +%endif +%endif %endif