|
1 | 1 | Auto generated patch. Do not edit or delete it, even if empty. |
| 2 | +diff -ruN --strip-trailing-cr a/llvm/lib/CodeGen/MLRegAllocEvictAdvisor.cpp b/llvm/lib/CodeGen/MLRegAllocEvictAdvisor.cpp |
| 3 | +--- a/llvm/lib/CodeGen/MLRegAllocEvictAdvisor.cpp |
| 4 | ++++ b/llvm/lib/CodeGen/MLRegAllocEvictAdvisor.cpp |
| 5 | +@@ -654,8 +654,10 @@ |
| 6 | + // There is a potential that the model could be adversarial and |
| 7 | + // continually evict live ranges over and over again, leading to a |
| 8 | + // large amount of compile time being spent in regalloc. If we hit the |
| 9 | +- // threshold, prevent the range from being evicted. |
| 10 | +- if (IntfCascade >= MaxCascade) |
| 11 | ++ // threshold, prevent the range from being evicted. We still let the |
| 12 | ++ // range through if it is urgent as we are required to produce an |
| 13 | ++ // eviction if the candidate is not spillable. |
| 14 | ++ if (IntfCascade >= MaxCascade && !Urgent) |
| 15 | + return false; |
| 16 | + |
| 17 | + // Only evict older cascades or live ranges without a cascade. |
| 18 | +diff -ruN --strip-trailing-cr a/llvm/test/CodeGen/NVPTX/nvcl-param-align.ll b/llvm/test/CodeGen/NVPTX/nvcl-param-align.ll |
| 19 | +--- a/llvm/test/CodeGen/NVPTX/nvcl-param-align.ll |
| 20 | ++++ b/llvm/test/CodeGen/NVPTX/nvcl-param-align.ll |
| 21 | +@@ -1,5 +1,5 @@ |
| 22 | +-; RUN: llc < %s -mtriple=nvptx64 -mcpu=sm_20 | FileCheck %s |
| 23 | +-; RUN: %if ptxas %{ llc < %s -mtriple=nvptx64 -mcpu=sm_20 | %ptxas-verify %} |
| 24 | ++; RUN: llc < %s -mtriple=nvptx64-nvidia-nvcl -mcpu=sm_20 | FileCheck %s |
| 25 | ++; RUN: %if ptxas %{ llc < %s -mtriple=nvptx64-nvidia-nvcl -mcpu=sm_20 | %ptxas-verify %} |
| 26 | + |
| 27 | + target triple = "nvptx-unknown-nvcl" |
| 28 | + |
| 29 | +diff -ruN --strip-trailing-cr a/llvm/test/CodeGen/NVPTX/surf-write.ll b/llvm/test/CodeGen/NVPTX/surf-write.ll |
| 30 | +--- a/llvm/test/CodeGen/NVPTX/surf-write.ll |
| 31 | ++++ b/llvm/test/CodeGen/NVPTX/surf-write.ll |
| 32 | +@@ -1,5 +1,5 @@ |
| 33 | + ; RUN: llc < %s -mcpu=sm_20 -verify-machineinstrs | FileCheck %s |
| 34 | +-; RUN: %if ptxas %{ llc < %s -mcpu=sm_20 -verify-machineinstrs | %ptxas-verify %} |
| 35 | ++; RUN: %if ptxas %{ llc < %s -mcpu=sm_20 -mtriple=nvptx64-nvcl -verify-machineinstrs | %ptxas-verify %} |
| 36 | + |
| 37 | + target triple = "nvptx-unknown-nvcl" |
| 38 | + |
0 commit comments