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

Change Nanos6's name to NODES

Browse Source
This commit is contained in:
Antoni Navarro 2021-12-03 16:24:41 +01:00 committed by Rodrigo Arias Mallo
parent d6c16bdb24
commit 4719917ba9
8 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -74,7 +74,7 @@ add_executable(ovniemu
emu_openmp.c
emu_ovni.c
emu_tampi.c
emu_nanos6.c
emu_nodes.c
emu_kernel.c
trace.c
ovni.c

6
cfg/cpu-nanos6-subsystem.cfg → cfg/cpu-nodes-subsystem.cfg
View File

@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1
################################################################################
< NEW DISPLAYING WINDOW CPU: Nanos6 subsystem >
< NEW DISPLAYING WINDOW CPU: NODES subsystem >
################################################################################
window_name CPU: Nanos6 subsystem
window_name CPU: NODES subsystem
window_type single
window_id 1
window_position_x 960
@ -38,6 +38,6 @@ window_labels_to_draw 1
window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
window_filter_module evt_type 1 100
window_filter_module evt_type_label 1 "CPU: Nanos6 running thread subsystem"
window_filter_module evt_type_label 1 "CPU: NODES running thread subsystem"
window_synchronize 1

6
cfg/thread-nanos6-subsystem.cfg → cfg/thread-nodes-subsystem.cfg
View File

@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1
################################################################################
< NEW DISPLAYING WINDOW Thread: Nanos6 subsystem >
< NEW DISPLAYING WINDOW Thread: NODES subsystem >
################################################################################
window_name Thread: Nanos6 subsystem
window_name Thread: NODES subsystem
window_type single
window_id 1
window_position_x 960
@ -38,6 +38,6 @@ window_labels_to_draw 1
window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } }
window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } }
window_filter_module evt_type 1 50
window_filter_module evt_type_label 1 "Thread: Nanos6 subsystem"
window_filter_module evt_type_label 1 "Thread: NODES subsystem"
window_synchronize 1

34
doc/emu_events.txt
View File

@ -101,31 +101,31 @@ MT] Task ends
MP] Parallel region begins
MP[ Parallel region ends
-------------------- Nanos6 (model=L) ----------------------
-------------------- NODES (model=D) ----------------------
LR[ Begins the registration of a task's accesses
LR] Ends the registration of a task's accesses
DR[ Begins the registration of a task's accesses
DR] Ends the registration of a task's accesses
LU[ Begins the unregistration of a task's accesses
LU] Ends the unregistration of a task's accesses
DU[ Begins the unregistration of a task's accesses
DU] Ends the unregistration of a task's accesses
LW[ Enters a blocking condition (waiting for an If0 task)
LW] Exits a blocking condition (waiting for an If0 task)
DW[ Enters a blocking condition (waiting for an If0 task)
DW] Exits a blocking condition (waiting for an If0 task)
LI[ Beings the inline execution of an If0 task
LI] Ends the inline execution of an If0 task
DI[ Beings the inline execution of an If0 task
DI] Ends the inline execution of an If0 task
LT[ Enters a taskwait
LT] Exits a taskwait
DT[ Enters a taskwait
DT] Exits a taskwait
LC[ Begins the creation of a task
LC] Ends the creation of a task
DC[ Begins the creation of a task
DC] Ends the creation of a task
LS[ Begins the submit of a task
LS] Ends the submit of a task
DS[ Begins the submit of a task
DS] Ends the submit of a task
LP[ Begins the spawn of a function
LP] Ends the spawn of a function
DP[ Begins the spawn of a function
DP] Ends the spawn of a function
-------------------- Kernel (model=K) ----------------------

4
emu.c
View File

@ -262,7 +262,7 @@ hook_init(struct ovni_emu *emu)
hook_init_nosv(emu);
hook_init_tampi(emu);
hook_init_openmp(emu);
hook_init_nanos6(emu);
hook_init_nodes(emu);
hook_init_kernel(emu);
}
@ -275,7 +275,7 @@ hook_pre(struct ovni_emu *emu)
case 'V': hook_pre_nosv(emu); break;
case 'T': hook_pre_tampi(emu); break;
case 'M': hook_pre_openmp(emu); break;
case 'L': hook_pre_nanos6(emu); break;
case 'D': hook_pre_nodes(emu); break;
case 'K': hook_pre_kernel(emu); break;
default:
break;

26
emu.h
View File

@ -88,15 +88,15 @@ enum openmp_state {
ST_OPENMP_PARALLEL = 2,
};
enum nanos6_state {
ST_NANOS6_REGISTER = 1,
ST_NANOS6_UNREGISTER = 2,
ST_NANOS6_IF0_WAIT = 3,
ST_NANOS6_IF0_INLINE = 4,
ST_NANOS6_TASKWAIT = 5,
ST_NANOS6_CREATE = 6,
ST_NANOS6_SUBMIT = 7,
ST_NANOS6_SPAWN = 8,
enum nodes_state {
ST_NODES_REGISTER = 1,
ST_NODES_UNREGISTER = 2,
ST_NODES_IF0_WAIT = 3,
ST_NODES_IF0_INLINE = 4,
ST_NODES_TASKWAIT = 5,
ST_NODES_CREATE = 6,
ST_NODES_SUBMIT = 7,
ST_NODES_SPAWN = 8,
};
enum kernel_cs_state {
@ -151,7 +151,7 @@ enum chan {
CHAN_TAMPI_MODE,
CHAN_OPENMP_MODE,
CHAN_NANOS6_SUBSYSTEM,
CHAN_NODES_SUBSYSTEM,
CHAN_KERNEL_CS,
@ -191,7 +191,7 @@ static const int chan_to_prvtype[CHAN_MAX][3] = {
{ CHAN_NOSV_SUBSYSTEM, 23, 73 },
{ CHAN_TAMPI_MODE, 30, 80 },
{ CHAN_OPENMP_MODE, 40, 90 },
{ CHAN_NANOS6_SUBSYSTEM, 50, 100 },
{ CHAN_NODES_SUBSYSTEM, 50, 100 },
{ CHAN_KERNEL_CS, 55, 105 },
};
@ -494,8 +494,8 @@ void hook_pre_tampi(struct ovni_emu *emu);
void hook_init_openmp(struct ovni_emu *emu);
void hook_pre_openmp(struct ovni_emu *emu);
void hook_init_nanos6(struct ovni_emu *emu);
void hook_pre_nanos6(struct ovni_emu *emu);
void hook_init_nodes(struct ovni_emu *emu);
void hook_pre_nodes(struct ovni_emu *emu);
void hook_init_kernel(struct ovni_emu *emu);
void hook_pre_kernel(struct ovni_emu *emu);

32
emu_nanos6.c → emu_nodes.c
View File

@ -25,7 +25,7 @@
/* --------------------------- init ------------------------------- */
void
hook_init_nanos6(struct ovni_emu *emu)
hook_init_nodes(struct ovni_emu *emu)
{
struct ovni_ethread *th;
struct ovni_cpu *cpu;
@ -46,7 +46,7 @@ hook_init_nanos6(struct ovni_emu *emu)
row = th->gindex + 1;
uth = &emu->th_chan;
chan_th_init(th, uth, CHAN_NANOS6_SUBSYSTEM, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_th, clock);
chan_th_init(th, uth, CHAN_NODES_SUBSYSTEM, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_th, clock);
}
/* Init the channels in all cpus */
@ -56,7 +56,7 @@ hook_init_nanos6(struct ovni_emu *emu)
row = cpu->gindex + 1;
ucpu = &emu->cpu_chan;
chan_cpu_init(cpu, ucpu, CHAN_NANOS6_SUBSYSTEM, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_cpu, clock);
chan_cpu_init(cpu, ucpu, CHAN_NODES_SUBSYSTEM, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_cpu, clock);
}
}
@ -69,7 +69,7 @@ pre_subsystem(struct ovni_emu *emu, int st)
struct ovni_chan *chan;
th = emu->cur_thread;
chan = &th->chan[CHAN_NANOS6_SUBSYSTEM];
chan = &th->chan[CHAN_NODES_SUBSYSTEM];
switch(emu->cur_ev->header.value)
{
@ -86,26 +86,26 @@ pre_subsystem(struct ovni_emu *emu, int st)
}
void
hook_pre_nanos6(struct ovni_emu *emu)
hook_pre_nodes(struct ovni_emu *emu)
{
if(emu->cur_ev->header.model != 'L')
die("hook_pre_nanos6: unexpected event with model %c\n",
if(emu->cur_ev->header.model != 'D')
die("hook_pre_nodes: unexpected event with model %c\n",
emu->cur_ev->header.model);
if(!emu->cur_thread->is_running)
die("hook_pre_nanos6: current thread %d not running\n",
die("hook_pre_nodes: current thread %d not running\n",
emu->cur_thread->tid);
switch(emu->cur_ev->header.category)
{
case 'R': pre_subsystem(emu, ST_NANOS6_REGISTER); break;
case 'U': pre_subsystem(emu, ST_NANOS6_UNREGISTER); break;
case 'W': pre_subsystem(emu, ST_NANOS6_IF0_WAIT); break;
case 'I': pre_subsystem(emu, ST_NANOS6_IF0_INLINE); break;
case 'T': pre_subsystem(emu, ST_NANOS6_TASKWAIT); break;
case 'C': pre_subsystem(emu, ST_NANOS6_CREATE); break;
case 'S': pre_subsystem(emu, ST_NANOS6_SUBMIT); break;
case 'P': pre_subsystem(emu, ST_NANOS6_SPAWN); break;
case 'R': pre_subsystem(emu, ST_NODES_REGISTER); break;
case 'U': pre_subsystem(emu, ST_NODES_UNREGISTER); break;
case 'W': pre_subsystem(emu, ST_NODES_IF0_WAIT); break;
case 'I': pre_subsystem(emu, ST_NODES_IF0_INLINE); break;
case 'T': pre_subsystem(emu, ST_NODES_TASKWAIT); break;
case 'C': pre_subsystem(emu, ST_NODES_CREATE); break;
case 'S': pre_subsystem(emu, ST_NODES_SUBMIT); break;
case 'P': pre_subsystem(emu, ST_NODES_SPAWN); break;
default:
break;
}

42
pcf.c
View File

@ -355,32 +355,32 @@ static const struct event_type cpu_openmp_mode = {
openmp_mode_values
};
/* ---------------- CHAN_NANOS6_SUBSYSTEM ---------------- */
/* ---------------- CHAN_NODES_SUBSYSTEM ---------------- */
static const struct event_value nanos6_mode_values[] = {
static const struct event_value nodes_mode_values[] = {
{ ST_NULL, "NULL" },
{ ST_TOO_MANY_TH, "Nanos6: Multiple threads running" },
{ ST_NANOS6_REGISTER, "Dependencies: Registering task accesses" },
{ ST_NANOS6_UNREGISTER, "Dependencies: Unregistering task accesses" },
{ ST_NANOS6_IF0_WAIT, "If0: Waiting for an If0 task" },
{ ST_NANOS6_IF0_INLINE, "If0: Executing an If0 task inline" },
{ ST_NANOS6_TASKWAIT, "Taskwait: Taskwait" },
{ ST_NANOS6_CREATE, "Add Task: Creating a task" },
{ ST_NANOS6_SUBMIT, "Add Task: Submitting a task" },
{ ST_NANOS6_SPAWN, "Spawn Function: Spawning a function" },
{ ST_TOO_MANY_TH, "NODES: Multiple threads running" },
{ ST_NODES_REGISTER, "Dependencies: Registering task accesses" },
{ ST_NODES_UNREGISTER, "Dependencies: Unregistering task accesses" },
{ ST_NODES_IF0_WAIT, "If0: Waiting for an If0 task" },
{ ST_NODES_IF0_INLINE, "If0: Executing an If0 task inline" },
{ ST_NODES_TASKWAIT, "Taskwait: Taskwait" },
{ ST_NODES_CREATE, "Add Task: Creating a task" },
{ ST_NODES_SUBMIT, "Add Task: Submitting a task" },
{ ST_NODES_SPAWN, "Spawn Function: Spawning a function" },
{ -1, NULL },
};
static const struct event_type cpu_nanos6_mode = {
0, CHAN_NANOS6_SUBSYSTEM, CHAN_CPU,
"CPU: Nanos6 subsystem of the RUNNING thread",
nanos6_mode_values
static const struct event_type cpu_nodes_mode = {
0, CHAN_NODES_SUBSYSTEM, CHAN_CPU,
"CPU: NODES subsystem of the RUNNING thread",
nodes_mode_values
};
static const struct event_type thread_nanos6_mode = {
0, CHAN_NANOS6_SUBSYSTEM, CHAN_TH,
"Thread: Nanos6 subsystem of the RUNNING thread",
nanos6_mode_values
static const struct event_type thread_nodes_mode = {
0, CHAN_NODES_SUBSYSTEM, CHAN_TH,
"Thread: NODES subsystem of the RUNNING thread",
nodes_mode_values
};
/* ---------------- CHAN_KERNEL_CS ---------------- */
@ -495,7 +495,7 @@ write_events(FILE *f, struct ovni_emu *emu)
write_event_type(f, &thread_nosv_ss);
write_event_type(f, &thread_tampi_mode);
write_event_type(f, &thread_openmp_mode);
write_event_type(f, &thread_nanos6_mode);
write_event_type(f, &thread_nodes_mode);
write_event_type(f, &thread_kernel_cs);
/* CPU */
@ -512,7 +512,7 @@ write_events(FILE *f, struct ovni_emu *emu)
write_event_type(f, &cpu_nosv_ss);
write_event_type(f, &cpu_tampi_mode);
write_event_type(f, &cpu_openmp_mode);
write_event_type(f, &cpu_nanos6_mode);
write_event_type(f, &cpu_nodes_mode);
write_event_type(f, &cpu_kernel_cs);
/* Custom */