From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Fri, 24 Mar 2017 17:53:06 +0000 (+0000)
Subject: [AMDGPU] Don't enforce constexpr, there are still old standard libraries around that... 
X-Git-Tag: llvmorg-5.0.0-rc1~9231
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80e3d5bb24ad24f42c8a2da8e8091ddc17dfee61;p=platform%2Fupstream%2Fllvm.git

[AMDGPU] Don't enforce constexpr, there are still old standard libraries around that don't have a constexpr std::pair.

llvm-svn: 298719
---

diff --git a/llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp b/llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp
index da5e7f5..b6883bf 100644
--- a/llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp
+++ b/llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp
@@ -1809,8 +1809,8 @@ void SIScheduleDAGMI::schedule()
   // if VGPR usage is extremely high, try other good performing variants
   // which could lead to lower VGPR usage
   if (Best.MaxVGPRUsage > 180) {
-    static constexpr std::pair<SISchedulerBlockCreatorVariant,
-                               SISchedulerBlockSchedulerVariant>
+    static const std::pair<SISchedulerBlockCreatorVariant,
+                           SISchedulerBlockSchedulerVariant>
         Variants[] = {
       { LatenciesAlone, BlockRegUsageLatency },
 //      { LatenciesAlone, BlockRegUsage },
@@ -1830,8 +1830,8 @@ void SIScheduleDAGMI::schedule()
   // if VGPR usage is still extremely high, we may spill. Try other variants
   // which are less performing, but that could lead to lower VGPR usage.
   if (Best.MaxVGPRUsage > 200) {
-    static constexpr std::pair<SISchedulerBlockCreatorVariant,
-                               SISchedulerBlockSchedulerVariant>
+    static const std::pair<SISchedulerBlockCreatorVariant,
+                           SISchedulerBlockSchedulerVariant>
         Variants[] = {
 //      { LatenciesAlone, BlockRegUsageLatency },
       { LatenciesAlone, BlockRegUsage },