From 6c35d632f25b64ea071012d65b246bd54bc81574 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Fri, 10 Dec 2021 17:12:27 +0100 Subject: [PATCH] Add test with multiple processes --- test/CMakeLists.txt | 5 ++ test/mp-driver.sh | 43 ++++++++++++++ test/mp-simple.c | 135 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100755 test/mp-driver.sh create mode 100644 test/mp-simple.c diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index e826419..b459ff1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -20,3 +20,8 @@ add_executable(flush flush.c) target_link_libraries(flush ovni) add_test(NAME flush COMMAND "${OVNI_TEST_DIR}/driver.sh" flush) + +add_executable(mp-simple mp-simple.c) +target_link_libraries(mp-simple ovni) + +add_test(NAME mp-simple COMMAND "${OVNI_TEST_DIR}/mp-driver.sh" mp-simple) diff --git a/test/mp-driver.sh b/test/mp-driver.sh new file mode 100755 index 0000000..a1248ed --- /dev/null +++ b/test/mp-driver.sh @@ -0,0 +1,43 @@ +#!/bin/sh +# +# Copyright (c) 2021 Barcelona Supercomputing Center (BSC) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +set -e + +testname="$1" + +if [ -z "$2" ]; then + NPROCS=4 +else + NPROCS="$2" +fi + +tracedir="ovni" +emubin=../ovniemu + +rm -rf "$tracedir" + +for i in $(seq 1 $NPROCS); do + # Run the test in the background + OVNI_RANK=$(($i-1)) OVNI_NRANKS=$NPROCS "./$testname" & +done + +wait + +# Then launch the emulator in lint mode +"$emubin" -l "$tracedir" + +#rm -rf $tracedir diff --git a/test/mp-simple.c b/test/mp-simple.c new file mode 100644 index 0000000..3d8a389 --- /dev/null +++ b/test/mp-simple.c @@ -0,0 +1,135 @@ +/* + * Copyright (c) 2021 Barcelona Supercomputing Center (BSC) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#define _GNU_SOURCE + +#include "ovni.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void fail(const char *msg) +{ + fprintf(stderr, "%s\n", msg); + abort(); +} + +static inline void emit_ev(char *mcv) +{ + struct ovni_ev ev = { 0 }; + + ovni_ev_set_mcv(&ev, mcv); + ovni_ev_set_clock(&ev, ovni_clock_now()); + ovni_ev_emit(&ev); +} + +#define INSTR_3ARG(name, mcv, ta, a, tb, b, tc, c) \ + static inline void name(ta a, tb b, tc c) \ + { \ + struct ovni_ev ev = {0}; \ + ovni_ev_set_mcv(&ev, mcv); \ + ovni_ev_set_clock(&ev, ovni_clock_now()); \ + ovni_payload_add(&ev, (uint8_t *)&a, sizeof(a)); \ + ovni_payload_add(&ev, (uint8_t *)&b, sizeof(b)); \ + ovni_payload_add(&ev, (uint8_t *)&c, sizeof(c)); \ + ovni_ev_emit(&ev); \ + } + +INSTR_3ARG(instr_thread_execute, "OHx", int32_t, cpu, int32_t, creator_tid, uint64_t, tag) + +static inline void instr_thread_end(void) +{ + struct ovni_ev ev = {0}; + + ovni_ev_set_mcv(&ev, "OHe"); + ovni_ev_set_clock(&ev, ovni_clock_now()); + ovni_ev_emit(&ev); + + // Flush the events to disk before killing the thread + ovni_flush(); +} + +static inline void instr_start(int rank) +{ + cpu_set_t mask; + char hostname[HOST_NAME_MAX]; + int i, j = 0, curcpu = -1; + int last_phy; + + if(gethostname(hostname, HOST_NAME_MAX) != 0) + fail("gethostname failed"); + + if(sched_getaffinity(0, sizeof(mask), &mask) < 0) + fail("sched_getaffinity failed"); + + ovni_proc_init(1, hostname, getpid()); + ovni_thread_init(gettid()); + + /* Only the rank 0 inform about all CPUs */ + if(rank == 0) + { + for(i=0; i < CPU_SETSIZE; i++) + { + if(CPU_ISSET(i, &mask)) + { + last_phy = i; + + if (rank == 0) + ovni_add_cpu(j++, i); + } + } + } + + if(CPU_COUNT(&mask) == 1) + curcpu = last_phy; + else + curcpu = -1; + + fprintf(stderr, "thread %d has cpu %d (ncpus=%d)\n", + gettid(), curcpu, CPU_COUNT(&mask)); + + instr_thread_execute(curcpu, -1, 0); +} + +static inline void instr_end(void) +{ + instr_thread_end(); + ovni_thread_free(); + ovni_proc_fini(); +} + +int main(void) +{ + int rank = atoi(getenv("OVNI_RANK")); + //int nranks = atoi(getenv("OVNI_NRANKS")); + + instr_start(rank); + + usleep(50 * 1000); + + instr_end(); + + return 0; +} +