From patchwork Thu Sep 30 01:56:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 30671 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp177002iob; Wed, 29 Sep 2021 18:56:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdUldHrjR0xF71/O59WiXCniV6vApvdy9KffZ2+LEZKRMBfkI7Ijo4FVEJPB+mH2ztVpFA X-Received: by 2002:a17:906:a0e:: with SMTP id w14mr3735718ejf.106.1632966992508; Wed, 29 Sep 2021 18:56:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632966992; cv=none; d=google.com; s=arc-20160816; b=G8TW5OcZLj85zod0hpn9Cnhw8fejwRji8lt5R2TE7HECX2O2eNZz7awKFztr/RL4M+ eYjghUtuObSbXskShZF2yBBh3jgMHbrUvC7jQKJ3Tqh9oupXMV54xXspEIQnRKjEA5di mFyShE46BVYKIlV5cM+VX2ttUiShd8Hni/n46Cl9SUow39VhoAXWqN+1uQToSP2lDD8c /PsTWyh/ZuJhWqxSYjzYNANPBlbD6OqrPh2kcGCFV8Bxc7yC6FS90Bhjmw//49NJj94x D/BMQNPpuEBHfNzcBQo/ubodpe3DU3+bFJmH7/QY6Q+91VYYGl8JdyJf1DKFe6PeF6u2 EjYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=NKlJyhtc6JbT8SGZXIdRI4jd0GtqQgXmew3MPddO+YE=; b=vNJfHp66qt8D2a9SD2Frzk5ZdFho2T2JulZXyjVtWq5HVCVlYTAGXDFae/9LU1Mbpa swNA16a7T2r1uAV5IAq0xEGugAvebR1IVVmhfbafTVQQ3FpQ67W0TnEmwMtfCF3yPXog t59HUbZ9bAM9Kz3nOMzLI+SQzJdfxHUFFpEZ6PTrf0cGLwCfRZ696s7q55mqQ9giBi0A 1/WB67JYZLM86EPbZgHOmahAGXRf9g77TJGJCfGqY7QYhP0rZgjjTIZ0FnwlE5Ky8rs+ ZQ5A6ibSAfxjphrnJI+gFo2Z6/MQwgbwwvUCTF/8sYCAOaVvkOsd19H74slLq5g9fhve fgmQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k9si2438958eje.548.2021.09.29.18.56.31; Wed, 29 Sep 2021 18:56:32 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A70726899BB; Thu, 30 Sep 2021 04:56:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5892680152 for ; Thu, 30 Sep 2021 04:56:19 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="247614442" X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="247614442" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 18:56:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="563760880" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by fmsmga002.fm.intel.com with ESMTP; 29 Sep 2021 18:56:16 -0700 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:56:09 +0800 Message-Id: <20210930015612.29608-1-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 1/4] libswscale/x86/rgb2rgb: add shuffle_bytes avx2 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: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hJkJcgAzOH6c Performance data(Less is better): shuffle_bytes_ssse3 3.64654 shuffle_bytes_avx2 0.94288 Signed-off-by: Wu Jianhua --- libswscale/x86/rgb2rgb.c | 17 +++++++++++++++-- libswscale/x86/rgb_2_rgb.asm | 11 +++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index c38a953277..0ab139aca4 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -146,6 +146,12 @@ void ff_shuffle_bytes_3012_ssse3(const uint8_t *src, uint8_t *dst, int src_size) void ff_shuffle_bytes_3210_ssse3(const uint8_t *src, uint8_t *dst, int src_size); #if ARCH_X86_64 +void ff_shuffle_bytes_2103_avx2(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_0321_avx2(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_1230_avx2(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_3012_avx2(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_3210_avx2(const uint8_t *src, uint8_t *dst, int src_size); + void ff_uyvytoyuv422_sse2(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, int width, int height, int lumStride, int chromStride, int srcStride); @@ -186,9 +192,16 @@ av_cold void rgb2rgb_init_x86(void) shuffle_bytes_3012 = ff_shuffle_bytes_3012_ssse3; shuffle_bytes_3210 = ff_shuffle_bytes_3210_ssse3; } - if (EXTERNAL_AVX(cpu_flags)) { #if ARCH_X86_64 + if (EXTERNAL_AVX2_FAST(cpu_flags)) { + shuffle_bytes_0321 = ff_shuffle_bytes_0321_avx2; + shuffle_bytes_2103 = ff_shuffle_bytes_2103_avx2; + shuffle_bytes_1230 = ff_shuffle_bytes_1230_avx2; + shuffle_bytes_3012 = ff_shuffle_bytes_3012_avx2; + shuffle_bytes_3210 = ff_shuffle_bytes_3210_avx2; + } + if (EXTERNAL_AVX(cpu_flags)) { uyvytoyuv422 = ff_uyvytoyuv422_avx; -#endif } +#endif } diff --git a/libswscale/x86/rgb_2_rgb.asm b/libswscale/x86/rgb_2_rgb.asm index 29b856e281..c695c61d5c 100644 --- a/libswscale/x86/rgb_2_rgb.asm +++ b/libswscale/x86/rgb_2_rgb.asm @@ -159,6 +159,17 @@ SHUFFLE_BYTES 1, 2, 3, 0 SHUFFLE_BYTES 3, 0, 1, 2 SHUFFLE_BYTES 3, 2, 1, 0 +%if ARCH_X86_64 +%if HAVE_AVX2_EXTERNAL +INIT_YMM avx2 +SHUFFLE_BYTES 2, 1, 0, 3 +SHUFFLE_BYTES 0, 3, 2, 1 +SHUFFLE_BYTES 1, 2, 3, 0 +SHUFFLE_BYTES 3, 0, 1, 2 +SHUFFLE_BYTES 3, 2, 1, 0 +%endif +%endif + ;----------------------------------------------------------------------------------------------- ; uyvytoyuv422(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, ; const uint8_t *src, int width, int height, From patchwork Thu Sep 30 01:56:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 30673 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp177111iob; Wed, 29 Sep 2021 18:56:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDbXjUqOzxgb90KUy2uNMcEP+Axb/nPSQgklxrAX49cQWCeYC3tnVlvkRONaiVJC/oGimx X-Received: by 2002:a17:906:ad7:: with SMTP id z23mr3711694ejf.305.1632967002887; Wed, 29 Sep 2021 18:56:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632967002; cv=none; d=google.com; s=arc-20160816; b=AEcRq/Y81vpy9kWso2mUCPyll8JlvqIELwaXimdHFAWwu5OtnoD1pSqYbGwSmRRMAt k2lamT/ylrDqbEEpWeurYPImEEqZhdK7g8JNO2Zv4X2NQ4IJsZorXVuYVCHzuRW72gJz 6jCwY9biLpjr39JSR/P3r6YGT7CcQUcTDhWtgn7kDwEm1Roig6C1R1GElB4i4EA77WH1 f1tVZbI0SuPyz1GHbEprQD7CCx/YED2sp0CEcVQAseKEYrMs/0kyFpQGAPqsjeoUPMPq B7Ytp8NmH3HwBO8CRhJ5zA0qmlsumvJroJsnDi6ozid5bGPzf2taUC9XoPXb7rmXErQi U0Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=5LmGoIWB6ei3fRVhDYbfbPC4NjUkhm9ck+ioXBPsvrE=; b=OaVCQcj2RBqB3hWIu+lBgNWrTWOJY5BBExz107hOZ0tcX9x/PTOyVoUpXReZAs1g+0 C9PbOmwdMichkrv2ETKOGQ8COZLbCT0OzpTvl0t4DTKasT0qJNDKW6vZ1lLQSYZVEYqf GmOob1z+dIzoEB212tTR/v53WX9d/aaHhgPoWGNuHvHmaF1Dl5p0m1vPcZvJWVwCSwFt LxeNPQYlRyyLT2RAer+FKxWb7MX9GQviNtlw9iMkjV7hTc36i+Kw1KPNBThpUcNwq1xM 5Lxu87zPhJJI0YVbbjVorFWlH7p1QLwy+Ae3qwOuOGgB1P5M0vCkHgw/W2VtB8MaLCXh hW4Q== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f21si1832972ejj.11.2021.09.29.18.56.42; Wed, 29 Sep 2021 18:56:42 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AED6668A713; Thu, 30 Sep 2021 04:56:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8E12680C55 for ; Thu, 30 Sep 2021 04:56:21 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="247614445" X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="247614445" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 18:56:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="563760889" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by fmsmga002.fm.intel.com with ESMTP; 29 Sep 2021 18:56:17 -0700 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:56:10 +0800 Message-Id: <20210930015612.29608-2-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210930015612.29608-1-jianhua.wu@intel.com> References: <20210930015612.29608-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v2 2/4] libswscale/x86/rgb2rgb: add shuffle_bytes 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: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7MRTbD6k4/rF Performance data(Less is better): shuffle_bytes_avx2 0.94288 shuffle_bytes_avx512 0.60049 Signed-off-by: Wu Jianhua --- libswscale/x86/rgb2rgb.c | 13 +++++++++++++ libswscale/x86/rgb_2_rgb.asm | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 0ab139aca4..c9ff33ab77 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -152,6 +152,12 @@ void ff_shuffle_bytes_1230_avx2(const uint8_t *src, uint8_t *dst, int src_size); void ff_shuffle_bytes_3012_avx2(const uint8_t *src, uint8_t *dst, int src_size); void ff_shuffle_bytes_3210_avx2(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_2103_avx512(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_0321_avx512(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_1230_avx512(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_3012_avx512(const uint8_t *src, uint8_t *dst, int src_size); +void ff_shuffle_bytes_3210_avx512(const uint8_t *src, uint8_t *dst, int src_size); + void ff_uyvytoyuv422_sse2(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, int width, int height, int lumStride, int chromStride, int srcStride); @@ -200,6 +206,13 @@ av_cold void rgb2rgb_init_x86(void) shuffle_bytes_3012 = ff_shuffle_bytes_3012_avx2; shuffle_bytes_3210 = ff_shuffle_bytes_3210_avx2; } + if (EXTERNAL_AVX512(cpu_flags)) { + shuffle_bytes_0321 = ff_shuffle_bytes_0321_avx512; + shuffle_bytes_2103 = ff_shuffle_bytes_2103_avx512; + shuffle_bytes_1230 = ff_shuffle_bytes_1230_avx512; + shuffle_bytes_3012 = ff_shuffle_bytes_3012_avx512; + shuffle_bytes_3210 = ff_shuffle_bytes_3210_avx512; + } if (EXTERNAL_AVX(cpu_flags)) { uyvytoyuv422 = ff_uyvytoyuv422_avx; } diff --git a/libswscale/x86/rgb_2_rgb.asm b/libswscale/x86/rgb_2_rgb.asm index c695c61d5c..3380a1272c 100644 --- a/libswscale/x86/rgb_2_rgb.asm +++ b/libswscale/x86/rgb_2_rgb.asm @@ -168,6 +168,14 @@ SHUFFLE_BYTES 1, 2, 3, 0 SHUFFLE_BYTES 3, 0, 1, 2 SHUFFLE_BYTES 3, 2, 1, 0 %endif +%if HAVE_AVX512_EXTERNAL +INIT_ZMM avx512 +SHUFFLE_BYTES 2, 1, 0, 3 +SHUFFLE_BYTES 0, 3, 2, 1 +SHUFFLE_BYTES 1, 2, 3, 0 +SHUFFLE_BYTES 3, 0, 1, 2 +SHUFFLE_BYTES 3, 2, 1, 0 +%endif %endif ;----------------------------------------------------------------------------------------------- From patchwork Thu Sep 30 01:56:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 30674 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp177203iob; Wed, 29 Sep 2021 18:56:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyojGEtYvs6rHoDL/xb8q10DFYKQTX0ZmGAkAhGddKkVjKq7CXRyIJ8K80aV5N2OqHtNAue X-Received: by 2002:a17:906:12c6:: with SMTP id l6mr3619709ejb.373.1632967014539; Wed, 29 Sep 2021 18:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632967014; cv=none; d=google.com; s=arc-20160816; b=MyyAvu6u26DUJZeck+pQmOuUaZ046s06xN7t1CHfUyNozMoprEbsLdAwlzLsU/oiuc TPKvAB5UYYnBAbdsZrouE05YA8tA7al1WozrQr64zRNcUzzqSftR/06dCVsm1OrUliCu 0cX9QprEFajYeOEx6mA7d9P/Zg+RKXObA/Js/jCCsIRQtR/s1HeL8AgUY1t8kuYbs5kg GkKRcjDmLZTKnivyYn7CWkEE3VqJqf3ogbgQViNr6zk/zzza3O7PbWzRbgTyi0joyqlS 3u2dw4LCuMoNJbHFVZL5U8rJkzAkwDSkJc4wrR3N5R2p13Cl/OWKowyDClDYIviXyp4Z ayNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=xIpM+/Pod9PsR1gMxlPtCxfviR4/U+Zz7vST7SdjEHY=; b=QBlevwu8mLcILs5K4FVa1sxPdTYYlpDTD8QH5QuataCMRauA7RMK4IeXKRmb1kMGVx g/tEWSTK2rfHgg3bFlUu8hn0II2dNBMkB2j8MQ6zCD2b6InjVI1xNCc2utA3Ki7UF2Eu 7GmoF33pL6I2fSj+oXx7z59d/lCYNbEJoEwoxqFnPMZF4/OGsGDMT4GXqDN27TL6Ma+i 4zq+2BF2IoHwKTiSC69chdEoEwZfQNEtNxWfIJk1/Qpc7xB5VRwoMFf/XhQEIiv09z67 MAsGrvciN0z7jEzibNDCAdhmgJI0ayhGF4uWFJM0OAivPGc6IF5LT/2TY/L8efUSsNIZ cQsQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x88si2089038ede.207.2021.09.29.18.56.53; Wed, 29 Sep 2021 18:56:54 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE1A268A72C; Thu, 30 Sep 2021 04:56:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ECF268A703 for ; Thu, 30 Sep 2021 04:56:23 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="247614449" X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="247614449" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 18:56:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="563760900" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by fmsmga002.fm.intel.com with ESMTP; 29 Sep 2021 18:56:18 -0700 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:56:11 +0800 Message-Id: <20210930015612.29608-3-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210930015612.29608-1-jianhua.wu@intel.com> References: <20210930015612.29608-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] libswscale/x86/rgb2rgb: add uyvytoyuv422 avx2 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: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CNiwVjea5C+j With the accelerating by means of AVX2, the uyvytoyuv422 can be faster Performance data(Less is better): uyvytoyuv422_sse2 0.50388 uyvytoyuv422_avx 0.46132 uyvytoyuv422_avx2 0.27309 Signed-off-by: Wu Jianhua --- libswscale/x86/rgb2rgb.c | 6 ++++ libswscale/x86/rgb_2_rgb.asm | 60 ++++++++++++++++++++++++++++-------- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index c9ff33ab77..a965a1755c 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -164,6 +164,9 @@ void ff_uyvytoyuv422_sse2(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, void ff_uyvytoyuv422_avx(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, int width, int height, int lumStride, int chromStride, int srcStride); +void ff_uyvytoyuv422_avx2(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, + const uint8_t *src, int width, int height, + int lumStride, int chromStride, int srcStride); #endif av_cold void rgb2rgb_init_x86(void) @@ -216,5 +219,8 @@ av_cold void rgb2rgb_init_x86(void) if (EXTERNAL_AVX(cpu_flags)) { uyvytoyuv422 = ff_uyvytoyuv422_avx; } + if (EXTERNAL_AVX2_FAST(cpu_flags)) { + uyvytoyuv422 = ff_uyvytoyuv422_avx2; + } #endif } diff --git a/libswscale/x86/rgb_2_rgb.asm b/libswscale/x86/rgb_2_rgb.asm index 3380a1272c..41ac91a747 100644 --- a/libswscale/x86/rgb_2_rgb.asm +++ b/libswscale/x86/rgb_2_rgb.asm @@ -26,14 +26,22 @@ SECTION_RODATA pb_mask_shuffle2103_mmx times 8 dw 255 +pb_shuffle_low: times 4 db 1, 3, 5, 7, 9, 11, 13, 15, -1, -1, -1, -1, -1, -1, -1, -1 pb_shuffle2103: db 2, 1, 0, 3, 6, 5, 4, 7, 10, 9, 8, 11, 14, 13, 12, 15 pb_shuffle0321: db 0, 3, 2, 1, 4, 7, 6, 5, 8, 11, 10, 9, 12, 15, 14, 13 pb_shuffle1230: db 1, 2, 3, 0, 5, 6, 7, 4, 9, 10, 11, 8, 13, 14, 15, 12 pb_shuffle3012: db 3, 0, 1, 2, 7, 4, 5, 6, 11, 8, 9, 10, 15, 12, 13, 14 pb_shuffle3210: db 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12 +pd_permd256_uv: dd 0, 4, 1, 5, 2, 6, 3, 7 SECTION .text +%macro VPERM 5 +%if mmsize == %2 + vperm%1 %3, %4, %5 +%endif +%endmacro + %macro RSHIFT_COPY 3 ; %1 dst ; %2 src ; %3 shift %if cpuflag(avx) @@ -198,11 +206,16 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s mov whalfq, wq shr whalfq, 1 ; whalf = width / 2 - lea srcq, [srcq + wq * 2] + lea srcq, [srcq + wq * 2] add ydstq, wq add udstq, whalfq add vdstq, whalfq +%if mmsize > 16 + movu m13, [pb_shuffle_low] + movu m15, [pd_permd256_uv] +%endif + .loop_line: mov xq, wq mov wtwoq, wq @@ -246,23 +259,35 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s movu m5, [srcq + wtwoq + mmsize * 3] ; extract y part 1 +%if mmsize < 32 RSHIFT_COPY m6, m2, 1 ; UYVY UYVY -> YVYU YVY... pand m6, m1; YxYx YxYx... RSHIFT_COPY m7, m3, 1 ; UYVY UYVY -> YVYU YVY... pand m7, m1 ; YxYx YxYx... - packuswb m6, m7 ; YYYY YYYY... +%else + pshufb m6, m2, m13 + pshufb m7, m3, m13 + punpcklqdq m6, m6, m7 + VPERM q, 32, m6, m6, 0xd8 +%endif movu [ydstq + wq], m6 ; extract y part 2 +%if mmsize < 32 RSHIFT_COPY m6, m4, 1 ; UYVY UYVY -> YVYU YVY... pand m6, m1; YxYx YxYx... RSHIFT_COPY m7, m5, 1 ; UYVY UYVY -> YVYU YVY... pand m7, m1 ; YxYx YxYx... - - packuswb m6, m7 ; YYYY YYYY... + packuswb m6, m7 ; YYYY YYYY... +%else + pshufb m6, m4, m13 + pshufb m7, m5, m13 + punpcklqdq m6, m6, m7 + VPERM q, 32, m6, m6, 0xd8 +%endif movu [ydstq + wq + mmsize], m6 ; extract uv @@ -275,17 +300,21 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s packuswb m4, m5 ; UVUV... ; U - pand m6, m2, m1 ; UxUx... - pand m7, m4, m1 ; UxUx... + pand m6, m2, m1 ; UxUx... + pand m7, m4, m1 ; UxUx... + packuswb m6, m7 ; UUUU - packuswb m6, m7 ; UUUU - movu [udstq + whalfq], m6 + VPERM d, 32, m6, m15, m6 + movu [udstq + whalfq], m6 ; V - psrlw m2, 8 ; VxVx... - psrlw m4, 8 ; VxVx... - packuswb m2, m4 ; VVVV + psrlw m2, 8 ; VxVx... + psrlw m4, 8 ; VxVx... + packuswb m2, m4 ; VVVV + + VPERM d, 32, m2, m15, m2 + movu [vdstq + whalfq], m2 add whalfq, mmsize @@ -294,13 +323,13 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s jl .loop_simd .end_line: - add srcq, src_strideq + add srcq, src_strideq add ydstq, lum_strideq add udstq, chrom_strideq add vdstq, chrom_strideq ;restore initial state of line variable - mov wq, back_wq + mov wq, back_wq mov xq, wq mov whalfq, wq shr whalfq, 1 ; whalf = width / 2 @@ -316,4 +345,9 @@ UYVY_TO_YUV422 INIT_XMM avx UYVY_TO_YUV422 + +%if HAVE_AVX2_EXTERNAL +INIT_YMM avx2 +UYVY_TO_YUV422 +%endif %endif From patchwork Thu Sep 30 01:56:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 30672 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp177293iob; Wed, 29 Sep 2021 18:57:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFC3tqEBUD/tUSoWzRBE0H9juAr+V4lOKQwk0egnGanyj2fRWRrfdorD+0lEKwh+FuuIfM X-Received: by 2002:a17:906:7047:: with SMTP id r7mr3666926ejj.342.1632967024698; Wed, 29 Sep 2021 18:57:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632967024; cv=none; d=google.com; s=arc-20160816; b=z46g9CyvGmT1PCNZHMOwW+6lin5btOWIClTT94oCeapnX9E/QwVgLAeyZB1iNVMSwy +Uj7EbxEkHTJABZ8iXl68zpFfN1y8LMgz+gEYR/DcAUKPr2UvdW/UUZwzBxjuqP6sdoy 4s8aPOPKRfL9ZUK3pJ9RSdZAhvExbftR2qNRpy2Tu1g09ypxM5MDKPfKP5tIk/Rapii5 fZpW19Fh2rtk0/RJMprnW5O+/iJ40MHSq0YK0p8t4Vsf5zW0mAuV8HT4+Q3LMfiNRIRi AgGepbi36scrFAaXTPs8I858xap2RbgSSOURnweXft2lhgf2EUYyQSovGxZHlvGs6IV0 WJeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=MK/Gh9JyINJbMo5yTNBUpRgjrpA/zpfw6VVtO+ofL6A=; b=T5ajwquCapu4k75/X0gI0RRq9hr8CTl+EF0wB10gqrk6710fcQZsrVIYpTLB4jEUkg UUJhHlSCxHBC23OQsyE+U8I3D6U1yMEzxRuO5EoOd7XanV57eZ53LHzGblIg8kj5K7qK p5GC2sEYgPwU7nZgfy9FImXAoBvZ25ENWCQrlsQPY/tf7ECwZRTGQKkX7WK3s5aSLQjm oLDGUYVXh+SKbYaOU3kMyRk3BOD5FyxScNMf0W7fd7kw170mL+zPAGpq4Kep6KrhiUs7 VH/wk3zUzj5mgCrAQbb/ytYdvbekuDzlzKtpLl+pxQspue+mvPw6X4DMZIIYfTN3pbPl daSw== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c24si1913778ejj.646.2021.09.29.18.57.04; Wed, 29 Sep 2021 18:57:04 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0EBBB68A6EA; Thu, 30 Sep 2021 04:56:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03E0668A6B6 for ; Thu, 30 Sep 2021 04:56:25 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="247614451" X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="247614451" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 18:56:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,334,1624345200"; d="scan'208";a="563760916" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by fmsmga002.fm.intel.com with ESMTP; 29 Sep 2021 18:56:20 -0700 From: Wu Jianhua To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 09:56:12 +0800 Message-Id: <20210930015612.29608-4-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210930015612.29608-1-jianhua.wu@intel.com> References: <20210930015612.29608-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v2 4/4] libswscale/x86/rgb2rgb: add uyvytoyuv422 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: Wu Jianhua MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: j+hxJfaJDTHa With the accelerating by means of AVX512, the uyvytoyuv422 can be faster. Performance data(Less is better): uyvytoyuv422_avx2 0.27309 uyvytoyuv422_avx512 0.16229 Signed-off-by: Wu Jianhua --- libswscale/x86/rgb2rgb.c | 6 ++++++ libswscale/x86/rgb_2_rgb.asm | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index a965a1755c..c59136a352 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -167,6 +167,9 @@ void ff_uyvytoyuv422_avx(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, void ff_uyvytoyuv422_avx2(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, const uint8_t *src, int width, int height, int lumStride, int chromStride, int srcStride); +void ff_uyvytoyuv422_avx512(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, + const uint8_t *src, int width, int height, + int lumStride, int chromStride, int srcStride); #endif av_cold void rgb2rgb_init_x86(void) @@ -222,5 +225,8 @@ av_cold void rgb2rgb_init_x86(void) if (EXTERNAL_AVX2_FAST(cpu_flags)) { uyvytoyuv422 = ff_uyvytoyuv422_avx2; } + if (EXTERNAL_AVX512(cpu_flags)) { + uyvytoyuv422 = ff_uyvytoyuv422_avx512; + } #endif } diff --git a/libswscale/x86/rgb_2_rgb.asm b/libswscale/x86/rgb_2_rgb.asm index 41ac91a747..b792201df6 100644 --- a/libswscale/x86/rgb_2_rgb.asm +++ b/libswscale/x86/rgb_2_rgb.asm @@ -32,7 +32,9 @@ pb_shuffle0321: db 0, 3, 2, 1, 4, 7, 6, 5, 8, 11, 10, 9, 12, 15, 14, 13 pb_shuffle1230: db 1, 2, 3, 0, 5, 6, 7, 4, 9, 10, 11, 8, 13, 14, 15, 12 pb_shuffle3012: db 3, 0, 1, 2, 7, 4, 5, 6, 11, 8, 9, 10, 15, 12, 13, 14 pb_shuffle3210: db 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12 +pd_permd512_uv: dd 0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15 pd_permd256_uv: dd 0, 4, 1, 5, 2, 6, 3, 7 +pq_permq512_yy: dq 0, 2, 4, 6, 1, 3, 5, 7 SECTION .text @@ -194,7 +196,11 @@ SHUFFLE_BYTES 3, 2, 1, 0 %macro UYVY_TO_YUV422 0 cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_stride, src_stride, wtwo, whalf, tmp, x, back_w pxor m0, m0 +%if mmsize == 64 + vpternlogd m1, m1, m1, 0xff +%else pcmpeqw m1, m1 +%endif psrlw m1, 8 movsxdifnidn wq, wd @@ -213,7 +219,12 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s %if mmsize > 16 movu m13, [pb_shuffle_low] +%if mmsize == 32 movu m15, [pd_permd256_uv] +%else + movu m14, [pq_permq512_yy] + movu m15, [pd_permd512_uv] +%endif %endif .loop_line: @@ -271,6 +282,7 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s pshufb m7, m3, m13 punpcklqdq m6, m6, m7 VPERM q, 32, m6, m6, 0xd8 + VPERM q, 64, m6, m14, m6 %endif movu [ydstq + wq], m6 @@ -287,6 +299,7 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s pshufb m7, m5, m13 punpcklqdq m6, m6, m7 VPERM q, 32, m6, m6, 0xd8 + VPERM q, 64, m6, m14, m6 %endif movu [ydstq + wq + mmsize], m6 @@ -305,6 +318,7 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s packuswb m6, m7 ; UUUU VPERM d, 32, m6, m15, m6 + VPERM d, 64, m6, m15, m6 movu [udstq + whalfq], m6 @@ -314,6 +328,7 @@ cglobal uyvytoyuv422, 9, 14, 8, ydst, udst, vdst, src, w, h, lum_stride, chrom_s packuswb m2, m4 ; VVVV VPERM d, 32, m2, m15, m2 + VPERM d, 64, m2, m15, m2 movu [vdstq + whalfq], m2 @@ -350,4 +365,9 @@ UYVY_TO_YUV422 INIT_YMM avx2 UYVY_TO_YUV422 %endif + +%if HAVE_AVX512_EXTERNAL +INIT_ZMM avx512 +UYVY_TO_YUV422 +%endif %endif