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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298719 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2017-03-24 17:53:06 +00:00
parent 80aca9b9aa
commit 65bb8eff35

View 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 },