diff options
author | Jeremy Johnson <jeremy.johnson@arm.com> | 2022-05-25 15:26:38 +0100 |
---|---|---|
committer | Jeremy Johnson <jeremy.johnson@arm.com> | 2022-05-26 09:53:44 +0100 |
commit | f7f78ae236e623a57919f9450e8b2043e681ddb3 (patch) | |
tree | 0456c0006fbce5efbebe93818398b3a0cd7cd76c /reference_model/src/ops | |
parent | 0e6218e22f25901aa208fbec44c9b14e14a68ba7 (diff) | |
download | reference_model-f7f78ae236e623a57919f9450e8b2043e681ddb3.tar.gz |
Add support for uint16_t to RESCALE
Update ref-model RESCALE op to support UINT16 conversions
Add testing for RESCALE UINT16 and ERROR_IFs
Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Change-Id: Ic6e6e53de1f0b054bedb9e6ba3856e7475498aba
Diffstat (limited to 'reference_model/src/ops')
-rw-r--r-- | reference_model/src/ops/op_factory.cc | 4 | ||||
-rw-r--r-- | reference_model/src/ops/template_types.h | 22 | ||||
-rw-r--r-- | reference_model/src/ops/type_conversion.cc | 24 |
3 files changed, 45 insertions, 5 deletions
diff --git a/reference_model/src/ops/op_factory.cc b/reference_model/src/ops/op_factory.cc index 6edd63f..f7ded9a 100644 --- a/reference_model/src/ops/op_factory.cc +++ b/reference_model/src/ops/op_factory.cc @@ -396,7 +396,11 @@ GraphNode* OpFactory::newOp(SubgraphTraverser* sgt, DEF_FACTORY_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT48, INT16); DEF_FACTORY_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT48, INT32); DEF_FACTORY_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, UINT8, INT8); + DEF_FACTORY_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, UINT8, INT16); + DEF_FACTORY_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, UINT16, INT16); DEF_FACTORY_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT8, UINT8); + DEF_FACTORY_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT16, UINT8); + DEF_FACTORY_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT16, UINT16); break; // custom diff --git a/reference_model/src/ops/template_types.h b/reference_model/src/ops/template_types.h index 0fe9a41..2bc7e04 100644 --- a/reference_model/src/ops/template_types.h +++ b/reference_model/src/ops/template_types.h @@ -23,7 +23,7 @@ using namespace tosa; namespace TosaReference { -// Shorter aliase templates for common Eigen::Tensor types +// Shorter alias templates for common Eigen::Tensor types template <typename T> using ETensor0 = Eigen::Tensor<T, 0>; template <typename T> @@ -89,6 +89,11 @@ struct GetEigenType<DType_UINT8> using type = int32_t; }; template <> +struct GetEigenType<DType_UINT16> +{ + using type = int32_t; +}; +template <> struct GetEigenType<DType_INT4> { using type = int32_t; @@ -121,6 +126,11 @@ struct GetNumBits<DType_UINT8> static constexpr int32_t value = 8; }; template <> +struct GetNumBits<DType_UINT16> +{ + static constexpr int32_t value = 16; +}; +template <> struct GetNumBits<DType_INT4> { static constexpr int32_t value = 4; @@ -158,6 +168,11 @@ struct GetQMin<DType_UINT8> static constexpr int64_t value = 0L; }; template <> +struct GetQMin<DType_UINT16> +{ + static constexpr int64_t value = 0L; +}; +template <> struct GetQMin<DType_INT4> { static constexpr int64_t value = -8L; @@ -194,6 +209,11 @@ struct GetQMax<DType_UINT8> static constexpr int64_t value = 255L; }; template <> +struct GetQMax<DType_UINT16> +{ + static constexpr int64_t value = 65535L; +}; +template <> struct GetQMax<DType_INT4> { static constexpr int64_t value = 7L; diff --git a/reference_model/src/ops/type_conversion.cc b/reference_model/src/ops/type_conversion.cc index e46ab38..7ee9692 100644 --- a/reference_model/src/ops/type_conversion.cc +++ b/reference_model/src/ops/type_conversion.cc @@ -64,15 +64,27 @@ int OpRescale<Rank, InDtype, OutDtype>::checkTensorAttributes() ASSERT_MEM(in && out); - if ((InDtype != DType_INT8) && (InDtype != DType_UINT8) && (attribute->input_zp() != 0)) + if ((InDtype != DType_INT8) && (InDtype != DType_UINT8) && (InDtype != DType_UINT16) && (attribute->input_zp() != 0)) { - printNodeValidationError("OpRescale: Input DType not INT8/UINT8 and zero point not 0"); + printNodeValidationError("OpRescale: Input DType not INT8/UINT8/UINT16 and zero point not 0"); return 1; } - if ((OutDtype != DType_INT8) && (OutDtype != DType_UINT8) && (attribute->output_zp() != 0)) + if ((OutDtype != DType_INT8) && (OutDtype != DType_UINT8) && (OutDtype != DType_UINT16) && (attribute->output_zp() != 0)) { - printNodeValidationError("OpRescale: Output DType not INT8/UINT8 and zero point not 0"); + printNodeValidationError("OpRescale: Output DType not INT8/UINT8/UINT16 and zero point not 0"); + return 1; + } + + if ((InDtype == DType_UINT16) && ((attribute->input_zp() != 0) && (attribute->input_zp() != 32768))) + { + printNodeValidationError("OpRescale: Input DType UINT16 and zero point not 0 or 32768"); + return 1; + } + + if ((OutDtype == DType_UINT16) && ((attribute->output_zp() != 0) && (attribute->output_zp() != 32768))) + { + printNodeValidationError("OpRescale: Output DType UINT16 and zero point not 0 or 32768"); return 1; } @@ -329,4 +341,8 @@ DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT48, INT8); DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT48, INT16); DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT48, INT32); DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, UINT8, INT8); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, UINT8, INT16); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, UINT16, INT16); DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT8, UINT8); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT16, UINT8); +DEF_INSTANTIATE_RANK0_6_ONE_RANK_TWO_TYPE(OpRescale, INT16, UINT16); |