validation: use use mem_model from helper options

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Reviewed-by: Petri Savolainen <petri.savolainen@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

8 files changed, 94 insertions, 8 deletions

diff --git a/test/common/odp_cunit_common.c b/test/common/odp_cunit_common.c
index ed0651ada..7f345fba3 100644
--- a/test/common/odp_cunit_common.c
+++ b/test/common/odp_cunit_common.c
@@ -79,7 +79,18 @@ int odp_cunit_thread_exit(pthrd_arg *arg)
 
 static int tests_global_init(odp_instance_t *inst)
 {
-	if (0 != odp_init_global(inst, NULL, NULL)) {
+	odp_init_t init_param;
+	odph_helper_options_t helper_options;
+
+	if (odph_options(&helper_options)) {
+		fprintf(stderr, "error: odph_options() failed.\n");
+		return -1;
+	}
+
+	odp_init_param_init(&init_param);
+	init_param.mem_model = helper_options.mem_model;
+
+	if (0 != odp_init_global(inst, &init_param, NULL)) {
 		fprintf(stderr, "error: odp_init_global() failed.\n");
 		return -1;
 	}
diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c
index a755aef9c..9530df9ca 100644
--- a/test/validation/api/atomic/atomic.c
+++ b/test/validation/api/atomic/atomic.c
@@ -8,6 +8,7 @@
 
 #include <malloc.h>
 #include <odp_api.h>
+#include <odp/helper/odph_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
 #include <unistd.h>
@@ -554,8 +555,18 @@ static int atomic_init(odp_instance_t *inst)
 	uint32_t workers_count, max_threads;
 	int ret = 0;
 	odp_cpumask_t mask;
+	odp_init_t init_param;
+	odph_helper_options_t helper_options;
 
-	if (0 != odp_init_global(inst, NULL, NULL)) {
+	if (odph_options(&helper_options)) {
+		fprintf(stderr, "error: odph_options() failed.\n");
+		return -1;
+	}
+
+	odp_init_param_init(&init_param);
+	init_param.mem_model = helper_options.mem_model;
+
+	if (0 != odp_init_global(inst, &init_param, NULL)) {
 		fprintf(stderr, "error: odp_init_global() failed.\n");
 		return -1;
 	}
diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c
index a3be4be46..806f2486a 100644
--- a/test/validation/api/barrier/barrier.c
+++ b/test/validation/api/barrier/barrier.c
@@ -8,6 +8,7 @@
 
 #include <malloc.h>
 #include <odp_api.h>
+#include <odp/helper/odph_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
 #include <unistd.h>
@@ -329,8 +330,18 @@ static int barrier_init(odp_instance_t *inst)
 	uint32_t workers_count, max_threads;
 	int ret = 0;
 	odp_cpumask_t mask;
+	odp_init_t init_param;
+	odph_helper_options_t helper_options;
 
-	if (0 != odp_init_global(inst, NULL, NULL)) {
+	if (odph_options(&helper_options)) {
+		fprintf(stderr, "error: odph_options() failed.\n");
+		return -1;
+	}
+
+	odp_init_param_init(&init_param);
+	init_param.mem_model = helper_options.mem_model;
+
+	if (0 != odp_init_global(inst, &init_param, NULL)) {
 		fprintf(stderr, "error: odp_init_global() failed.\n");
 		return -1;
 	}
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index 5b395c2a6..e8cc1547f 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -7,6 +7,7 @@
 #include "config.h"
 
 #include <odp_api.h>
+#include <odp/helper/odph_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
 #include "test_vectors.h"
@@ -2029,8 +2030,18 @@ static int crypto_init(odp_instance_t *inst)
 	odp_pool_t pool;
 	odp_queue_t out_queue;
 	odp_pool_capability_t pool_capa;
+	odp_init_t init_param;
+	odph_helper_options_t helper_options;
 
-	if (0 != odp_init_global(inst, NULL, NULL)) {
+	if (odph_options(&helper_options)) {
+		fprintf(stderr, "error: odph_options() failed.\n");
+		return -1;
+	}
+
+	odp_init_param_init(&init_param);
+	init_param.mem_model = helper_options.mem_model;
+
+	if (0 != odp_init_global(inst, &init_param, NULL)) {
 		fprintf(stderr, "error: odp_init_global() failed.\n");
 		return -1;
 	}
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index f10c4c290..f82c561a0 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -910,8 +910,18 @@ int ipsec_init(odp_instance_t *inst)
 	odp_queue_t out_queue;
 	odp_pool_capability_t pool_capa;
 	odp_pktio_t pktio;
+	odp_init_t init_param;
+	odph_helper_options_t helper_options;
 
-	if (0 != odp_init_global(inst, NULL, NULL)) {
+	if (odph_options(&helper_options)) {
+		fprintf(stderr, "error: odph_options() failed.\n");
+		return -1;
+	}
+
+	odp_init_param_init(&init_param);
+	init_param.mem_model = helper_options.mem_model;
+
+	if (0 != odp_init_global(inst, &init_param, NULL)) {
 		fprintf(stderr, "error: odp_init_global() failed.\n");
 		return -1;
 	}
diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock/lock.c
index 67e1e3c8c..b8502f011 100644
--- a/test/validation/api/lock/lock.c
+++ b/test/validation/api/lock/lock.c
@@ -8,6 +8,7 @@
 
 #include <malloc.h>
 #include <odp_api.h>
+#include <odp/helper/odph_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
 #include <unistd.h>
@@ -1163,8 +1164,18 @@ static int lock_init(odp_instance_t *inst)
 	uint32_t workers_count, max_threads;
 	int ret = 0;
 	odp_cpumask_t mask;
+	odp_init_t init_param;
+	odph_helper_options_t helper_options;
 
-	if (0 != odp_init_global(inst, NULL, NULL)) {
+	if (odph_options(&helper_options)) {
+		fprintf(stderr, "error: odph_options() failed.\n");
+		return -1;
+	}
+
+	odp_init_param_init(&init_param);
+	init_param.mem_model = helper_options.mem_model;
+
+	if (0 != odp_init_global(inst, &init_param, NULL)) {
 		fprintf(stderr, "error: odp_init_global() failed.\n");
 		return -1;
 	}
diff --git a/test/validation/api/thread/thread.c b/test/validation/api/thread/thread.c
index d977f977a..7b40cda62 100644
--- a/test/validation/api/thread/thread.c
+++ b/test/validation/api/thread/thread.c
@@ -7,6 +7,7 @@
 #include "config.h"
 
 #include <odp_api.h>
+#include <odp/helper/odph_api.h>
 #include <odp_cunit_common.h>
 #include <mask_common.h>
 #include <test_debug.h>
@@ -24,8 +25,18 @@ static global_shared_mem_t *global_mem;
 static int thread_global_init(odp_instance_t *inst)
 {
 	odp_shm_t global_shm;
+	odp_init_t init_param;
+	odph_helper_options_t helper_options;
 
-	if (0 != odp_init_global(inst, NULL, NULL)) {
+	if (odph_options(&helper_options)) {
+		fprintf(stderr, "error: odph_options() failed.\n");
+		return -1;
+	}
+
+	odp_init_param_init(&init_param);
+	init_param.mem_model = helper_options.mem_model;
+
+	if (0 != odp_init_global(inst, &init_param, NULL)) {
 		fprintf(stderr, "error: odp_init_global() failed.\n");
 		return -1;
 	}
diff --git a/test/validation/api/timer/timer.c b/test/validation/api/timer/timer.c
index 968812c8d..ab5bc2dec 100644
--- a/test/validation/api/timer/timer.c
+++ b/test/validation/api/timer/timer.c
@@ -61,8 +61,18 @@ static global_shared_mem_t *global_mem;
 static int timer_global_init(odp_instance_t *inst)
 {
 	odp_shm_t global_shm;
+	odp_init_t init_param;
+	odph_helper_options_t helper_options;
 
-	if (0 != odp_init_global(inst, NULL, NULL)) {
+	if (odph_options(&helper_options)) {
+		fprintf(stderr, "error: odph_options() failed.\n");
+		return -1;
+	}
+
+	odp_init_param_init(&init_param);
+	init_param.mem_model = helper_options.mem_model;
+
+	if (0 != odp_init_global(inst, &init_param, NULL)) {
 		fprintf(stderr, "error: odp_init_global() failed.\n");
 		return -1;
 	}