From patchwork Wed Mar 18 22:01:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Noonan X-Patchwork-Id: 451653 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 4C15E14010F for ; Thu, 19 Mar 2015 09:01:39 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 960E193125; Wed, 18 Mar 2015 22:01:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E5bwJCak62vm; Wed, 18 Mar 2015 22:01:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EBBAA93165; Wed, 18 Mar 2015 22:01:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 019C71C20E8 for ; Wed, 18 Mar 2015 22:01:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F03CB91E92 for ; Wed, 18 Mar 2015 22:01:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IShmx+YMdP07 for ; Wed, 18 Mar 2015 22:01:34 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f180.google.com (mail-pd0-f180.google.com [209.85.192.180]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2B2D991DF4 for ; Wed, 18 Mar 2015 22:01:32 +0000 (UTC) Received: by pdbcz9 with SMTP id cz9so55206475pdb.3 for ; Wed, 18 Mar 2015 15:01:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8JOOaVJTbXgGDrggfZaCLxbb0Hy6aGFWUWXB25FqBOg=; b=SEfiAciqdG93l+Ga5a+rFjUNjHBkAYawJ671Ukw4Sh5mmw0FpWmF7LEoS4uYskRr8A oCvFox+JPmJl0ul21EnnnSGCuhg8rzO0XqwWs4Epv90g41IFqAUqkPLcsRdabGQngFyi R/w0Us2i4MEvEBV06s2cFJyFnEutiMNA+6XYt5kF0BFS7ZSNh1/8QNA2DUcpb7aAv4TO WvppQSqVz4w2sVEygI9RQc4hDCuaU7a9OAah6M8DmLOuIhCD18GydDx6Fx8ndJvQ9aqY 37yf9XbgvTVjf+kCl8E44x7kZRMh5K+jN7JUFTkeC1pcXcHKB2h910l64ue0V7vToqyb t9vA== X-Gm-Message-State: ALoCoQlCzX1BknkWFTtZVQ+k3KIXV6o8fwO7A8bCRBnKO931O7u+XNcn8ArEyvBJ0Tbh/IevMGYS X-Received: by 10.70.133.97 with SMTP id pb1mr100327153pdb.10.1426716091964; Wed, 18 Mar 2015 15:01:31 -0700 (PDT) Received: from steven@uplinklabs.net ([104.152.107.133]) by mx.google.com with ESMTPSA id kn5sm29172719pdb.42.2015.03.18.15.01.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 15:01:30 -0700 (PDT) Received: by steven@uplinklabs.net (sSMTP sendmail emulation); Wed, 18 Mar 2015 15:01:28 -0700 From: Steven Noonan To: buildroot@busybox.net Date: Wed, 18 Mar 2015 15:01:11 -0700 Message-Id: <1426716071-27570-4-git-send-email-steven@uplinklabs.net> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1426716071-27570-1-git-send-email-steven@uplinklabs.net> References: <1426716071-27570-1-git-send-email-steven@uplinklabs.net> Subject: [Buildroot] [PATCH 3/3] packages: add AVX/AVX2 support to ffmpeg/opencv X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Steven Noonan --- package/ffmpeg/ffmpeg.mk | 12 ++++++++++++ package/opencv/opencv.mk | 2 ++ 2 files changed, 14 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 68a28a2..47372df 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -301,6 +301,18 @@ else FFMPEG_CONF_OPTS += --disable-sse42 endif +ifeq ($(BR2_X86_CPU_HAS_AVX),y) +FFMPEG_CONF_OPTS += --enable-avx +else +FFMPEG_CONF_OPTS += --disable-avx +endif + +ifeq ($(BR2_X86_CPU_HAS_AVX2),y) +FFMPEG_CONF_OPTS += --enable-avx2 +else +FFMPEG_CONF_OPTS += --disable-avx2 +endif + # Explicitly disable everything that doesn't match for ARM # FFMPEG "autodetects" by compiling an extended instruction via AS # This works on compilers that aren't built for generic by default diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 61f529e..ee84312 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -77,6 +77,8 @@ OPENCV_CONF_OPTS += \ -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \ -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \ -DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \ + -DENABLE_AVX=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \ + -DENABLE_AVX2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \ -DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) # Cuda stuff