From c57bef14a327298bbe0e588c69fc4249547397f4 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Fri, 24 Feb 2023 16:54:40 +0100 Subject: [PATCH] Add switch-same-type emu test for Nanos6 --- test/emu/nanos6/CMakeLists.txt | 1 + test/emu/nanos6/switch-same-type.c | 59 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 test/emu/nanos6/switch-same-type.c diff --git a/test/emu/nanos6/CMakeLists.txt b/test/emu/nanos6/CMakeLists.txt index 4b39909..2ca2108 100644 --- a/test/emu/nanos6/CMakeLists.txt +++ b/test/emu/nanos6/CMakeLists.txt @@ -9,3 +9,4 @@ ovni_test(blocking.c MP) ovni_test(ss-mismatch.c SHOULD_FAIL REGEX "thread [0-9]\\+ ended with 1 stacked nanos6 subsystems") ovni_test(delayed-connect-ss.c) +ovni_test(switch-same-type.c) diff --git a/test/emu/nanos6/switch-same-type.c b/test/emu/nanos6/switch-same-type.c new file mode 100644 index 0000000..1afe26d --- /dev/null +++ b/test/emu/nanos6/switch-same-type.c @@ -0,0 +1,59 @@ +/* Copyright (c) 2023 Barcelona Supercomputing Center (BSC) + * SPDX-License-Identifier: GPL-3.0-or-later */ + +#include "instr_nanos6.h" + +#include "emu_prv.h" + +int +main(void) +{ + /* Tests that switching to a nested task of the same type produces + * duplicated events in the Paraver trace with the task type and task + * rank. */ + + instr_start(0, 1); + + uint32_t typeid = 100; + uint32_t gid = instr_nanos6_type_create(typeid); + + /* Create two tasks of the same type */ + instr_nanos6_task_create(1, typeid); + instr_nanos6_task_create(2, typeid); + + /* Change subsystem to prevent duplicates */ + instr_nanos6_task_body_enter(); + instr_nanos6_task_execute(1); + instr_nanos6_submit_task_enter(); + instr_nanos6_task_body_enter(); + instr_nanos6_task_execute(2); + + /* Match the PRV line in the trace */ + FILE *f = fopen("match.sh", "w"); + if (f == NULL) + die("fopen failed:"); + + /* Check the task type */ + int prvtype = PRV_NANOS6_TYPE; + int64_t t = get_delta(); + fprintf(f, "grep ':%ld:%d:%d$' ovni/thread.prv\n", t, prvtype, gid); + fprintf(f, "grep ':%ld:%d:%d$' ovni/cpu.prv\n", t, prvtype, gid); + + /* Check the rank */ + prvtype = PRV_NANOS6_RANK; + int rank = 0 + 1; /* Starts at one */ + fprintf(f, "grep ':%ld:%d:%d$' ovni/thread.prv\n", t, prvtype, rank); + fprintf(f, "grep ':%ld:%d:%d$' ovni/cpu.prv\n", t, prvtype, rank); + fclose(f); + + /* Exit from tasks and subsystem */ + instr_nanos6_task_end(2); + instr_nanos6_task_body_exit(); + instr_nanos6_submit_task_exit(); + instr_nanos6_task_end(1); + instr_nanos6_task_body_exit(); + + instr_end(); + + return 0; +}