[MODEL/META] Verify the magiccode in npubinfmt's metadata

This commit verifies the magiccode in npubinfmt's metadata.
Also, it updates related unitttests to use the default magiccode.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>

diff --git a/src/core/ne-handler.c b/src/core/ne-handler.c
index b5a6bc6..ead6999 100644 (file)
--- a/src/core/ne-handler.c
+++ b/src/core/ne-handler.c
@@ -137,6 +137,12 @@ parse_model_meta (model_priv* mpriv, void *binary)
 
   memcpy (meta, binary, NPUBIN_META_SIZE);
 
+  /* check the metadata is really for SRNPU HW */
+  if (!CHECK_NPUBIN(meta->magiccode)) {
+    logerr (TAG, "invalid magiccode %llx\n", meta->magiccode);
+    return -EINVAL;
+  }
+
   return 0;
 }
 
@@ -251,6 +257,7 @@ handler_register_model (hwmem *hwmem, uint64_t *id, uint64_t *version)
     hpriv.model_size += hwmem->size;
   } else {
     /* set dummy metadata */
+    mpriv->meta.magiccode = NPUBIN_MAGICCODE | 0x1;
     mpriv->meta.type = SMODEL_OPS_NPU_ASR;
     mpriv->meta.size = 0;
     mpriv->meta.buffer_size = 4096;

diff --git a/src/test/apptests/async_callbacks.c b/src/test/apptests/async_callbacks.c
index 950d9c8..b42580d 100644 (file)
--- a/src/test/apptests/async_callbacks.c
+++ b/src/test/apptests/async_callbacks.c
@@ -87,6 +87,7 @@ run_inference (npudev_h dev)
   /* make dummy model data */
   npubin_meta meta = {
     /* below are compiler stuff */
+    .magiccode = NPUBIN_MAGICCODE | 0x1,
     .name = "dummy model",
     .model_id = 1,
     .model_version = 1,

diff --git a/src/test/apptests/dmabuf_buffers.c b/src/test/apptests/dmabuf_buffers.c
index e9a88a4..1e9b195 100644 (file)
--- a/src/test/apptests/dmabuf_buffers.c
+++ b/src/test/apptests/dmabuf_buffers.c
@@ -24,11 +24,11 @@
 #include "../../core/ne-conf.h"
 
 /** @brief compare output result with the golden data */
-static int 
+static int
 compare_result (const void *data, uint32_t size)
 {
   /* @todo */
-  return 0; 
+  return 0;
 }
 
 /** @brief inference entry */
@@ -54,6 +54,7 @@ run_inference (npudev_h dev)
   /* make dummy model data */
   npubin_meta meta = {
     /* below are compiler stuff */
+    .magiccode = NPUBIN_MAGICCODE | 0x1,
     .name = "dummy model",
     .model_id = 1,
     .model_version = 1,

diff --git a/src/test/apptests/dmabuf_model.c b/src/test/apptests/dmabuf_model.c
index 346d30c..8517444 100644 (file)
--- a/src/test/apptests/dmabuf_model.c
+++ b/src/test/apptests/dmabuf_model.c
@@ -24,11 +24,11 @@
 #include "../../core/ne-conf.h"
 
 /** @brief compare output result with the golden data */
-static int 
+static int
 compare_result (const void *data, uint32_t size)
 {
   /* @todo */
-  return 0; 
+  return 0;
 }
 
 /** @brief inference entry */
@@ -54,6 +54,7 @@ run_inference (npudev_h dev)
   /* make dummy model data */
   npubin_meta meta = {
     /* below are compiler stuff */
+    .magiccode = NPUBIN_MAGICCODE | 0x1,
     .name = "dummy model",
     .model_id = 1,
     .model_version = 1,

diff --git a/src/test/apptests/dummy_inference.c b/src/test/apptests/dummy_inference.c
index f6a88e1..7e0236c 100644 (file)
--- a/src/test/apptests/dummy_inference.c
+++ b/src/test/apptests/dummy_inference.c
@@ -25,11 +25,11 @@
 #include "../ne_test_utils.h"
 
 /** @brief compare output result with the golden data */
-static int 
+static int
 compare_result (const void *data, uint32_t size)
 {
   /* @todo */
-  return 0; 
+  return 0;
 }
 
 /** @brief inference entry */
@@ -55,6 +55,7 @@ run_inference (npudev_h dev)
   /* make dummy model data */
   npubin_meta meta = {
     /* below are compiler stuff */
+    .magiccode = NPUBIN_MAGICCODE | 0x1,
     .name = "dummy model",
     .model_id = 1,
     .model_version = 1,

diff --git a/src/test/apptests/example_visa.c b/src/test/apptests/example_visa.c
index b017902..e46f35f 100644 (file)
--- a/src/test/apptests/example_visa.c
+++ b/src/test/apptests/example_visa.c
@@ -27,7 +27,7 @@ static int total_succs;
 static int total_fails;
 
 /** @brief compare output result with the golden data */
-static int 
+static int
 compare_result (const char *golden_path, const char *output_data, uint64_t output_size)
 {
   FILE *fp = fopen (golden_path, "r");
@@ -209,13 +209,13 @@ main (int argc, char **argv)
   }
 
   total_succs = total_fails = 0;
-  
+
   result = run_inference (dev, argv[1]);
 
   fprintf(stderr, "[APPTEST] %s: %s (%d/%d)\n", argv[0],
       result == 0 ? "PASSED" : "FAILED",
       total_succs, total_succs + total_fails);
- 
+
   free (dev);
 
   return result;

diff --git a/src/test/unittests/ne_core_comm_ip_test.cpp b/src/test/unittests/ne_core_comm_ip_test.cpp
index f6a9362..7dbecbc 100644 (file)
--- a/src/test/unittests/ne_core_comm_ip_test.cpp
+++ b/src/test/unittests/ne_core_comm_ip_test.cpp
@@ -101,6 +101,7 @@ const size_t output_size = 2048;
  * @param[in] name a string to be set to the name member of this meta
  */
 static inline void set_default_val_to_meta (npubin_meta *meta, const char *name) {
+  meta->magiccode = NPUBIN_MAGICCODE | 0x1;
   if (!name) {
     strncpy (meta->name, "", max_len_model_name - 1);
   } else {

diff --git a/src/test/unittests/ne_core_handler_test.cpp b/src/test/unittests/ne_core_handler_test.cpp
index 4b9392e..ce37832 100644 (file)
--- a/src/test/unittests/ne_core_handler_test.cpp
+++ b/src/test/unittests/ne_core_handler_test.cpp
@@ -25,7 +25,7 @@ extern "C"
 }
 
 /** configuration to fill the model meta */
-#define MAGICCODE 0x10101101
+#define MAGICCODE (NPUBIN_MAGICCODE | 0x1)
 
 static const hostHandlerInfo *host_handle = NULL;
 

diff --git a/src/test/unittests/ne_core_inf_test.cpp b/src/test/unittests/ne_core_inf_test.cpp
index 24e7647..4420b5e 100644 (file)
--- a/src/test/unittests/ne_core_inf_test.cpp
+++ b/src/test/unittests/ne_core_inf_test.cpp
@@ -25,7 +25,7 @@ extern "C"
 }
 
 /** configuration to fill the model meta */
-#define MAGICCODE 0x10101101
+#define MAGICCODE (NPUBIN_MAGICCODE | 0x1)
 #define STOP_SLEEP 1
 #define SLEEP_DURATION 2