From 06cb91ba15e860adf72409341143f30613b336c1 Mon Sep 17 00:00:00 2001 From: Tai Ly Date: Thu, 25 Jan 2024 18:37:27 +0000 Subject: Change PadOp's padding to TOSA Shape PadOp's padding input is now a tosa.shape type. Changed serialization of PadOp to not store padding as attribute. Changed deserialization of PadOp to not restore padding from attribute. Signed-off-by: Tai Ly Change-Id: I8a622978ea184b8d2779d311adba629c1a0d1fbd --- src/TosaSerialize.cpp | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'src/TosaSerialize.cpp') diff --git a/src/TosaSerialize.cpp b/src/TosaSerialize.cpp index 4f2c358..de301fe 100644 --- a/src/TosaSerialize.cpp +++ b/src/TosaSerialize.cpp @@ -1205,19 +1205,10 @@ TosaSerializationOperator * TosaSerializationOperatorBuilder::build( mlir::Operation &op) const { std::string input_name = GetTensorName(op.getOperand(0)); + std::string padding_name = GetTensorName(op.getOperand(1)); std::string output_name = GetTensorName(op.getResult(0)); auto pad_op = llvm::cast(op); - // Match padding tensor as compile-time constant attribute - mlir::ElementsAttr paddings_elems; - if (!matchPattern(pad_op.getPadding(), m_Constant(&paddings_elems))) - return nullptr; - - std::vector paddings; - for (int32_t val : paddings_elems.getValues()) { - paddings.push_back(val); - } - auto quant_info = pad_op.getQuantizationInfoAttr(); // pad_const includes the zero point if the tensor uses a zero point. int32_t pad_const_int = quant_info ? quant_info.getInputZp() : 0; @@ -1242,12 +1233,12 @@ TosaSerializationOperatorBuilder::build( } } - TosaPadAttribute attribute(paddings, pad_const_int, pad_const_fp); + TosaPadAttribute attribute({}, pad_const_int, pad_const_fp); - TosaSerializationOperator *tyop = - new TosaSerializationOperator(Op_PAD, Attribute_PadAttribute, &attribute, - std::vector{input_name}, - std::vector{output_name}); + TosaSerializationOperator *tyop = new TosaSerializationOperator( + Op_PAD, Attribute_PadAttribute, &attribute, + std::vector{input_name, padding_name}, + std::vector{output_name}); return tyop; } -- cgit v1.2.1