Skip to content

Commit f6d7860

Browse files
durin42copybara-github
authored andcommitted
Updates LLVM usage to match [a26cbd03fe0f](llvm/llvm-project@a26cbd03fe0f) PiperOrigin-RevId: 499930513
1 parent b3c0343 commit f6d7860

File tree

4 files changed

+506
-16
lines changed

4 files changed

+506
-16
lines changed

third_party/llvm/workspace.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
44

55
def repo(name):
66
"""Imports LLVM."""
7-
LLVM_COMMIT = "26fec4e845a833214d2b0036ea90f1b1c2418d50"
8-
LLVM_SHA256 = "07b96c42044754e0cff3c976262528db8cc8a9264b89486716feb46c9a7a0cf8"
7+
LLVM_COMMIT = "a26cbd03fe0f6f996d27f793e2107393d1888e40"
8+
LLVM_SHA256 = "e05af776d2c3a5973020f3787d692c330db8da0da117ef097644881d4bea28c3"
99

1010
tf_http_archive(
1111
name = name,

xla/mlir_hlo/gml_st/transforms/peeling/peeling.cc

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,21 +120,17 @@ LogicalResult peelLoop(RewriterBase &b, LoopTy loopOp, int64_t idx,
120120
return success();
121121
}
122122

123-
template <typename OpTy, bool IsMin>
123+
template <typename OpTy>
124124
void rewriteAffineOpAfterPeeling(RewriterBase &rewriter, Operation *mainLoop,
125125
Operation *remainderLoop, Value mainIv,
126126
Value remainderIv, Value ub, Value step) {
127127
mainLoop->walk([&](OpTy affineOp) {
128-
AffineMap map = affineOp.getAffineMap();
129-
(void)scf::rewritePeeledMinMaxOp(rewriter, affineOp, map,
130-
affineOp.getOperands(), IsMin, mainIv, ub,
131-
step, /*insideLoop=*/true);
128+
(void)scf::rewritePeeledMinMaxOp(rewriter, affineOp, mainIv, ub, step,
129+
/*insideLoop=*/true);
132130
});
133131
remainderLoop->walk([&](OpTy affineOp) {
134-
AffineMap map = affineOp.getAffineMap();
135-
(void)scf::rewritePeeledMinMaxOp(rewriter, affineOp, map,
136-
affineOp.getOperands(), IsMin, remainderIv,
137-
ub, step, /*insideLoop=*/false);
132+
(void)scf::rewritePeeledMinMaxOp(rewriter, affineOp, remainderIv, ub, step,
133+
/*insideLoop=*/false);
138134
});
139135
}
140136

@@ -155,10 +151,10 @@ FailureOr<LoopTy> peelAndCanonicalizeGmlStLoopImpl(RewriterBase &rewriter,
155151
Value mainIv = loopOp.getInductionVars()[idx], step = loopOp.getStep()[idx],
156152
remainderIv = remainderLoop.getInductionVars()[idx];
157153

158-
rewriteAffineOpAfterPeeling<AffineMinOp, /*IsMin=*/true>(
159-
rewriter, loopOp, remainderLoop, mainIv, remainderIv, ub, step);
160-
rewriteAffineOpAfterPeeling<AffineMaxOp, /*IsMin=*/false>(
161-
rewriter, loopOp, remainderLoop, mainIv, remainderIv, ub, step);
154+
rewriteAffineOpAfterPeeling<AffineMinOp>(rewriter, loopOp, remainderLoop,
155+
mainIv, remainderIv, ub, step);
156+
rewriteAffineOpAfterPeeling<AffineMaxOp>(rewriter, loopOp, remainderLoop,
157+
mainIv, remainderIv, ub, step);
162158

163159
return remainderLoop;
164160
}

xla/mlir_hlo/tests/Dialect/gml_st/canonicalize.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mlir-hlo-opt %s -canonicalize -split-input-file | FileCheck %s
1+
// RUN: mlir-hlo-opt %s -canonicalize="test-convergence" -split-input-file | FileCheck %s
22

33
#map = affine_map<(d0)[s0, s1] -> (d0 * s1 + s0)>
44

0 commit comments

Comments
 (0)