aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry Ge <jerry.ge@arm.com>2023-08-05 00:23:28 +0000
committerTai Ly <tai.ly@arm.com>2023-09-06 21:50:28 +0000
commit391cc5e80559e46081b6aa12c344d820dc685c95 (patch)
tree36f7aadc7151d5028c210f565076fba045c09e6a
parentfe03f80b4ed28a4901d6419a150b2ae912c923a5 (diff)
downloadreference_model-391cc5e80559e46081b6aa12c344d820dc685c95.tar.gz
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 <jerry.ge@arm.com> Change-Id: I59752a3ba7981c356634b911160cedf30fb2599e
-rw-r--r--reference_model/src/main.cpp7
-rw-r--r--reference_model/src/model_runner_impl.cc7
m---------thirdparty/serialization_lib0
3 files changed, 8 insertions, 6 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
-Subproject 39b5edc49734e08ca6d1c0b091416a04b2f60be
+Subproject c4733b015781b044041955997f79c4667eb841a