From owner-svn-src-projects@FreeBSD.ORG Sun Dec 28 02:30:04 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@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 D9270236;
Sun, 28 Dec 2014 02:30:04 +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 AD443667F7;
Sun, 28 Dec 2014 02:30:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBS2U4EC051347;
Sun, 28 Dec 2014 02:30:04 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBS2U4M2051346;
Sun, 28 Dec 2014 02:30:04 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201412280230.sBS2U4M2051346@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sun, 28 Dec 2014 02:30:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r276324 -
projects/clang350-import/contrib/llvm/lib/Target/PowerPC
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Dec 2014 02:30:04 -0000
Author: dim
Date: Sun Dec 28 02:30:03 2014
New Revision: 276324
URL: https://svnweb.freebsd.org/changeset/base/276324
Log:
Pull in r224890 from upstream llvm trunk (by David Majnemer):
PowerPC: CTR shouldn't fire if a TLS call is in the loop
Determining the address of a TLS variable results in a function call in
certain TLS models. This means that a simple ICmpInst might actually
result in invalidating the CTR register.
In such cases, do not attempt to rely on the CTR register for loop
optimization purposes.
This fixes PR22034.
Differential Revision: http://reviews.llvm.org/D6786
This fixes a "Invalid PPC CTR loop" error when compiling parts of libc
for PowerPC-32.
Modified:
projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp
Modified: projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp
==============================================================================
--- projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp Sun Dec 28 00:53:52 2014 (r276323)
+++ projects/clang350-import/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp Sun Dec 28 02:30:03 2014 (r276324)
@@ -194,6 +194,21 @@ static bool isLargeIntegerTy(bool Is32Bi
return false;
}
+// Determining the address of a TLS variable results in a function call in
+// certain TLS models.
+static bool memAddrUsesCTR(const PPCTargetMachine *TM,
+ const llvm::Value *MemAddr) {
+ const auto *GV = dyn_cast<GlobalValue>(MemAddr);
+ if (!GV)
+ return false;
+ if (!GV->isThreadLocal())
+ return false;
+ if (!TM)
+ return true;
+ TLSModel::Model Model = TM->getTLSModel(GV);
+ return Model == TLSModel::GeneralDynamic || Model == TLSModel::LocalDynamic;
+}
+
bool PPCCTRLoops::mightUseCTR(const Triple &TT, BasicBlock *BB) {
for (BasicBlock::iterator J = BB->begin(), JE = BB->end();
J != JE; ++J) {
@@ -390,6 +405,9 @@ bool PPCCTRLoops::mightUseCTR(const Trip
SI->getNumCases()+1 >= (unsigned) TLI->getMinimumJumpTableEntries())
return true;
}
+ for (Value *Operand : J->operands())
+ if (memAddrUsesCTR(TM, Operand))
+ return true;
}
return false;