Skip to content

Commit

Permalink
Bump LLVM to llvm/llvm-project@6b65d79 and deps (2023-12-29) (#16012)
Browse files Browse the repository at this point in the history
- Bump llvm-projects to
llvm/llvm-project@6b65d79
- Bump torch-mlir to
llvm/torch-mlir@6096fcb

---------

Co-authored-by: Jakub Kuderski <jakub@nod-labs.com>
Co-authored-by: hanhanW <hanhan0912@gmail.com>
  • Loading branch information
3 people authored Jan 5, 2024
1 parent b3200c8 commit ef344ac
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ struct ReplaceSlowWithFastReductionMinMaxOpPattern final
PatternRewriter &rewriter) const override {
if (slowReductionOp.getKind() == vector::CombiningKind::MINIMUMF) {
rewriter.updateRootInPlace(slowReductionOp, [&]() {
slowReductionOp.setKind(vector::CombiningKind::MINF);
slowReductionOp.setKind(vector::CombiningKind::MINNUMF);
});
return success();
}
if (slowReductionOp.getKind() == vector::CombiningKind::MAXIMUMF) {
rewriter.updateRootInPlace(slowReductionOp, [&]() {
slowReductionOp.setKind(vector::CombiningKind::MAXF);
slowReductionOp.setKind(vector::CombiningKind::MAXNUMF);
});
return success();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ ChangeResult DistributionLayout::resolveWithPossibleConflict(
resolvedLayout->subscribeEnforcement(enforcement);

// We can now resolve this resolved value to the required layout.
resolvedLayout->resolve(rhs);
(void)resolvedLayout->resolve(rhs);

// No change actually needs to be propagated after a conflict resolution.
// TODO: Ideally, there should be another state in the lattice which says
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func.func @reduction_min(%arg0: vector<4xf32>) -> f32 {
return %reduction_min : f32
}

// CHECK: vector.reduction <minf>
// CHECK: vector.reduction <minnumf>

// -----

Expand All @@ -36,7 +36,7 @@ func.func @reduction_max(%arg0: vector<4xf32>) -> f32 {
return %reduction_max : f32
}

// CHECK: vector.reduction <maxf>
// CHECK: vector.reduction <maxnumf>

// -----

Expand All @@ -46,7 +46,7 @@ func.func @multi_reduction_min(%arg0: vector<4xf32>, %arg1: f32) -> f32 {
return %multi_reduction_min : f32
}

// CHECK: vector.multi_reduction <minf>
// CHECK: vector.multi_reduction <minnumf>

// -----

Expand All @@ -56,4 +56,4 @@ func.func @multi_reduction_max(%arg0: vector<4xf32>, %arg1: f32) -> f32 {
return %multi_reduction_max : f32
}

// CHECK: vector.multi_reduction <maxf>
// CHECK: vector.multi_reduction <maxnumf>
4 changes: 2 additions & 2 deletions compiler/src/iree/compiler/Codegen/Utils/GPUUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -451,13 +451,13 @@ static TypedAttr getCombiningKindIdentity(OpBuilder &builder,
case vector::CombiningKind::XOR:
return builder.getZeroAttr(type);
case vector::CombiningKind::MINIMUMF:
case vector::CombiningKind::MINF: {
case vector::CombiningKind::MINNUMF: {
auto posInfApFloat = APFloat::getInf(
llvm::cast<FloatType>(type).getFloatSemantics(), /*Negative=*/false);
return builder.getFloatAttr(type, posInfApFloat);
}
case vector::CombiningKind::MAXIMUMF:
case vector::CombiningKind::MAXF: {
case vector::CombiningKind::MAXNUMF: {
auto negInfApFloat = APFloat::getInf(
llvm::cast<FloatType>(type).getFloatSemantics(), /*Negative=*/true);
return builder.getFloatAttr(type, negInfApFloat);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1796,7 +1796,8 @@ void AsyncFillOp::getCanonicalizationPatterns(RewritePatternSet &results,
//===----------------------------------------------------------------------===//

OpFoldResult AsyncUpdateOp::fold(FoldAdaptor operands) {
if (getUpdateSize() == getTargetSize()) {
if (getUpdateSize() == getTargetSize() &&
getUpdate().getType() == getType()) {
// If updating the entire target then just replace with the update.
// Note that this breaks copy-on-write semantics but will be fixed up during
// canonicalization if needed.
Expand Down
2 changes: 1 addition & 1 deletion third_party/llvm-project
2 changes: 1 addition & 1 deletion third_party/torch-mlir

0 comments on commit ef344ac

Please sign in to comment.