Integrate LLVM at llvm/llvm-project@2918e779a954

Updates LLVM usage to match [2918e779a954](llvm/llvm-project@2918e779a954) PiperOrigin-RevId: 683994000
openxla · Oct 9, 2024 · 18af6ac · 18af6ac
1 parent ac1ff26
commit 18af6ac
Show file tree

Hide file tree

Showing 8 changed files with 1,552 additions and 3,299 deletions.
diff --git a/third_party/llvm/generated.patch b/third_party/llvm/generated.patch
diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-    LLVM_COMMIT = "82f5acfbec65e1a645d902f746253eeaf0bd2d70"
-    LLVM_SHA256 = "c621acf6f202cfcbd0c73f381272b70c51c95f0ecb62c17d2d5fe0156a80082a"
+    LLVM_COMMIT = "2918e779a9545a66c0031b03b3af5bf4d8517cec"
+    LLVM_SHA256 = "efd6ac33aba00a6eac0047533a99d6d766dc9dae9ec5ba8e74ff297bfd4c9f0e"
 
     tf_http_archive(
         name = name,

diff --git a/third_party/shardy/temporary.patch b/third_party/shardy/temporary.patch
diff --git a/third_party/shardy/workspace.bzl b/third_party/shardy/workspace.bzl
@@ -3,8 +3,8 @@
 load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
 
 def repo():
-    SHARDY_COMMIT = "efbd41448d245c78c6cbd73689d1a6fb40839152"
-    SHARDY_SHA256 = "c746965803e9bfb4ccf20366eae60fbe32fcc5797520dfe0657527d5f47f6768"
+    SHARDY_COMMIT = "a21e233b5c6cc45c806d3e9e7960d8b1f0fbab4d"
+    SHARDY_SHA256 = "db7aa65c3386c2560f43faf1eae2e7b824282624defcf76f4901ec8bda134c1f"
 
     tf_http_archive(
         name = "shardy",

diff --git a/third_party/triton/llvm_integration/cl683501567.patch b/third_party/triton/llvm_integration/cl683501567.patch
@@ -0,0 +1,13 @@
+
+--- a/lib/Target/LLVMIR/LLVMDIScope.cpp	2024-09-16 13:44:40.000000000 -0700
++++ b/lib/Target/LLVMIR/LLVMDIScope.cpp	2024-10-08 22:38:50.000000000 -0700
+@@ -104,7 +104,8 @@
+     auto subprogramAttr = LLVM::DISubprogramAttr::get(
+         context, distinctId, compileUnitAttr, fileAttr, funcNameAttr,
+         funcNameAttr, fileAttr, /*line=*/line, /*scopeline=*/line,
+-        subprogramFlags, subroutineTypeAttr, /*retainNodes=*/{});
++        subprogramFlags, subroutineTypeAttr, /*retainNodes=*/{},
++        /*annotations=*/{});
+     funcOp->setLoc(FusedLoc::get(context, {loc}, subprogramAttr));
+   }
+
diff --git a/third_party/triton/llvm_integration/series.bzl b/third_party/triton/llvm_integration/series.bzl
@@ -9,5 +9,6 @@ LLVM nor MLIR integrator, please do not add any patches to this list.
 
 llvm_patch_list = [
     "//third_party/triton:llvm_integration/cl680875920.patch",
+    "//third_party/triton:llvm_integration/cl683501567.patch",
     # Add new patches just above this line
 ]
diff --git a/third_party/tsl/third_party/llvm/generated.patch b/third_party/tsl/third_party/llvm/generated.patch
diff --git a/third_party/tsl/third_party/llvm/workspace.bzl b/third_party/tsl/third_party/llvm/workspace.bzl
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
 
 def repo(name):
     """Imports LLVM."""
-    LLVM_COMMIT = "82f5acfbec65e1a645d902f746253eeaf0bd2d70"
-    LLVM_SHA256 = "c621acf6f202cfcbd0c73f381272b70c51c95f0ecb62c17d2d5fe0156a80082a"
+    LLVM_COMMIT = "2918e779a9545a66c0031b03b3af5bf4d8517cec"
+    LLVM_SHA256 = "efd6ac33aba00a6eac0047533a99d6d766dc9dae9ec5ba8e74ff297bfd4c9f0e"
 
     tf_http_archive(
         name = name,