From owner-svn-src-projects@freebsd.org Thu Sep 24 21:20:01 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 674B3A0823E for ; Thu, 24 Sep 2015 21:20:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.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 27BEB11EA; Thu, 24 Sep 2015 21:20:01 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8OLK0cI045770; Thu, 24 Sep 2015 21:20:00 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8OLK0HF045769; Thu, 24 Sep 2015 21:20:00 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201509242120.t8OLK0HF045769@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Thu, 24 Sep 2015 21:20:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r288195 - projects/clang370-import/contrib/llvm/include/llvm/Analysis 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.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Sep 2015 21:20:01 -0000 Author: dim Date: Thu Sep 24 21:20:00 2015 New Revision: 288195 URL: https://svnweb.freebsd.org/changeset/base/288195 Log: Pull in r248439 from upstream llvm trunk (by Sanjay Patel): set div/rem default values to 'expensive' in TargetTransformInfo's cost model ...because that's what the cost model was intended to do. As discussed in D12882, this fix has a temporary unintended consequence for SimplifyCFG: it causes us to not speculate an fdiv. However, two wrongs make PR24818 right, and two wrongs make PR24343 act right even though it's really still wrong. I intend to correct SimplifyCFG and add to CodeGenPrepare to account for this cost model change and preserve the righteousness for the bug report cases. https://llvm.org/bugs/show_bug.cgi?id=24818 https://llvm.org/bugs/show_bug.cgi?id=24343 Differential Revision: http://reviews.llvm.org/D12882 This fixes the too-eager fdiv hoisting in pow(), which could lead to unexpected floating point exceptions. Modified: projects/clang370-import/contrib/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h Modified: projects/clang370-import/contrib/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h ============================================================================== --- projects/clang370-import/contrib/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h Thu Sep 24 21:04:48 2015 (r288194) +++ projects/clang370-import/contrib/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h Thu Sep 24 21:20:00 2015 (r288195) @@ -60,6 +60,14 @@ public: // Otherwise, the default basic cost is used. return TTI::TCC_Basic; + case Instruction::FDiv: + case Instruction::FRem: + case Instruction::SDiv: + case Instruction::SRem: + case Instruction::UDiv: + case Instruction::URem: + return TTI::TCC_Expensive; + case Instruction::IntToPtr: { // An inttoptr cast is free so long as the input is a legal integer type // which doesn't contain values outside the range of a pointer.