diff options
| author | Eric Kunze <eric.kunze@arm.com> | 2023-09-11 22:50:40 +0000 |
|---|---|---|
| committer | Eric Kunze <eric.kunze@arm.com> | 2023-09-12 00:16:32 +0000 |
| commit | 29c294c4e74b1b48967cd4831f6f508500b1f1d1 (patch) | |
| tree | d5d1d36dda0c33abaa72140f18abaeeaff6deaea | |
| parent | 1b79e91d4381abdce2c0aceec7f22380c1654f06 (diff) | |
| download | serialization_lib-29c294c4e74b1b48967cd4831f6f508500b1f1d1.tar.gz | |
Add RESCALE attribute serialization missed files
These files were missing from the previous commit
Signed-off-by: Eric Kunze <eric.kunze@arm.com>
Change-Id: Ie3563cdbbceb04435dc4670b5a07482f6d96e2ef
| -rw-r--r-- | include/attribute.def | 6 | ||||
| -rw-r--r-- | include/attribute.h | 16 | ||||
| -rw-r--r-- | src/tosa_serialization_handler.cpp | 10 |
3 files changed, 30 insertions, 2 deletions
diff --git a/include/attribute.def b/include/attribute.def index 9e4c461..f3100b0 100644 --- a/include/attribute.def +++ b/include/attribute.def @@ -78,14 +78,16 @@ DEF_ATTRIBUTE(Clamp, 4, float, S, min_fp, float, S, max_fp) -DEF_ATTRIBUTE(Rescale, 7, +DEF_ATTRIBUTE(Rescale, 9, int32_t, S, input_zp, int32_t, S, output_zp, int32_t, V, multiplier, int32_t, V, shift, bool, S, scale32, bool, S, double_round, - bool, S, per_channel) + bool, S, per_channel, + bool, S, input_unsigned, + bool, S, output_unsigned) DEF_ATTRIBUTE(Mul, 1, int32_t, S, shift) diff --git a/include/attribute.h b/include/attribute.h index 1a19f62..d6c96a4 100644 --- a/include/attribute.h +++ b/include/attribute.h @@ -130,6 +130,18 @@ inline int convertFlatbuffersU8toF32(const flatbuffers::Vector<uint8_t>& in, uin DEF_ARGS_##VER(FALSE, T3, F3, V3) DEF_ARGS_##VER(FALSE, T4, F4, V4) DEF_ARGS_##VER(FALSE, T5, F5, V5) \ DEF_ARGS_##VER(FALSE, T6, F6, V6) +#define DEF_ARGS_8(VER, T0, F0, V0, T1, F1, V1, T2, F2, V2, T3, F3, V3, T4, F4, V4, T5, F5, V5, T6, F6, V6, T7, F7, \ + V7) \ + DEF_ARGS_##VER(TRUE, T0, F0, V0) DEF_ARGS_##VER(FALSE, T1, F1, V1) DEF_ARGS_##VER(FALSE, T2, F2, V2) \ + DEF_ARGS_##VER(FALSE, T3, F3, V3) DEF_ARGS_##VER(FALSE, T4, F4, V4) DEF_ARGS_##VER(FALSE, T5, F5, V5) \ + DEF_ARGS_##VER(FALSE, T6, F6, V6) DEF_ARGS_##VER(FALSE, T7, F7, V7) + +#define DEF_ARGS_9(VER, T0, F0, V0, T1, F1, V1, T2, F2, V2, T3, F3, V3, T4, F4, V4, T5, F5, V5, T6, F6, V6, T7, F7, \ + V7, T8, F8, V8) \ + DEF_ARGS_##VER(TRUE, T0, F0, V0) DEF_ARGS_##VER(FALSE, T1, F1, V1) DEF_ARGS_##VER(FALSE, T2, F2, V2) \ + DEF_ARGS_##VER(FALSE, T3, F3, V3) DEF_ARGS_##VER(FALSE, T4, F4, V4) DEF_ARGS_##VER(FALSE, T5, F5, V5) \ + DEF_ARGS_##VER(FALSE, T6, F6, V6) DEF_ARGS_##VER(FALSE, T7, F7, V7) DEF_ARGS_##VER(FALSE, T8, F8, V8) + #define DEF_VER0_VAR_DECL_PTR(NAME) const NAME* p = static_cast<const NAME*>(options); #define DEF_VER0_VAR_0(NAME) #define DEF_VER0_VAR_1(NAME) DEF_VER0_VAR_DECL_PTR(NAME) @@ -139,6 +151,8 @@ inline int convertFlatbuffersU8toF32(const flatbuffers::Vector<uint8_t>& in, uin #define DEF_VER0_VAR_5(NAME) DEF_VER0_VAR_DECL_PTR(NAME) #define DEF_VER0_VAR_6(NAME) DEF_VER0_VAR_DECL_PTR(NAME) #define DEF_VER0_VAR_7(NAME) DEF_VER0_VAR_DECL_PTR(NAME) +#define DEF_VER0_VAR_8(NAME) DEF_VER0_VAR_DECL_PTR(NAME) +#define DEF_VER0_VAR_9(NAME) DEF_VER0_VAR_DECL_PTR(NAME) #define DEF_ATTRIBUTE(NAME, NUM_ARGS, ...) \ class Tosa##NAME##Attribute : public TosaAttributeBase \ @@ -174,6 +188,8 @@ inline int convertFlatbuffersU8toF32(const flatbuffers::Vector<uint8_t>& in, uin #undef DEF_ARGS_5 #undef DEF_ARGS_6 #undef DEF_ARGS_7 +#undef DEF_ARGS_8 +#undef DEF_ARGS_9 #undef DEF_ARGS_VER0 #undef DEF_ARGS_VER1 #undef DEF_ARGS_VER2 diff --git a/src/tosa_serialization_handler.cpp b/src/tosa_serialization_handler.cpp index ef4547a..7e96313 100644 --- a/src/tosa_serialization_handler.cpp +++ b/src/tosa_serialization_handler.cpp @@ -652,6 +652,16 @@ tosa_err_t TosaSerializationHandler::Serialize() #define DEF_ARGS_7(NAME, T0, F0, V0, T1, F1, V1, T2, F2, V2, T3, F3, V3, T4, F4, V4, T5, F5, V5, T6, F6, V6) \ DEF_ARGS_##F0(NAME, T0, V0) DEF_ARGS_##F1(NAME, T1, V1) DEF_ARGS_##F2(NAME, T2, V2) DEF_ARGS_##F3(NAME, T3, V3) \ DEF_ARGS_##F4(NAME, T4, V4) DEF_ARGS_##F5(NAME, T5, V5) DEF_ARGS_##F6(NAME, T6, V6) +#define DEF_ARGS_8(NAME, T0, F0, V0, T1, F1, V1, T2, F2, V2, T3, F3, V3, T4, F4, V4, T5, F5, V5, T6, F6, V6, T7, F7, \ + V7) \ + DEF_ARGS_##F0(NAME, T0, V0) DEF_ARGS_##F1(NAME, T1, V1) DEF_ARGS_##F2(NAME, T2, V2) DEF_ARGS_##F3(NAME, T3, V3) \ + DEF_ARGS_##F4(NAME, T4, V4) DEF_ARGS_##F5(NAME, T5, V5) DEF_ARGS_##F6(NAME, T6, V6) \ + DEF_ARGS_##F7(NAME, T7, V7) +#define DEF_ARGS_9(NAME, T0, F0, V0, T1, F1, V1, T2, F2, V2, T3, F3, V3, T4, F4, V4, T5, F5, V5, T6, F6, V6, T7, F7, \ + V7, T8, F8, V8) \ + DEF_ARGS_##F0(NAME, T0, V0) DEF_ARGS_##F1(NAME, T1, V1) DEF_ARGS_##F2(NAME, T2, V2) DEF_ARGS_##F3(NAME, T3, V3) \ + DEF_ARGS_##F4(NAME, T4, V4) DEF_ARGS_##F5(NAME, T5, V5) DEF_ARGS_##F6(NAME, T6, V6) \ + DEF_ARGS_##F7(NAME, T7, V7) DEF_ARGS_##F8(NAME, T8, V8) #define DEF_ATTRIBUTE(NAME, NUM_ARGS, ...) \ case Attribute_##NAME##Attribute: \ fb_attribute = Create##NAME##Attribute(_builder DEF_ARGS_##NUM_ARGS(NAME##Attribute, __VA_ARGS__)).Union(); \ |