Skip to content

Bump LLVM version to llvm/llvm-project@49af650 #2570

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.

Sign up for GitHub

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

Merged
ptillet merged 3 commits into from
Oct 31, 2023
+6 −3
Merged

Bump LLVM version to llvm/llvm-project@49af650 #2570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edd89fc
[CI] add text file containing LLVM commit hash
ashay Jun 14, 2023
5d1ca98
Bump LLVM version to https://github.com/llvm/llvm-project/commit/49af…
gflegar Oct 23, 2023
12a8441
[BACKEND] Fix `addStringToModule` after change to `LLVM::AddressOfOp`…
khasanovaa Oct 31, 2023
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
6 changes: 4 additions & 2 deletions lib/Conversion/TritonGPUToLLVM/Utility.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,10 @@ Value addStringToModule(Location loc, ConversionPatternRewriter &rewriter,
}

Value zero = i32_val(0);
Value globalPtr =
rewriter.create<LLVM::AddressOfOp>(UnknownLoc::get(ctx), global);
Type globalPtrType =
LLVM::LLVMPointerType::get(globalType, global.getAddrSpace());
Value globalPtr = rewriter.create<LLVM::AddressOfOp>(
UnknownLoc::get(ctx), globalPtrType, global.getSymName());
Value stringStart =
rewriter.create<LLVM::GEPOp>(UnknownLoc::get(ctx), ptr_ty(i8_ty),
globalPtr, SmallVector<Value>({zero, zero}));
Expand Down
1 change: 1 addition & 0 deletions llvm-hash.txt
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@jlebar jlebar Oct 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid polluting the top-level directory, could we put this in the cmake directory? (Perhaps that should be renamed to build.)

Copy link
Copy Markdown
Collaborator Author

@gflegar gflegar Oct 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both comments make sense to me. But I think it would be best to do those in a separate PR, since updating the LLVM version itself is quite orthogonal from the process for doing it, and would require modifying the build system in several unrelated locations. WDYT?

Copy link
Copy Markdown
Contributor

@jlebar jlebar Oct 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SGTM

Copy link
Copy Markdown
Contributor

@jlebar jlebar Nov 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gflegar did you get around to making these changes?

Copy link
Copy Markdown
Collaborator Author

@gflegar gflegar Nov 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@karupayun should get to it next week.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
49af6502c6dcb4a7f7520178bd14df396f78240c
2 changes: 1 addition & 1 deletion python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def get_llvm_package_info():
return Package("llvm", "LLVM-C.lib", "", "LLVM_INCLUDE_DIRS", "LLVM_LIBRARY_DIR", "LLVM_SYSPATH")
# use_assert_enabled_llvm = check_env_flag("TRITON_USE_ASSERT_ENABLED_LLVM", "False")
# release_suffix = "assert" if use_assert_enabled_llvm else "release"
rev = "b1115f8c"
rev = "49af6502"
Copy link
Copy Markdown
Contributor

@jlebar jlebar Oct 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we read the value in llvm-hash.txt? (And update the README.md that currently points here?)

name = f"llvm-{rev}-{system_suffix}"
url = f"https://tritonlang.blob.core.windows.net/llvm-builds/{name}.tar.gz"
return Package("llvm", name, url, "LLVM_INCLUDE_DIRS", "LLVM_LIBRARY_DIR", "LLVM_SYSPATH")
Expand Down