Skip to content

Commit cea5792

Browse files
metaflowGoogle-ML-Automation
metaflow
authored and
Google-ML-Automation
committed
Updates LLVM usage to match [e86910337f98](llvm/llvm-project@e86910337f98) PiperOrigin-RevId: 707514897
1 parent ab8bcb3 commit cea5792

File tree

6 files changed

+128
-11
lines changed

6 files changed

+128
-11
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,

‎third_party/shardy/temporary.patch‎

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

750
def repo(name):
851
"""Imports LLVM."""
9-
- LLVM_COMMIT = "a21f9bfe29c2b9f1967952d12a5b7cb8f8b75202"
10-
- LLVM_SHA256 = "7039c2826841e473fe6431e36a2d8ba3746f200da53c481384f7f5d970e5bca1"
11-
+ LLVM_COMMIT = "af20aff35ec37ead88903bc3e44f6a81c5c9ca4e"
12-
+ LLVM_SHA256 = "6e31682011d8c483c6a41adf5389eb09ad7db84331ca985d33a5d59efd0388f6"
52+
- LLVM_COMMIT = "af20aff35ec37ead88903bc3e44f6a81c5c9ca4e"
53+
- LLVM_SHA256 = "6e31682011d8c483c6a41adf5389eb09ad7db84331ca985d33a5d59efd0388f6"
54+
+ LLVM_COMMIT = "e86910337f98e57f5b9253f7d80d5b916eb1d97e"
55+
+ LLVM_SHA256 = "4ca0eff0ca86ed6f2fdb7682354fdf4c85151d90ac9fb6e55a868e4191359e9f"
1356

1457
tf_http_archive(
1558
name = name,

‎third_party/shardy/workspace.bzl‎

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

55
def repo():
6-
SHARDY_COMMIT = "d5c9131203630f5de33ffde70ce9416803e7c15d"
7-
SHARDY_SHA256 = "905f06ca976393c0b37531d159d5e471bdfedb59558aecfb1d5a06ebc5ff55c6"
6+
SHARDY_COMMIT = "e24d7dcb6c818b686b94fcda64e7087ed8aa418d"
7+
SHARDY_SHA256 = "79bdb36f692f444ae23d6469560daa1f621eb40936999b244062465a602293ab"
88

99
tf_http_archive(
1010
name = "shardy",

‎third_party/tsl/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/tsl/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)