Skip to content

Merge OpenAI Triton commit 251ec88 #2783

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
merged 5 commits into from
Nov 21, 2024
Merged

Merge OpenAI Triton commit 251ec88 #2783

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d36e579
[LAYOUTS] Unify the implementation of getShapePerCTA (#5183)
lezcano Nov 20, 2024
251ec88
[BACKEND] Use the LL API to replace the using of legacy layout attrib…
chengjunlu Nov 20, 2024
6ccad72
Merge commit 'd36e57998e7aaf7495c5d916b51948b2a42ae5f3'
whitneywhtsang Nov 21, 2024
016ee00
Revert "[LAYOUTS] Unify the implementation of getShapePerCTA (#5183)"
whitneywhtsang Nov 21, 2024
76c054e
Merge commit '251ec88dea0f0c7ab45592c6287fda4b8585440f'
whitneywhtsang Nov 21, 2024
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
8 changes: 4 additions & 4 deletions lib/Dialect/TritonGPU/IR/Dialect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3206,10 +3206,6 @@ std::string getDistributedLayoutStr(RankedTensorType tensorType,
if (!layout)
return "";

unsigned threadsPerWarp = getWarpSize(layout);
unsigned numWarpsPerCTA = getNumWarpsPerCTA(layout);
unsigned numBlocks = getNumCTAs(layout);
int numElementsPerThreads = getTotalElemsPerThread(tensorType);
StringAttr kRegister = StringAttr::get(tensorType.getContext(), "register");
StringAttr kLane = StringAttr::get(tensorType.getContext(), "lane");
StringAttr kWarp = StringAttr::get(tensorType.getContext(), "warp");
Expand All @@ -3222,6 +3218,10 @@ std::string getDistributedLayoutStr(RankedTensorType tensorType,
int64_t tensorSize = product(tensorType.getShape());
std::vector<std::string> elementMapping(tensorSize);
std::vector<std::string> threadMapping;
unsigned threadsPerWarp = ll->getInDimSize(kLane);
unsigned numWarpsPerCTA = ll->getInDimSize(kWarp);
unsigned numBlocks = ll->getInDimSize(kBlock);
int numElementsPerThreads = ll->getInDimSize(kRegister);
for (int blockId = 0; blockId < numBlocks; ++blockId) {
for (int warpId = 0; warpId < numWarpsPerCTA; warpId++) {
for (int tid = 0; tid < threadsPerWarp; ++tid) {
Expand Down
Loading