]> granicus.if.org Git - llvm/commitdiff
[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)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298719 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/AMDGPU/SIMachineScheduler.cpp

index da5e7f55c30314000d31ddaa0b204bc021cac39b..b6883bfb7dfd349e213cb7b1814dedbbef4536b1 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 },