From owner-svn-src-all@FreeBSD.ORG Wed Jan 7 19:38:54 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9B54AEA; Wed, 7 Jan 2015 19:38:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BAB4A115A; Wed, 7 Jan 2015 19:38:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t07Jcrs3066951; Wed, 7 Jan 2015 19:38:53 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t07JcrN0066950; Wed, 7 Jan 2015 19:38:53 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201501071938.t07JcrN0066950@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 7 Jan 2015 19:38:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276787 - head/contrib/llvm/patches X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jan 2015 19:38:54 -0000 Author: dim Date: Wed Jan 7 19:38:52 2015 New Revision: 276787 URL: https://svnweb.freebsd.org/changeset/base/276787 Log: Add llvm patch corresponding to r276786. Added: head/contrib/llvm/patches/patch-31-llvm-r222292-aarch64-no-neon.diff Added: head/contrib/llvm/patches/patch-31-llvm-r222292-aarch64-no-neon.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/contrib/llvm/patches/patch-31-llvm-r222292-aarch64-no-neon.diff Wed Jan 7 19:38:52 2015 (r276787) @@ -0,0 +1,61 @@ +Pull in r222292 from upstream llvm trunk (by Weiming Zhao): + + [Aarch64] Customer lowering of CTPOP to SIMD should check for NEON + availability + +This ensures llvm's AArch64 backend does not emit floating point +instructions if they are disabled. + +Introduced here: http://svnweb.freebsd.org/changeset/base/276786 + +Index: lib/Target/AArch64/AArch64ISelLowering.cpp +=================================================================== +--- lib/Target/AArch64/AArch64ISelLowering.cpp ++++ lib/Target/AArch64/AArch64ISelLowering.cpp +@@ -3062,6 +3062,9 @@ SDValue AArch64TargetLowering::LowerCTPOP(SDValue + AttributeSet::FunctionIndex, Attribute::NoImplicitFloat)) + return SDValue(); + ++ if (!Subtarget->hasNEON()) ++ return SDValue(); ++ + // While there is no integer popcount instruction, it can + // be more efficiently lowered to the following sequence that uses + // AdvSIMD registers/instructions as long as the copies to/from +Index: test/CodeGen/AArch64/arm64-popcnt.ll +=================================================================== +--- test/CodeGen/AArch64/arm64-popcnt.ll ++++ test/CodeGen/AArch64/arm64-popcnt.ll +@@ -1,4 +1,5 @@ + ; RUN: llc < %s -march=arm64 -aarch64-neon-syntax=apple | FileCheck %s ++; RUN: llc < %s -march=aarch64 -mattr -neon -aarch64-neon-syntax=apple | FileCheck -check-prefix=CHECK-NONEON %s + + define i32 @cnt32_advsimd(i32 %x) nounwind readnone { + %cnt = tail call i32 @llvm.ctpop.i32(i32 %x) +@@ -8,6 +9,13 @@ define i32 @cnt32_advsimd(i32 %x) nounwind readnon + ; CHECK: uaddlv.8b h0, v0 + ; CHECK: fmov w0, s0 + ; CHECK: ret ++; CHECK-NONEON-LABEL: cnt32_advsimd ++; CHECK-NONEON-NOT: 8b ++; CHECK-NONEON: and w{{[0-9]+}}, w{{[0-9]+}}, #0x55555555 ++; CHECK-NONEON: and w{{[0-9]+}}, w{{[0-9]+}}, #0x33333333 ++; CHECK-NONEON: and w{{[0-9]+}}, w{{[0-9]+}}, #0xf0f0f0f ++; CHECK-NONEON: mul ++ + } + + define i64 @cnt64_advsimd(i64 %x) nounwind readnone { +@@ -18,6 +26,12 @@ define i64 @cnt64_advsimd(i64 %x) nounwind readnon + ; CHECK: uaddlv.8b h0, v0 + ; CHECK: fmov w0, s0 + ; CHECK: ret ++; CHECK-NONEON-LABEL: cnt64_advsimd ++; CHECK-NONEON-NOT: 8b ++; CHECK-NONEON: and x{{[0-9]+}}, x{{[0-9]+}}, #0x5555555555555555 ++; CHECK-NONEON: and x{{[0-9]+}}, x{{[0-9]+}}, #0x3333333333333333 ++; CHECK-NONEON: and x{{[0-9]+}}, x{{[0-9]+}}, #0xf0f0f0f0f0f0f0f ++; CHECK-NONEON: mul + } + + ; Do not use AdvSIMD when -mno-implicit-float is specified.