Skip to content

Commit be9752e

Browse files
gribozavrtensorflower-gardener
authored andcommitted
Updates LLVM usage to match [17ba4f4053e3](llvm/llvm-project@17ba4f4053e3) PiperOrigin-RevId: 658383204
1 parent 07c18c0 commit be9752e

File tree

6 files changed

+27
-60
lines changed

6 files changed

+27
-60
lines changed

tensorflow/compiler/mlir/lite/transforms/lower_static_tensor_list.cc

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -81,25 +81,6 @@ namespace mlir {
8181

8282
namespace {
8383

84-
// TODO(b/355062942): This a temporary solution to unblock LLVM intergration.
85-
// https://github.com/llvm/llvm-project/commit/bbd4af5da2b741672a8e6f625eb12ea5c2d6220f
86-
// changed the behavior of `applySignatureConversion`. Before, an op adaptor
87-
// would have the new block arguments directly as operands. Now, there is an
88-
// `UnrealizedConversionCastOp` inserts from the new type to the old type.
89-
// The new behaviour is correct, but passes in this file depended on the old
90-
// bahavior and worked by coincidence.
91-
llvm::SmallVector<Value, 4> GetOperandsAndSkipUnrealizedConversionCasts(
92-
ValueRange operands) {
93-
llvm::SmallVector<Value, 4> result;
94-
for (Value operand : operands) {
95-
if (auto cast = operand.getDefiningOp<UnrealizedConversionCastOp>()) {
96-
operand = cast.getInputs().front();
97-
}
98-
result.push_back(operand);
99-
}
100-
return result;
101-
}
102-
10384
/// Lower TensorList ops in functions for subsequent legalization.
10485
struct LowerStaticTensorListPass
10586
: public impl::LowerStaticTensorListPassBase<LowerStaticTensorListPass> {
@@ -371,9 +352,7 @@ struct ConvertTensorListSetItem
371352
ConversionPatternRewriter &rewriter) const {
372353
Location loc = op.getLoc();
373354

374-
auto operands =
375-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
376-
355+
auto operands = adaptor.getOperands();
377356
Value input = operands[0];
378357
Value index = operands[1];
379358
Value item = operands[2];
@@ -433,8 +412,7 @@ struct ConvertTensorListSetItem
433412
ConversionPatternRewriter &rewriter) const {
434413
Location loc = op.getLoc();
435414

436-
auto operands =
437-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
415+
auto operands = adaptor.getOperands();
438416
Value input = operands[0];
439417
Value index = operands[1];
440418
Value item = operands[2];
@@ -721,8 +699,7 @@ struct ConvertTensorListPushBack
721699
LogicalResult matchAndRewrite(
722700
TF::TensorListPushBackOp op, OpAdaptor adaptor,
723701
ConversionPatternRewriter &rewriter) const override {
724-
auto operands =
725-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
702+
auto operands = adaptor.getOperands();
726703
Value input_handle = operands[0];
727704
Value item = operands[1];
728705

@@ -764,8 +741,7 @@ struct ConvertTensorListResize
764741
LogicalResult matchAndRewrite(
765742
TF::TensorListResizeOp op, OpAdaptor adaptor,
766743
ConversionPatternRewriter &rewriter) const override {
767-
auto operands =
768-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
744+
auto operands = adaptor.getOperands();
769745
Value input_handle = operands[0];
770746
Value size = operands[1];
771747

@@ -929,9 +905,7 @@ struct ConvertTensorListGetItem
929905
LogicalResult matchAndRewrite(
930906
TF::TensorListGetItemOp op, OpAdaptor adaptor,
931907
ConversionPatternRewriter &rewriter) const override {
932-
auto operands =
933-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
934-
908+
auto operands = adaptor.getOperands();
935909
Value input = operands[0];
936910
Value index = operands[1];
937911
rewriter.replaceOpWithNewOp<TF::GatherOp>(op, op.getType(), input, index,
@@ -948,8 +922,7 @@ struct ConvertTensorListLength
948922
TF::TensorListLengthOp op, OpAdaptor adaptor,
949923
ConversionPatternRewriter &rewriter) const override {
950924
Location loc = op.getLoc();
951-
Value input_handle =
952-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands())[0];
925+
Value input_handle = adaptor.getOperands()[0];
953926

954927
BoolAttr true_attr = rewriter.getBoolAttr(true);
955928
auto shape = rewriter.create<TF::ShapeOp>(loc, input_handle,
@@ -970,8 +943,7 @@ struct ConvertTensorListStack
970943
ConversionPatternRewriter &rewriter) const override {
971944
Location loc = op.getLoc();
972945

973-
auto operands =
974-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
946+
auto operands = adaptor.getOperands();
975947
Value input = operands[0];
976948
Value element_shape = operands[1];
977949

@@ -1021,8 +993,7 @@ struct ConvertTensorListConcatV2
1021993
ConversionPatternRewriter &rewriter) const override {
1022994
Location loc = op.getLoc();
1023995

1024-
auto operands =
1025-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
996+
auto operands = adaptor.getOperands();
1026997
Value input = operands[0];
1027998
Value element_shape = operands[1];
1028999

@@ -1084,8 +1055,7 @@ struct ConvertIdentity : public OpConversionPattern<TF::IdentityOp> {
10841055
LogicalResult matchAndRewrite(
10851056
TF::IdentityOp op, OpAdaptor adaptor,
10861057
ConversionPatternRewriter &rewriter) const override {
1087-
Value input =
1088-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands())[0];
1058+
Value input = adaptor.getOperands()[0];
10891059
rewriter.replaceOpWithNewOp<TF::IdentityOp>(op, input.getType(), input,
10901060
op->getAttrs());
10911061
return success();
@@ -1098,9 +1068,7 @@ struct ConvertReturn : public OpConversionPattern<func::ReturnOp> {
10981068
LogicalResult matchAndRewrite(
10991069
func::ReturnOp op, OpAdaptor adaptor,
11001070
ConversionPatternRewriter &rewriter) const override {
1101-
auto operands =
1102-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
1103-
1071+
auto operands = adaptor.getOperands();
11041072
rewriter.replaceOpWithNewOp<func::ReturnOp>(op, ValueRange{}, operands,
11051073
op->getAttrs());
11061074
return success();
@@ -1113,8 +1081,7 @@ struct ConvertYield : public OpConversionPattern<TF::YieldOp> {
11131081
LogicalResult matchAndRewrite(
11141082
TF::YieldOp op, OpAdaptor adaptor,
11151083
ConversionPatternRewriter &rewriter) const override {
1116-
auto operands =
1117-
GetOperandsAndSkipUnrealizedConversionCasts(adaptor.getOperands());
1084+
auto operands = adaptor.getOperands();
11181085
rewriter.replaceOpWithNewOp<TF::YieldOp>(op, operands);
11191086
return success();
11201087
}

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 = "42d641ef5cc4bd82f98ef9959a593ca6db66d75d"
8-
LLVM_SHA256 = "ec368e9c3b1e1c5eb646c21da65bb54a53060b417e61f2451f3917b35d743abd"
7+
LLVM_COMMIT = "17ba4f4053e303be3e5408d34eaf687a49cefb06"
8+
LLVM_SHA256 = "64c334c15f058ca090fe8eb1e2cd99fdcbaaaf6e57202760f32574d3a9d24d78"
99

1010
tf_http_archive(
1111
name = name,

third_party/shardy/temporary.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl
2-
index 9345d8d..6429d9b 100644
2+
index 6429d9b..e0f0b45 100644
33
--- a/third_party/llvm/workspace.bzl
44
+++ b/third_party/llvm/workspace.bzl
55
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
66

77
def repo(name):
88
"""Imports LLVM."""
9-
- LLVM_COMMIT = "d92a484e6f5c9063d82ca79405bb3557d88ad575"
10-
- LLVM_SHA256 = "0e6cce920f7344248ed747443fc16c316faf398e33f6a7f9f11f41ede861f824"
11-
+ LLVM_COMMIT = "42d641ef5cc4bd82f98ef9959a593ca6db66d75d"
12-
+ LLVM_SHA256 = "ec368e9c3b1e1c5eb646c21da65bb54a53060b417e61f2451f3917b35d743abd"
9+
- LLVM_COMMIT = "42d641ef5cc4bd82f98ef9959a593ca6db66d75d"
10+
- LLVM_SHA256 = "ec368e9c3b1e1c5eb646c21da65bb54a53060b417e61f2451f3917b35d743abd"
11+
+ LLVM_COMMIT = "17ba4f4053e303be3e5408d34eaf687a49cefb06"
12+
+ LLVM_SHA256 = "64c334c15f058ca090fe8eb1e2cd99fdcbaaaf6e57202760f32574d3a9d24d78"
1313

1414
tf_http_archive(
1515
name = name,

third_party/shardy/workspace.bzl

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

55
def repo():
6-
SHARDY_COMMIT = "df54e37427b0007e6527b62616ed1f66a68dda4a"
7-
SHARDY_SHA256 = "2ebf03fd73c4578e721c539ad05b33d5fbfae6838abbb58b944e12f1eafbd9b2"
6+
SHARDY_COMMIT = "a0d337eecb4957da862b235a2829efd9513a129c"
7+
SHARDY_SHA256 = "ffbc55d51995da6fd149e7bc0e41bee4faba02dfa2984f2af54940c46578c0c7"
88

99
tf_http_archive(
1010
name = "shardy",
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
diff --git a/third_party/llvm/workspace.bzl b/third_party/llvm/workspace.bzl
2-
index 9345d8d..6429d9b 100644
2+
index 6429d9b..e0f0b45 100644
33
--- a/third_party/llvm/workspace.bzl
44
+++ b/third_party/llvm/workspace.bzl
55
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive")
66

77
def repo(name):
88
"""Imports LLVM."""
9-
- LLVM_COMMIT = "d92a484e6f5c9063d82ca79405bb3557d88ad575"
10-
- LLVM_SHA256 = "0e6cce920f7344248ed747443fc16c316faf398e33f6a7f9f11f41ede861f824"
11-
+ LLVM_COMMIT = "42d641ef5cc4bd82f98ef9959a593ca6db66d75d"
12-
+ LLVM_SHA256 = "ec368e9c3b1e1c5eb646c21da65bb54a53060b417e61f2451f3917b35d743abd"
9+
- LLVM_COMMIT = "42d641ef5cc4bd82f98ef9959a593ca6db66d75d"
10+
- LLVM_SHA256 = "ec368e9c3b1e1c5eb646c21da65bb54a53060b417e61f2451f3917b35d743abd"
11+
+ LLVM_COMMIT = "17ba4f4053e303be3e5408d34eaf687a49cefb06"
12+
+ LLVM_SHA256 = "64c334c15f058ca090fe8eb1e2cd99fdcbaaaf6e57202760f32574d3a9d24d78"
1313

1414
tf_http_archive(
1515
name = name,

third_party/xla/third_party/shardy/workspace.bzl

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

55
def repo():
6-
SHARDY_COMMIT = "df54e37427b0007e6527b62616ed1f66a68dda4a"
7-
SHARDY_SHA256 = "2ebf03fd73c4578e721c539ad05b33d5fbfae6838abbb58b944e12f1eafbd9b2"
6+
SHARDY_COMMIT = "a0d337eecb4957da862b235a2829efd9513a129c"
7+
SHARDY_SHA256 = "ffbc55d51995da6fd149e7bc0e41bee4faba02dfa2984f2af54940c46578c0c7"
88

99
tf_http_archive(
1010
name = "shardy",

0 commit comments

Comments
 (0)