Skip to content
Closed
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
12 changes: 0 additions & 12 deletions third_party/triton/common/llvm_cl887809531.patch

This file was deleted.

11 changes: 0 additions & 11 deletions third_party/triton/common/llvm_cl893899241.patch

This file was deleted.

135 changes: 0 additions & 135 deletions third_party/triton/common/llvm_cl895542516.patch

This file was deleted.

3 changes: 1 addition & 2 deletions third_party/triton/common/mma_limit_pred.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@ fusions reported.
+
return (op->hasTrait<OpTrait::Elementwise>() && isMemoryEffectFree(op)) ||
isView(op) ||
isa<Fp4ToFpOp, LoadOp, DescriptorLoadOp, BroadcastOp, ConvertLayoutOp>(

isa<Fp4ToFpOp, LoadOp, DescriptorLoadLikeOpInterface, BroadcastOp,
11 changes: 4 additions & 7 deletions third_party/triton/common/no_accelerate_through_broadcast.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Fix for b/405045790.

--- a/lib/Dialect/TritonGPU/Transforms/AccelerateMatmul.cpp
+++ b/lib/Dialect/TritonGPU/Transforms/AccelerateMatmul.cpp
@@ -272,10 +272,13 @@ static bool bwdFilter(Operation *op) {
@@ -272,9 +272,12 @@ static bool bwdFilter(Operation *op) {
return false;
}

Expand All @@ -11,11 +11,8 @@ Fix for b/405045790.
+ // small. This is just a heuristic to avoid a regression.
return (op->hasTrait<OpTrait::Elementwise>() && isMemoryEffectFree(op)) ||
isView(op) ||
- isa<Fp4ToFpOp, LoadOp, DescriptorLoadOp, BroadcastOp, ConvertLayoutOp>(
- op);
+ isa<Fp4ToFpOp, LoadOp, DescriptorLoadOp, /*BroadcastOp,*/
+ ConvertLayoutOp>(op);
- isa<Fp4ToFpOp, LoadOp, DescriptorLoadLikeOpInterface, BroadcastOp,
+ isa<Fp4ToFpOp, LoadOp, DescriptorLoadLikeOpInterface, /*BroadcastOp,*/
ConvertLayoutOp>(op);
}

// Finds the bitwidth with which the value x is loaded

3 changes: 0 additions & 3 deletions third_party/triton/common/series.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ common_patch_list = [
"//third_party/triton:common/avoid-0fc-mid-ptwas-128.patch",
"//third_party/triton:common/wgmma_pipeline_fix.patch",
"//third_party/triton:common/nvdisasm_bin_path.patch",
"//third_party/triton:common/llvm_cl887809531.patch",
"//third_party/triton:common/llvm_cl893899241.patch",
"//third_party/triton:common/stage_and_cluster_map.patch",
"//third_party/triton:common/llvm_cl895542516.patch",
"//third_party/triton:common/assert_fail.patch",
"//third_party/triton:common/llvm_cl900404532.patch",
# Add new patches just above this line
Expand Down
4 changes: 2 additions & 2 deletions third_party/triton/workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ load("//third_party/triton:oss_only/series.bzl", "oss_only_patch_list")
def repo():
"""Imports Triton."""

TRITON_COMMIT = "6a0b5461eb439bdb3ef0c721837c64dc2c345fcb"
TRITON_SHA256 = "becf73e91a770d424ba98b49169ebd1cc5aa93c8077953021856d989305a5fd2"
TRITON_COMMIT = "6ea516a6e4cb1878fb6969d222e23294712b3955"
TRITON_SHA256 = "ae490e452ad73ed6d0ba8ee54fc96f72c265b627704ad8887d961a46a7888fac"
tf_http_archive(
name = "triton",
sha256 = TRITON_SHA256,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ RankedTensorType SqueezeTensorType(RankedTensorType type,
cast<DialectInferLayoutInterface>(&encoding.getDialect());
[[maybe_unused]] LogicalResult result =
inferLayoutInterface->inferReshapeOpEncoding(
type.getShape(), encoding, shape, encoding, /*loc=*/std::nullopt);
type.getShape(), encoding, shape, encoding,
/*allowReorder=*/false, /*loc=*/std::nullopt);
CHECK(succeeded(result));
}
return RankedTensorType::get(shape, type.getElementType(), encoding);
Expand Down
Loading