[AMDGPU] Don't enforce constexpr, there are still old standard libraries around that...
authorBenjamin Kramer <benny.kra@googlemail.com>
Fri, 24 Mar 2017 17:53:06 +0000 (17:53 +0000)
committerBenjamin Kramer <benny.kra@googlemail.com>
Fri, 24 Mar 2017 17:53:06 +0000 (17:53 +0000)
llvm-svn: 298719

llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp

index da5e7f5..b6883bf 100644 (file)
@@ -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 },