diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2017-03-24 17:53:06 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2017-03-24 17:53:06 +0000 |
| commit | 80e3d5bb24ad24f42c8a2da8e8091ddc17dfee61 (patch) | |
| tree | 53e6e4a0c01215106bd68c98d50df36f437a6d83 /llvm/lib/Target/AMDGPU | |
| parent | e2419dc90716a2fc1af7e24476b96d89f4089bb0 (diff) | |
| download | bcm5719-llvm-80e3d5bb24ad24f42c8a2da8e8091ddc17dfee61.tar.gz bcm5719-llvm-80e3d5bb24ad24f42c8a2da8e8091ddc17dfee61.zip | |
[AMDGPU] Don't enforce constexpr, there are still old standard libraries around that don't have a constexpr std::pair.
llvm-svn: 298719
Diffstat (limited to 'llvm/lib/Target/AMDGPU')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp b/llvm/lib/Target/AMDGPU/SIMachineScheduler.cpp index da5e7f55c30..b6883bfb7df 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 }, |
