rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add support for sponge subsystem state in Nanos6

Browse Source
This commit is contained in:
Rodrigo Arias 2023-04-11 20:18:18 +02:00 committed by Rodrigo Arias Mallo
parent 171e439bd4
commit 6cafd347ce
5 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/nanos6/event.c
View File

@ -35,6 +35,8 @@ static const int ss_table[256][256][3] = {
['S'] = { CHSS, POP, ST_SUSPEND }, ['S'] = { CHSS, POP, ST_SUSPEND },
['r'] = { CHSS, PUSH, ST_RESUME }, ['r'] = { CHSS, PUSH, ST_RESUME },
['R'] = { CHSS, POP, ST_RESUME }, ['R'] = { CHSS, POP, ST_RESUME },
['g'] = { CHSS, PUSH, ST_SPONGE },
['G'] = { CHSS, POP, ST_SPONGE },
['*'] = { CHSS, IGN, -1 }, ['*'] = { CHSS, IGN, -1 },
}, },
['P'] = { ['P'] = {

1
src/emu/nanos6/nanos6_priv.h
View File

@ -49,6 +49,7 @@ enum nanos6_ss_state {
ST_MIGRATE, ST_MIGRATE,
ST_SUSPEND, ST_SUSPEND,
ST_RESUME, ST_RESUME,
ST_SPONGE,
/* Value 51 is broken in old Paraver */ /* Value 51 is broken in old Paraver */
EV_SCHED_RECV = 60, EV_SCHED_RECV = 60,

1
test/emu/nanos6/CMakeLists.txt
View File

@ -10,5 +10,6 @@ test_emu(ss-mismatch.c SHOULD_FAIL
REGEX "thread [0-9]\\+ ended with 1 stacked nanos6 subsystems") REGEX "thread [0-9]\\+ ended with 1 stacked nanos6 subsystems")
test_emu(delayed-connect-ss.c) test_emu(delayed-connect-ss.c)
test_emu(switch-same-type.c) test_emu(switch-same-type.c)
test_emu(sponge.c)
test_emu(breakdown-no-black.c BREAKDOWN) test_emu(breakdown-no-black.c BREAKDOWN)

2
test/emu/nanos6/instr_nanos6.h
View File

@ -62,6 +62,8 @@ INSTR_0ARG(instr_nanos6_suspend_enter, "6Ws")
INSTR_0ARG(instr_nanos6_suspend_exit, "6WS") INSTR_0ARG(instr_nanos6_suspend_exit, "6WS")
INSTR_0ARG(instr_nanos6_resume_enter, "6Wr") INSTR_0ARG(instr_nanos6_resume_enter, "6Wr")
INSTR_0ARG(instr_nanos6_resume_exit, "6WR") INSTR_0ARG(instr_nanos6_resume_exit, "6WR")
INSTR_0ARG(instr_nanos6_sponge_enter, "6Wg")
INSTR_0ARG(instr_nanos6_sponge_exit, "6WG")
INSTR_0ARG(instr_nanos6_signal, "6W*") INSTR_0ARG(instr_nanos6_signal, "6W*")
INSTR_0ARG(instr_nanos6_submit_task_enter, "6U[") INSTR_0ARG(instr_nanos6_submit_task_enter, "6U[")

42
test/emu/nanos6/sponge.c Normal file
View File

@ -0,0 +1,42 @@
/* Copyright (c) 2023 Barcelona Supercomputing Center (BSC)
* SPDX-License-Identifier: GPL-3.0-or-later */
#include <stdint.h>
#include <stdio.h>
#include "common.h"
#include "emu_prv.h"
#include "instr.h"
#include "instr_nanos6.h"
#include "nanos6/nanos6_priv.h"
int
main(void)
{
instr_start(0, 1);
instr_nanos6_sponge_enter();
/* Match the PRV line in the trace */
FILE *f = fopen("match.sh", "w");
if (f == NULL)
die("fopen failed:");
int type = PRV_NANOS6_SUBSYSTEM;
int64_t t = get_delta();
int value = ST_SPONGE;
fprintf(f, "grep ':%ld:%d:%d$' ovni/thread.prv\n", t, type, value);
fprintf(f, "grep ':%ld:%d:%d$' ovni/cpu.prv\n", t, type, value);
instr_nanos6_sponge_exit();
t = get_delta();
value = 0;
fprintf(f, "grep ':%ld:%d:%d$' ovni/thread.prv\n", t, type, value);
fprintf(f, "grep ':%ld:%d:%d$' ovni/cpu.prv\n", t, type, value);
fclose(f);
instr_end();
return 0;
}