From 7cf69d055a1d550508d6a733b79e7e80b03d2122 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Fri, 25 Oct 2024 10:58:28 +0200
Subject: [PATCH] Remove ovni as explictly required model

It is already added as a requirement in ovni_thead_init().
---
 test/emu/common/instr.h           | 1 -
 test/emu/nosv/multiple-segment.c  | 1 -
 test/emu/ovni/clockgate.c         | 1 -
 test/emu/ovni/merge-cpus-loom.c   | 1 -
 test/emu/ovni/sort-cpus-by-loom.c | 1 -
 test/emu/ovni/sort-cpus-by-rank.c | 1 -
 test/emu/ovni/tmpdir-metadata.c   | 3 +--
 7 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/test/emu/common/instr.h b/test/emu/common/instr.h
index 12061f1..a45956d 100644
--- a/test/emu/common/instr.h
+++ b/test/emu/common/instr.h
@@ -116,7 +116,6 @@ instr_start(int rank, int nranks)
 	dbg("thread %d has cpu %d (ncpus=%d)",
 			get_tid(), curcpu, nranks);
 
-	instr_require("ovni");
 	instr_thread_execute(curcpu, -1, 0);
 }
 
diff --git a/test/emu/nosv/multiple-segment.c b/test/emu/nosv/multiple-segment.c
index 8e2aee9..b00debd 100644
--- a/test/emu/nosv/multiple-segment.c
+++ b/test/emu/nosv/multiple-segment.c
@@ -47,7 +47,6 @@ main(void)
 	int nlooms = nranks / N;
 	int lcpu = rank % N;
 
-	instr_require("ovni");
 	instr_nosv_init();
 	instr_thread_execute(lcpu, -1, 0);
 
diff --git a/test/emu/ovni/clockgate.c b/test/emu/ovni/clockgate.c
index 24c4152..8eca3dc 100644
--- a/test/emu/ovni/clockgate.c
+++ b/test/emu/ovni/clockgate.c
@@ -39,7 +39,6 @@ start_delayed(int rank, int nranks)
 	ovni_proc_init(1, rankname, getpid());
 	ovni_thread_init(get_tid());
 	ovni_proc_set_rank(rank, nranks);
-	instr_require("ovni");
 
 	/* All ranks inform CPUs */
 	for (int i = 0; i < nranks; i++)
diff --git a/test/emu/ovni/merge-cpus-loom.c b/test/emu/ovni/merge-cpus-loom.c
index 7d6f950..60e0db7 100644
--- a/test/emu/ovni/merge-cpus-loom.c
+++ b/test/emu/ovni/merge-cpus-loom.c
@@ -31,7 +31,6 @@ start(int rank, int nranks)
 	dbg("thread %d has cpu %d (ncpus=%d)",
 			get_tid(), curcpu, nranks);
 
-	instr_require("ovni");
 	instr_thread_execute(curcpu, -1, 0);
 }
 
diff --git a/test/emu/ovni/sort-cpus-by-loom.c b/test/emu/ovni/sort-cpus-by-loom.c
index c143a57..c80aef6 100644
--- a/test/emu/ovni/sort-cpus-by-loom.c
+++ b/test/emu/ovni/sort-cpus-by-loom.c
@@ -35,7 +35,6 @@ main(void)
 	for (int i = 0; i < N; i++)
 		ovni_add_cpu(i, cpus[i]);
 
-	instr_require("ovni");
 	instr_thread_execute(-1, -1, 0);
 
 	instr_end();
diff --git a/test/emu/ovni/sort-cpus-by-rank.c b/test/emu/ovni/sort-cpus-by-rank.c
index ecb036e..d18056b 100644
--- a/test/emu/ovni/sort-cpus-by-rank.c
+++ b/test/emu/ovni/sort-cpus-by-rank.c
@@ -36,7 +36,6 @@ main(void)
 	for (int i = 0; i < N; i++)
 		ovni_add_cpu(i, cpus[i]);
 
-	instr_require("ovni");
 	instr_thread_execute(-1, -1, 0);
 
 	instr_end();
diff --git a/test/emu/ovni/tmpdir-metadata.c b/test/emu/ovni/tmpdir-metadata.c
index f63637c..9ad7ee8 100644
--- a/test/emu/ovni/tmpdir-metadata.c
+++ b/test/emu/ovni/tmpdir-metadata.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2023 Barcelona Supercomputing Center (BSC)
+/* Copyright (c) 2023-2024 Barcelona Supercomputing Center (BSC)
  * SPDX-License-Identifier: GPL-3.0-or-later */
 
 #include <stdlib.h>
@@ -13,7 +13,6 @@ main(void)
 	ovni_thread_init(123);
 
 	ovni_add_cpu(0, 0);
-	instr_require("ovni");
 
 	instr_thread_execute(0, -1, 0);
 	instr_end();