diff options
author | Eric Kunze <eric.kunze@arm.com> | 2022-09-14 10:41:56 -0700 |
---|---|---|
committer | Eric Kunze <eric.kunze@arm.com> | 2022-09-14 10:55:21 -0700 |
commit | 2d31541b4303397f618b1090ecafe7998d30444b (patch) | |
tree | 8de3b5d54d2b79982f9d1f34a4933f3a219761d9 /src | |
parent | 30e53570062b12cfd5ed1a98c01a37d4ec04e7ae (diff) | |
download | tosa_mlir_translator-2d31541b4303397f618b1090ecafe7998d30444b.tar.gz |
Update to new serialization lib
Also includes fixes for more recent LLVM
(verified with LLVM commit 72142fbac496)
Signed-off-by: Eric Kunze <eric.kunze@arm.com>
Change-Id: I00a2cc4360731d5e63f129dfff9228e30aeedb36
Diffstat (limited to 'src')
-rw-r--r-- | src/TosaSerialize.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/TosaSerialize.cpp b/src/TosaSerialize.cpp index e407610..6692932 100644 --- a/src/TosaSerialize.cpp +++ b/src/TosaSerialize.cpp @@ -204,8 +204,8 @@ TosaSerializationOperatorBuilder::BuildPoolOpFromMlirOp(mlir::Operation &op, auto quant_info = op.getAttrOfType<mlir::tosa::UnaryOpQuantizationAttr>( "quantization_info"); - int32_t input_zp = quant_info ? quant_info.input_zp().getInt() : 0; - int32_t output_zp = quant_info ? quant_info.output_zp().getInt() : 0; + int32_t input_zp = quant_info ? quant_info.getInputZp() : 0; + int32_t output_zp = quant_info ? quant_info.getOutputZp() : 0; TosaPoolAttribute attribute(pad, kernel, stride, input_zp, output_zp); @@ -528,8 +528,8 @@ TosaSerializationOperatorBuilder::build<mlir::tosa::Conv2DOp>( auto quant_info = op.getAttrOfType<mlir::tosa::ConvOpQuantizationAttr>("quantization_info"); - int32_t input_zp = quant_info ? quant_info.input_zp().getInt() : 0; - int32_t weight_zp = quant_info ? quant_info.weight_zp().getInt() : 0; + int32_t input_zp = quant_info ? quant_info.getInputZp() : 0; + int32_t weight_zp = quant_info ? quant_info.getWeightZp() : 0; TosaConvAttribute attribute(pad, stride, dilation, input_zp, weight_zp); @@ -575,8 +575,8 @@ TosaSerializationOperatorBuilder::build<mlir::tosa::Conv3DOp>( auto quant_info = op.getAttrOfType<mlir::tosa::ConvOpQuantizationAttr>("quantization_info"); - int32_t input_zp = quant_info ? quant_info.input_zp().getInt() : 0; - int32_t weight_zp = quant_info ? quant_info.weight_zp().getInt() : 0; + int32_t input_zp = quant_info ? quant_info.getInputZp() : 0; + int32_t weight_zp = quant_info ? quant_info.getWeightZp() : 0; TosaConvAttribute attribute(pad, stride, dilation, input_zp, weight_zp); @@ -622,8 +622,8 @@ TosaSerializationOperatorBuilder::build<mlir::tosa::DepthwiseConv2DOp>( auto quant_info = op.getAttrOfType<mlir::tosa::ConvOpQuantizationAttr>("quantization_info"); - int32_t input_zp = quant_info ? quant_info.input_zp().getInt() : 0; - int32_t weight_zp = quant_info ? quant_info.weight_zp().getInt() : 0; + int32_t input_zp = quant_info ? quant_info.getInputZp() : 0; + int32_t weight_zp = quant_info ? quant_info.getWeightZp() : 0; TosaConvAttribute attribute(pad, stride, dilation, input_zp, weight_zp); @@ -670,8 +670,8 @@ TosaSerializationOperatorBuilder::build<mlir::tosa::TransposeConv2DOp>( auto quant_info = op.getAttrOfType<mlir::tosa::ConvOpQuantizationAttr>("quantization_info"); - int32_t input_zp = quant_info ? quant_info.input_zp().getInt() : 0; - int32_t weight_zp = quant_info ? quant_info.weight_zp().getInt() : 0; + int32_t input_zp = quant_info ? quant_info.getInputZp() : 0; + int32_t weight_zp = quant_info ? quant_info.getWeightZp() : 0; TosaTransposeConvAttribute attribute(outpad, stride, output_shape, input_zp, weight_zp); @@ -695,8 +695,8 @@ TosaSerializationOperatorBuilder::build<mlir::tosa::FullyConnectedOp>( auto quant_info = op.getAttrOfType<mlir::tosa::ConvOpQuantizationAttr>("quantization_info"); - int32_t input_zp = quant_info ? quant_info.input_zp().getInt() : 0; - int32_t weight_zp = quant_info ? quant_info.weight_zp().getInt() : 0; + int32_t input_zp = quant_info ? quant_info.getInputZp() : 0; + int32_t weight_zp = quant_info ? quant_info.getWeightZp() : 0; TosaFullyConnectedAttribute attribute(input_zp, weight_zp); TosaSerializationOperator *tyop = new TosaSerializationOperator( @@ -718,8 +718,8 @@ TosaSerializationOperatorBuilder::build<mlir::tosa::MatMulOp>( auto quant_info = op.getAttrOfType<mlir::tosa::MatMulOpQuantizationAttr>( "quantization_info"); - int32_t A_zp = quant_info ? quant_info.a_zp().getInt() : 0; - int32_t B_zp = quant_info ? quant_info.b_zp().getInt() : 0; + int32_t A_zp = quant_info ? quant_info.getAZp() : 0; + int32_t B_zp = quant_info ? quant_info.getBZp() : 0; TosaMatMulAttribute attribute(A_zp, B_zp); @@ -830,8 +830,8 @@ TosaSerializationOperatorBuilder::build<mlir::tosa::NegateOp>( auto quant_info = op.getAttrOfType<mlir::tosa::UnaryOpQuantizationAttr>( "quantization_info"); - int32_t input_zp = quant_info ? quant_info.input_zp().getInt() : 0; - int32_t output_zp = quant_info ? quant_info.output_zp().getInt() : 0; + int32_t input_zp = quant_info ? quant_info.getInputZp() : 0; + int32_t output_zp = quant_info ? quant_info.getOutputZp() : 0; TosaNegateAttribute attribute(input_zp, output_zp); |