Skip to content

Commit b4dc296

Browse files
metaflowcopybara-github
authored andcommitted
Updates LLVM usage to match [e86910337f98](llvm/llvm-project@e86910337f98) PiperOrigin-RevId: 707514897
1 parent e24d7dc commit b4dc296

File tree

2 files changed

+39
-2
lines changed

2 files changed

+39
-2
lines changed

third_party/llvm/generated.patch

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,38 @@
11
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+

third_party/llvm/workspace.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
44

55
def repo(name):
66
"""Imports LLVM."""
7-
LLVM_COMMIT = "af20aff35ec37ead88903bc3e44f6a81c5c9ca4e"
8-
LLVM_SHA256 = "6e31682011d8c483c6a41adf5389eb09ad7db84331ca985d33a5d59efd0388f6"
7+
LLVM_COMMIT = "e86910337f98e57f5b9253f7d80d5b916eb1d97e"
8+
LLVM_SHA256 = "4ca0eff0ca86ed6f2fdb7682354fdf4c85151d90ac9fb6e55a868e4191359e9f"
99

1010
tf_http_archive(
1111
name = name,

0 commit comments

Comments
 (0)