From 391cc5e80559e46081b6aa12c344d820dc685c95 Mon Sep 17 00:00:00 2001 From: Jerry Ge Date: Sat, 5 Aug 2023 00:23:28 +0000 Subject: Update TosaVersion compatibility check to match with serialization_lib Serialization_lib change: https://eu-gerrit-1.euhpc.arm.com/c/mltech/mirrors/tosa/serialization_lib/+/542261 Signed-off-by: Jerry Ge Change-Id: I59752a3ba7981c356634b911160cedf30fb2599e --- reference_model/src/main.cpp | 7 ++++--- reference_model/src/model_runner_impl.cc | 7 ++++--- thirdparty/serialization_lib | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/reference_model/src/main.cpp b/reference_model/src/main.cpp index 070eb33..cb7f0a2 100644 --- a/reference_model/src/main.cpp +++ b/reference_model/src/main.cpp @@ -54,13 +54,14 @@ int main(int argc, char** argv) } TosaSerializationHandler tsh; - TosaVersion::compat_t is_compat = model_version.is_compatible(tsh.GetVersion()); + TosaVersion::compat_t is_compat = TosaVersion::is_compatible(model_version, tsh.GetVersion()); + switch (is_compat) { case TosaVersion::compat_t::COMPLETELY_COMPATIBLE: break; - case TosaVersion::compat_t::PARTIALLY_COMPATIBLE: - printf("WARNING: Reference model version %s is partially compatible with serializer version %s\n", + case TosaVersion::compat_t::BACKWARD_COMPATIBLE: + printf("WARNING: Reference model version %s is backward compatible with serializer version %s\n", model_version.to_string().c_str(), tsh.GetVersion().to_string().c_str()); break; case TosaVersion::compat_t::NOT_COMPATIBLE: diff --git a/reference_model/src/model_runner_impl.cc b/reference_model/src/model_runner_impl.cc index be97644..ca45e19 100644 --- a/reference_model/src/model_runner_impl.cc +++ b/reference_model/src/model_runner_impl.cc @@ -341,13 +341,14 @@ void ModelRunnerImpl::validateTosaVersion(TosaSerializationHandler& serializatio TosaVersion model_version(TOSA_REFERENCE_MODEL_VERSION_MAJOR, TOSA_REFERENCE_MODEL_VERSION_MINOR, TOSA_REFERENCE_MODEL_VERSION_PATCH, TOSA_REFERENCE_MODEL_VERSION_DRAFT); - TosaVersion::compat_t is_compat = model_version.is_compatible(serialization_handler.GetVersion()); + TosaVersion::compat_t is_compat = TosaVersion::is_compatible(model_version, serialization_handler.GetVersion()); + switch (is_compat) { case TosaVersion::compat_t::COMPLETELY_COMPATIBLE: break; - case TosaVersion::compat_t::PARTIALLY_COMPATIBLE: - WARNING("Reference model version %s is partially compatible with serializer version %s.", + case TosaVersion::compat_t::BACKWARD_COMPATIBLE: + WARNING("Reference model version %s is backward compatible with serializer version %s.", model_version.to_string().c_str(), serialization_handler.GetVersion().to_string().c_str()); break; case TosaVersion::compat_t::NOT_COMPATIBLE: diff --git a/thirdparty/serialization_lib b/thirdparty/serialization_lib index 39b5edc..c4733b0 160000 --- a/thirdparty/serialization_lib +++ b/thirdparty/serialization_lib @@ -1 +1 @@ -Subproject commit 39b5edc49734e08ca6d1c0b091416a04b2f60beb +Subproject commit c4733b015781b044041955997f79c4667eb841a0 -- cgit v1.2.1