From patchwork Thu Dec 21 13:40:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 6887 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp936888jad; Thu, 21 Dec 2017 05:47:23 -0800 (PST) X-Google-Smtp-Source: ACJfBov7pj50rOpcndfUmjSQJDuYT4gPhsmyJwj1vL6ZaEQbekrPW3bGI0CgpYa9g8fXiGV6aq/2 X-Received: by 10.28.107.65 with SMTP id g62mr9514603wmc.82.1513864043828; Thu, 21 Dec 2017 05:47:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513864043; cv=none; d=google.com; s=arc-20160816; b=Vd7ocL6MECVoTwv26bT06czQYj7RH8MaMgOufOChfABUnguuM+ObejGkVdmRffe0aM bwcVAMhm+gwM/VIWEjsJisj0DPL7Wcp0CRr7CihYHVkjcj5fRRaRmsT2MMDEj059xiqN sNNAag3dZO54Tp5oFZ8Y9KkltHJrCmoJSrC+CTtsFTfINjR5S7lKoFe5pMVDq96p3IZy ejFPyLONyk4r5MWyXWmb5YuP7n4XlxwsXrLvo0WRyYv2hFq/6brQrhEUCcklfszOtoVB SCnFBtquOXmtPfI2GH3EMeJkVGrNj9UToo0lRZTvWv+Qp/y3vIkkAG4FVDFXl52zIdTJ gjog== 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: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:dkim-signature:delivered-to:arc-authentication-results; bh=uwuAxNj3OJGk7rl2MECwoHs3jgQ+nTiuSC2YAT8FbNk=; b=OmAIRdx6oQpEQc0dp8y2D4t7nEJizuMU9XcC/+MUVX8jlhsuGpjVYSF+3rbnNsXWgq kgEdIzzEOpCSQX0yc1JiaSygRan9rDYeZR7h3338oNBiW8HYkDUoR5oLg7O2Tw2L7/Jt 2Ry4+zzeNOjxKBxKABxDoXnLEvE9RscHw390tDM69sv+EgFSZM32zT9IJTfP3iTzBItG G05ZO0IX29tyaZwink/oNqfmVGtLUQBATH07xTDk89zGV+fdSSl+qLXOzVNlRU4DUDBF pemoa/zVY9GBTu7tY7OuyrFvQdLDNRXvREGrgFK5ueWshyr5Ndspl9cvD2ymsuHxN/Sd zC8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=CH2+eNa2; 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 t8si4896682wmc.78.2017.12.21.05.47.23; Thu, 21 Dec 2017 05:47:23 -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=@ob-encoder-com.20150623.gappssmtp.com header.s=20150623 header.b=CH2+eNa2; 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 B8DDE6882F5; Thu, 21 Dec 2017 15:47:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC797688279 for ; Thu, 21 Dec 2017 15:47:04 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id f9so16017737wmh.0 for ; Thu, 21 Dec 2017 05:47:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=3HezTANj3/Vkd+IzlzjIuDv1V5WOX2EcP/pbrGMlC+8=; b=CH2+eNa264C4nOTGqpR8gBbsXw93lNz2XAp4O90y5NhG0cwcJrRZDlMmdVLpBwNW6K fmCPYPoN7QgA1hY9GCfE9btaOC62yGCPLAXmO7PxuTf3nkpfKc3dKg7JfcPDCv60lv1/ 9j+mMnhP8pgI+e2tXaAQBwdZ9byn48zDppUiRQIzAGQvhc0AVON1bbXU0fX4dPJJJhXZ JiTBIoj+qRVdYvDGD0GOM9QOQI94hHvDMWvFgNyj2IJpCyAdKsuZGXrXBekLv1zBjugG qb2u8Wq8MiJdH9WZd9FPTF5obJiDQYZZZH1HmVKnnyOpDA7qna/quY/K3pjDLb+3hRaZ y4ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=3HezTANj3/Vkd+IzlzjIuDv1V5WOX2EcP/pbrGMlC+8=; b=aJdMUaaMqCAJWIvEYmvt5HYQnW/l+a7trVtfPierBwLaOtb4T9brbczaJzY/ZQfOQl Mr1v4VfS7jROBnLW+kZSVzFSxx0QbPgnwXYtGSmxQgFqrdF/XsJ/ouEIhQLF/AxkqjIT 0Ok55KfZqph9V70Y8/DqKylhaQo8OmfRrIh0tvDZ7q+qOppyoR8oJSkQwiNEH8E8LPs/ HWe6i0HNHzG23l3q6CH6coQpqAWRh+9LwXhdpyaoB7O8k7SHRHgoNgvBVDd2+znNpiie nwpL3DagYxzBkWHSs4MXfgEn4iY1Mwk9GEjpl1B55e9wWVz2C5e0psMetMKu2CRtC9YA LyoA== X-Gm-Message-State: AKGB3mKUHtHNnojcQ7hbWkos5eLBamXus74/Bqs/wHbneEfvO2uOhehI RTay882ApriMAhrt/7OSN2ibwbEb X-Received: by 10.80.166.34 with SMTP id d31mr10193692edc.96.1513863678339; Thu, 21 Dec 2017 05:41:18 -0800 (PST) Received: from Highwind.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id h56sm16517188ede.45.2017.12.21.05.41.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Dec 2017 05:41:17 -0800 (PST) From: James Darnley To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Dec 2017 14:40:58 +0100 Message-Id: <20171221134102.3959-4-jdarnley@obe.tv> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171221134102.3959-1-jdarnley@obe.tv> References: <20171221134102.3959-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 3/7] avutil: detect when AVX-512 is available X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavutil/x86/cpu.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c index f33088c8c7..696f47b3bf 100644 --- a/libavutil/x86/cpu.c +++ b/libavutil/x86/cpu.c @@ -97,6 +97,7 @@ int ff_get_cpu_flags_x86(void) int max_std_level, max_ext_level, std_caps = 0, ext_caps = 0; int family = 0, model = 0; union { int i[3]; char c[12]; } vendor; + int xcr0_lo = 0, xcr0_hi = 0; if (!cpuid_test()) return 0; /* CPUID not supported */ @@ -132,8 +133,8 @@ int ff_get_cpu_flags_x86(void) /* Check OXSAVE and AVX bits */ if ((ecx & 0x18000000) == 0x18000000) { /* Check for OS support */ - xgetbv(0, eax, edx); - if ((eax & 0x6) == 0x6) { + xgetbv(0, xcr0_lo, xcr0_hi); + if ((xcr0_lo & 0x6) == 0x6) { rval |= AV_CPU_FLAG_AVX; if (ecx & 0x00001000) rval |= AV_CPU_FLAG_FMA3; @@ -147,6 +148,13 @@ int ff_get_cpu_flags_x86(void) #if HAVE_AVX2 if ((rval & AV_CPU_FLAG_AVX) && (ebx & 0x00000020)) rval |= AV_CPU_FLAG_AVX2; +#if HAVE_AVX512 /* F, CD, BW, DQ, VL */ + if ((xcr0_lo & 0xe0) == 0xe0) { /* OPMASK/ZMM state */ + if ((ebx & 0xd0030000) == 0xd0030000) + rval |= AV_CPU_FLAG_AVX512; + + } +#endif /* HAVE_AVX512 */ #endif /* HAVE_AVX2 */ /* BMI1/2 don't need OS support */ if (ebx & 0x00000008) {