experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace operands now injected in OpBuilder

Browse Source 
These are now injected automatically.

PiperOrigin-RevId: 336389520
Change-Id: Ied14875e8d45f57dfe0013898acc5050e41b2481
This commit is contained in:
Jacques Pienaar 2020-10-09 16:45:15 -07:00 committed by TensorFlower Gardener
parent 8afd8532b1
commit b0f7ab99e7
1 changed files with 51 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
tensorflow/compiler/mlir/lite/ir/tfl_ops.td
View File

@ -385,28 +385,27 @@ def BinaryOpSameElementTypeConstraint :
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
def TFL_BroadcastableBinaryBuilder : OpBuilder< def TFL_BroadcastableBinaryBuilder : OpBuilder<
"OpBuilder &builder, OperationState &result, Value lhs, Value rhs", "Value lhs, Value rhs",
[{ [{
auto resultType = auto resultType =
OpTrait::util::getBroadcastedType(lhs.getType(), rhs.getType()); OpTrait::util::getBroadcastedType(lhs.getType(), rhs.getType());
if (!resultType) if (!resultType)
mlir::emitError(result.location, "non-broadcastable operands"); mlir::emitError($_state.location, "non-broadcastable operands");
result.addOperands({lhs, rhs}); $_state.addOperands({lhs, rhs});
result.types.push_back(resultType); $_state.types.push_back(resultType);
}]>; }]>;
def TFL_FusedBroadcastableBinaryBuilder : OpBuilder< def TFL_FusedBroadcastableBinaryBuilder : OpBuilder<
"OpBuilder &builder, OperationState &result, Value lhs, Value rhs, " "Value lhs, Value rhs, StringAttr fusedActivationFunction",
"StringAttr fusedActivationFunction",
[{ [{
buildFusedBroadcastableBinOp( buildFusedBroadcastableBinOp(
&builder, result, lhs, rhs, fusedActivationFunction); &$_builder, $_state, lhs, rhs, fusedActivationFunction);
}]>; }]>;
def TFL_ComparisonBinaryBuilder : OpBuilder< def TFL_ComparisonBinaryBuilder : OpBuilder<
"OpBuilder &builder, OperationState &result, Value lhs, Value rhs", "Value lhs, Value rhs",
[{ [{
buildComparisonBinOp(&builder, result, lhs, rhs); buildComparisonBinOp(&$_builder, $_state, lhs, rhs);
}]>; }]>;
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@ -772,10 +771,10 @@ def TFL_ConstOp : Op<TFL_Dialect, "pseudo_const", [ConstantLike, NoSideEffect,
let hasFolder = 1; let hasFolder = 1;
let builders = [OpBuilder< let builders = [OpBuilder<
"OpBuilder &, OperationState &state, Attribute value", "Attribute value",
[{ [{
state.addAttribute("value", value); $_state.addAttribute("value", value);
state.addTypes(value.getType()); $_state.addTypes(value.getType());
}]> }]>
]; ];
} }
@ -824,13 +823,12 @@ def TFL_SparseConstOp : Op<TFL_Dialect, "pseudo_sparse_const", [
let results = (outs AnyTensor:$output); let results = (outs AnyTensor:$output);
let builders = [OpBuilder< let builders = [OpBuilder<
"OpBuilder &, OperationState &state, Attribute value, " "Attribute value, SparsityParameterAttr s_param, Attribute compressed_data",
"SparsityParameterAttr s_param, Attribute compressed_data",
[{ [{
state.addTypes(value.getType()); $_state.addTypes(value.getType());
state.addAttribute("value", value); $_state.addAttribute("value", value);
state.addAttribute("s_param", s_param); $_state.addAttribute("s_param", s_param);
state.addAttribute("compressed_data", compressed_data); $_state.addAttribute("compressed_data", compressed_data);
}]> }]>
]; ];
} }
@ -896,7 +894,7 @@ def TFL_DepthwiseConv2DOp :
let extraClassDeclaration = [{ let extraClassDeclaration = [{
// AffineQuantizedOpInterface: // AffineQuantizedOpInterface:
int GetChannelDimIndex() { return 3; } int GetChannelDimIndex() { return 3; }
int GetQuantizationDimIndex() { return 3; } int GetQuantizationDimIndex() { return 3; }
// SparseOpInterface: // SparseOpInterface:
std::vector<int> GetSparseOperands() { return {1}; } std::vector<int> GetSparseOperands() { return {1}; }
std::vector<std::vector<int>> GetFloatBlockSize() { return {}; } std::vector<std::vector<int>> GetFloatBlockSize() { return {}; }
@ -1009,9 +1007,8 @@ def TFL_GatherOp : TFL_Op<"gather", [
let builders = let builders =
[ [
OpBuilder<"OpBuilder &builder, OperationState &result, " OpBuilder<"Value params, Value indices, IntegerAttr axis",
"Value params, Value indices, IntegerAttr axis", [{ BuildGatherOp(&$_builder, $_state, params, indices, axis); }]>
[{ BuildGatherOp(&builder, result, params, indices, axis); }]>
]; ];
let results = (outs let results = (outs
@ -1346,10 +1343,9 @@ def TFL_NotEqualOp : TFL_Op<"not_equal", [
let builders = let builders =
[ [
OpBuilder< OpBuilder<"Value lhs, Value rhs",
"OpBuilder &builder, OperationState &result, Value lhs, Value rhs",
[{ [{
buildComparisonBinOp(&builder, result, lhs, rhs); buildComparisonBinOp(&$_builder, $_state, lhs, rhs);
}]> }]>
]; ];
@ -2485,11 +2481,10 @@ def TFL_ReluOp: TFL_Op<"relu", [
// This builder doesn't work with quantized type, so it can only be used by // This builder doesn't work with quantized type, so it can only be used by
// non-quantization tablegen patterns. Currently, it is used by the // non-quantization tablegen patterns. Currently, it is used by the
// elementwise-move reordering pattern in the optimize_patterns.td // elementwise-move reordering pattern in the optimize_patterns.td
let builders = [OpBuilder< let builders = [OpBuilder<"Value input",
"OpBuilder &, OperationState &state, Value input",
[{ [{
state.addOperands({input}); $_state.addOperands({input});
state.addTypes(input.getType()); $_state.addTypes(input.getType());
}]> }]>
]; ];
} }
@ -2513,11 +2508,10 @@ def TFL_Relu6Op: TFL_Op<"relu6", [
// This builder doesn't work with quantized type, so it can only be used by // This builder doesn't work with quantized type, so it can only be used by
// non-quantization tablegen patterns. Currently, it is used by the // non-quantization tablegen patterns. Currently, it is used by the
// elementwise-move reordering pattern in the optimize_patterns.td // elementwise-move reordering pattern in the optimize_patterns.td
let builders = [OpBuilder< let builders = [OpBuilder<"Value input",
"OpBuilder &, OperationState &state, Value input",
[{ [{
state.addOperands({input}); $_state.addOperands({input});
state.addTypes(input.getType()); $_state.addTypes(input.getType());
}]> }]>
]; ];
} }
@ -2542,10 +2536,10 @@ def TFL_Relu1Op: TFL_Op<"relu_n1_to_1", [
// non-quantization tablegen patterns. Currently, it is used by the // non-quantization tablegen patterns. Currently, it is used by the
// elementwise-move reordering pattern in the optimize_patterns.td // elementwise-move reordering pattern in the optimize_patterns.td
let builders = [OpBuilder< let builders = [OpBuilder<
"OpBuilder &, OperationState &state, Value input", "Value input",
[{ [{
state.addOperands({input}); $_state.addOperands({input});
state.addTypes(input.getType()); $_state.addTypes(input.getType());
}]> }]>
]; ];
} }
@ -2725,12 +2719,11 @@ def TFL_SelectOp : TFL_Op<"select", [
TFL_TensorOf<[F32, I1, I8, I16, I32, I64, QI8, QUI8, QI16, TFL_Quint8]>:$output); TFL_TensorOf<[F32, I1, I8, I16, I32, I64, QI8, QUI8, QI16, TFL_Quint8]>:$output);
// TODO(jpienaar): autogenerate this. // TODO(jpienaar): autogenerate this.
let builders = [OpBuilder<"OpBuilder &builder, OperationState &result, " let builders = [OpBuilder<"Value condition, Value x, Value y",
"Value condition, Value x, Value y",
[{ [{
auto resultType = x.getType(); auto resultType = x.getType();
result.addOperands({condition, x, y}); $_state.addOperands({condition, x, y});
result.types.push_back(resultType); $_state.types.push_back(resultType);
}]>]; }]>];
let hasOptions = 1; let hasOptions = 1;
@ -2761,10 +2754,9 @@ def TFL_SelectV2Op : TFL_Op<"select_v2", [
let results = (outs let results = (outs
TFL_TensorOf<[F32, I1, I8, I16, I32, I64, QI8, QUI8, QI16, TFL_Quint8]>:$output); TFL_TensorOf<[F32, I1, I8, I16, I32, I64, QI8, QUI8, QI16, TFL_Quint8]>:$output);
let builders = [OpBuilder<"OpBuilder &builder, OperationState &result, " let builders = [OpBuilder<"Value cond, Value x, Value y",
"Value cond, Value x, Value y",
[{ [{
BuildSelectV2Op(&builder, result, cond, x, y); BuildSelectV2Op(&$_builder, $_state, cond, x, y);
}]>]; }]>];
let hasOptions = 1; let hasOptions = 1;
@ -2939,11 +2931,10 @@ def TFL_TanhOp: TFL_Op<"tanh", [
// This builder doesn't work with quantized type, so it can only be used by // This builder doesn't work with quantized type, so it can only be used by
// non-quantization tablegen patterns. Currently, it is used by the // non-quantization tablegen patterns. Currently, it is used by the
// elementwise-move reordering pattern in the optimize_patterns.td // elementwise-move reordering pattern in the optimize_patterns.td
let builders = [OpBuilder< let builders = [OpBuilder<"Value input",
"OpBuilder &, OperationState &state, Value input",
[{ [{
state.addOperands({input}); $_state.addOperands({input});
state.addTypes(input.getType()); $_state.addTypes(input.getType());
}]> }]>
]; ];
@ -3013,9 +3004,8 @@ def TFL_TopKV2Op: TFL_Op<"topk_v2", [
TFL_TensorOf<[F32, I8, I32, I64, UI8, QI8, QUI8]>:$values, TFL_TensorOf<[F32, I8, I32, I64, UI8, QI8, QUI8]>:$values,
TFL_I32Tensor:$indices); TFL_I32Tensor:$indices);
let builders = [OpBuilder<"OpBuilder &builder, OperationState &result, " let builders = [OpBuilder<"Value input, Value k",
"Value input, Value k", [{ BuildTopKOp(&$_builder, $_state, input, k); }]>];
[{ BuildTopKOp(&builder, result, input, k); }]>];
let hasOptions = 1; let hasOptions = 1;
} }
@ -3548,11 +3538,11 @@ def TFL_QConstOp : Op<TFL_Dialect, "pseudo_qconst", [
let results = (outs TFL_TensorOf<[QUI8, QI8, QI16, QUI16, TFL_Quint8]>:$output); let results = (outs TFL_TensorOf<[QUI8, QI8, QI16, QUI16, TFL_Quint8]>:$output);
let builders = [OpBuilder< let builders = [OpBuilder<
"OpBuilder &, OperationState &state, TypeAttr qtype, Attribute value", "TypeAttr qtype, Attribute value",
[{ [{
state.addAttribute("qtype", qtype); $_state.addAttribute("qtype", qtype);
state.addAttribute("value", value); $_state.addAttribute("value", value);
state.addTypes(qtype.getValue()); $_state.addTypes(qtype.getValue());
}]> }]>
]; ];
} }
@ -3577,14 +3567,14 @@ def TFL_SparseQConstOp : Op<TFL_Dialect, "pseudo_sparse_qconst", [
let results = (outs TFL_TensorOf<[QUI8, QI8, QI16, QUI16, TFL_Quint8]>:$output); let results = (outs TFL_TensorOf<[QUI8, QI8, QI16, QUI16, TFL_Quint8]>:$output);
let builders = [OpBuilder< let builders = [OpBuilder<
"OpBuilder &, OperationState &state, TypeAttr qtype, " "TypeAttr qtype, Attribute value, SparsityParameterAttr s_param, "
"Attribute value, SparsityParameterAttr s_param, Attribute compressed_data", "Attribute compressed_data",
[{ [{
state.addTypes(qtype.getValue()); $_state.addTypes(qtype.getValue());
state.addAttribute("qtype", qtype); $_state.addAttribute("qtype", qtype);
state.addAttribute("value", value); $_state.addAttribute("value", value);
state.addAttribute("s_param", s_param); $_state.addAttribute("s_param", s_param);
state.addAttribute("compressed_data", compressed_data); $_state.addAttribute("compressed_data", compressed_data);
}]> }]>
]; ];
} }