Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate LLVM at llvm/llvm-project@1a787b3c8e71 #18305

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions third_party/llvm/workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")

def repo(name):
"""Imports LLVM."""
LLVM_COMMIT = "efcfa6e711689ada546c323316145ecd749d380a"
LLVM_SHA256 = "81c9afd66109be46e60ff335c51f2ce9dfbf3998dc87497209bf7cfa6d4f2b22"
LLVM_COMMIT = "1a787b3c8e71eeb333825ec4b76c7440290142e4"
LLVM_SHA256 = "2a4130e08013f7677deba3ba4bb11ce6b8711c54c6d210b261152a53a587adfa"

tf_http_archive(
name = name,
Expand Down
36 changes: 36 additions & 0 deletions third_party/triton/llvm_integration/cl685840712.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

--- a/lib/Analysis/AxisInfo.cpp 2024-10-01 12:24:54.000000000 -0700
+++ b/lib/Analysis/AxisInfo.cpp 2024-10-14 14:51:22.000000000 -0700
@@ -1079,8 +1079,8 @@

void AxisInfoAnalysis::visitForOpInductionVar(
scf::ForOp op, ArrayRef<dataflow::Lattice<AxisInfo> *> argLattices) {
- auto lb = getLatticeElementFor(op, op.getLowerBound())->getValue();
- auto step = getLatticeElementFor(op, op.getStep())->getValue();
+ auto lb = getLatticeElementFor(getProgramPointAfter(op), op.getLowerBound())->getValue();
+ auto step = getLatticeElementFor(getProgramPointAfter(op), op.getStep())->getValue();

AxisInfo::DimVectorT knownContiguity(1, 1);
AxisInfo::DimVectorT knownDivisibility(1, 1);

--- a/lib/Analysis/Utility.cpp 2024-10-02 02:26:53.000000000 -0700
+++ b/lib/Analysis/Utility.cpp 2024-10-14 14:51:22.000000000 -0700
@@ -826,15 +826,15 @@

LogicalResult initialize(Operation *top) override {
WalkResult result = top->walk([&](Operation *op) {
- if (failed(visit(op)))
+ if (failed(visit(getProgramPointAfter(op))))
return WalkResult::interrupt();
return WalkResult::advance();
});
return success(!result.wasInterrupted());
}

- LogicalResult visit(ProgramPoint point) override {
- Operation *op = point.get<Operation *>();
+ LogicalResult visit(ProgramPoint* point) override {
+ Operation *op = point->getPrevOp();
Attribute value;
if (matchPattern(op, m_Constant(&value))) {
auto *constant = getOrCreate<dataflow::Lattice<dataflow::ConstantValue>>(
1 change: 1 addition & 0 deletions third_party/triton/llvm_integration/series.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,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",
"//third_party/triton:llvm_integration/cl685840712.patch",
# Add new patches just above this line
]
4 changes: 2 additions & 2 deletions third_party/tsl/third_party/llvm/workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")

def repo(name):
"""Imports LLVM."""
LLVM_COMMIT = "efcfa6e711689ada546c323316145ecd749d380a"
LLVM_SHA256 = "81c9afd66109be46e60ff335c51f2ce9dfbf3998dc87497209bf7cfa6d4f2b22"
LLVM_COMMIT = "1a787b3c8e71eeb333825ec4b76c7440290142e4"
LLVM_SHA256 = "2a4130e08013f7677deba3ba4bb11ce6b8711c54c6d210b261152a53a587adfa"

tf_http_archive(
name = name,
Expand Down
Loading