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

Further renames of Nanos6 labels and others

Browse Source
This commit is contained in:
Antoni Navarro 2021-11-12 16:15:33 +01:00
parent c9b189feb8
commit dc6713f75c
8 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1
################################################################################ ################################################################################
< NEW DISPLAYING WINDOW Thread: Nanos6 mode > < NEW DISPLAYING WINDOW CPU: Nanos6 subsystem >
################################################################################ ################################################################################
window_name CPU: Nanos6 mode window_name CPU: Nanos6 subsystem
window_type single window_type single
window_id 1 window_id 1
window_position_x 960 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_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_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 1 100
window_filter_module evt_type_label 1 "CPU: Nanos6 running thread mode" window_filter_module evt_type_label 1 "CPU: Nanos6 running thread subsystem"
window_synchronize 1 window_synchronize 1

2
cfg/cpu-openmp-mode.cfg
View File

@ -4,7 +4,7 @@ ConfigFile.NumWindows: 1
################################################################################ ################################################################################
< NEW DISPLAYING WINDOW Thread: OpenMP mode > < NEW DISPLAYING WINDOW CPU: OpenMP mode >
################################################################################ ################################################################################
window_name CPU: OpenMP mode window_name CPU: OpenMP mode
window_type single window_type single

2
cfg/cpu-tampi-mode.cfg
View File

@ -4,7 +4,7 @@ ConfigFile.NumWindows: 1
################################################################################ ################################################################################
< NEW DISPLAYING WINDOW Thread: TAMPI mode > < NEW DISPLAYING WINDOW CPU: TAMPI mode >
################################################################################ ################################################################################
window_name CPU: TAMPI mode window_name CPU: TAMPI mode
window_type single window_type single

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

@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1
################################################################################ ################################################################################
< NEW DISPLAYING WINDOW Thread: Nanos6 mode > < NEW DISPLAYING WINDOW Thread: Nanos6 subsystem >
################################################################################ ################################################################################
window_name Thread: Nanos6 mode window_name Thread: Nanos6 subsystem
window_type single window_type single
window_id 1 window_id 1
window_position_x 960 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_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_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 1 50
window_filter_module evt_type_label 1 "Thread: Nanos6 mode" window_filter_module evt_type_label 1 "Thread: Nanos6 subsystem"
window_synchronize 1 window_synchronize 1

28
doc/emu_events.txt
View File

@ -100,27 +100,27 @@ MP[ Parallel region ends
-------------------- Nanos6 (model=L) ---------------------- -------------------- Nanos6 (model=L) ----------------------
LR[ Enters the registering of a task's accesses LR[ Begins the registration of a task's accesses
LR] Exits the registering of a task's accesses LR] Ends the registration of a task's accesses
LU[ Enters the unregistering of a task's accesses LU[ Begins the unregistration of a task's accesses
LU] Exits the unregistering of a task's accesses LU] Ends the unregistration of a task's accesses
LW[ Enters the blocking condition waiting for an If0 task LW[ Enters a blocking condition (waiting for an If0 task)
LW] Exits the blocking condition waiting for an If0 task LW] Exits a blocking condition (waiting for an If0 task)
LI[ Enters the inline execution of an If0 task LI[ Beings the inline execution of an If0 task
LI] Exits the inline execution of an If0 task LI] Ends the inline execution of an If0 task
LT[ Enters a taskwait LT[ Enters a taskwait
LT] Exits a taskwait LT] Exits a taskwait
LC[ Enters the creation of a task LC[ Begins the creation of a task
LC] Exits the creation of a task LC] Ends the creation of a task
LS[ Enters the submit of a task LS[ Begins the submit of a task
LS] Exits the submit of a task LS] Ends the submit of a task
LP[ Enters the spawning of a function LP[ Begins the spawn of a function
LP] Exits the spawning of a function LP] Ends the spawn of a function

8
emu.h
View File

@ -101,13 +101,13 @@ enum openmp_state {
}; };
enum nanos6_state { enum nanos6_state {
ST_NANOS6_REGISTERING = 1, ST_NANOS6_REGISTER = 1,
ST_NANOS6_UNREGISTERING = 2, ST_NANOS6_UNREGISTER = 2,
ST_NANOS6_IF0_WAIT = 3, ST_NANOS6_IF0_WAIT = 3,
ST_NANOS6_IF0_INLINE = 4, ST_NANOS6_IF0_INLINE = 4,
ST_NANOS6_TASKWAIT = 5, ST_NANOS6_TASKWAIT = 5,
ST_NANOS6_CREATING = 6, ST_NANOS6_CREATE = 6,
ST_NANOS6_SUBMITTING = 7, ST_NANOS6_SUBMIT = 7,
ST_NANOS6_SPAWN = 8, ST_NANOS6_SPAWN = 8,
}; };

8
emu_nanos6.c
View File

@ -96,13 +96,13 @@ hook_pre_nanos6(struct ovni_emu *emu)
switch(emu->cur_ev->header.category) switch(emu->cur_ev->header.category)
{ {
case 'R': pre_subsystem(emu, ST_NANOS6_REGISTERING); break; case 'R': pre_subsystem(emu, ST_NANOS6_REGISTER); break;
case 'U': pre_subsystem(emu, ST_NANOS6_UNREGISTERING); break; case 'U': pre_subsystem(emu, ST_NANOS6_UNREGISTER); break;
case 'W': pre_subsystem(emu, ST_NANOS6_IF0_WAIT); break; case 'W': pre_subsystem(emu, ST_NANOS6_IF0_WAIT); break;
case 'I': pre_subsystem(emu, ST_NANOS6_IF0_INLINE); break; case 'I': pre_subsystem(emu, ST_NANOS6_IF0_INLINE); break;
case 'T': pre_subsystem(emu, ST_NANOS6_TASKWAIT); break; case 'T': pre_subsystem(emu, ST_NANOS6_TASKWAIT); break;
case 'C': pre_subsystem(emu, ST_NANOS6_CREATING); break; case 'C': pre_subsystem(emu, ST_NANOS6_CREATE); break;
case 'S': pre_subsystem(emu, ST_NANOS6_SUBMITTING); break; case 'S': pre_subsystem(emu, ST_NANOS6_SUBMIT); break;
case 'P': pre_subsystem(emu, ST_NANOS6_SPAWN); break; case 'P': pre_subsystem(emu, ST_NANOS6_SPAWN); break;
default: default:
break; break;

24
pcf.c
View File

@ -365,28 +365,28 @@ struct event_type thread_openmp_mode = {
/* ---------------- CHAN_NANOS6_SUBSYSTEM ---------------- */ /* ---------------- CHAN_NANOS6_SUBSYSTEM ---------------- */
struct event_value nanos6_mode_values[] = { struct event_value nanos6_mode_values[] = {
{ ST_NULL, "NULL" }, { ST_NULL, "NULL" },
{ ST_TOO_MANY_TH, "Nanos6: Multiple threads running" }, { ST_TOO_MANY_TH, "Nanos6: Multiple threads running" },
{ ST_NANOS6_REGISTERING, "Dependencies: Register task accesses" }, { ST_NANOS6_REGISTER, "Dependencies: Registering task accesses" },
{ ST_NANOS6_UNREGISTERING, "Dependencies: Unregister task accesses" }, { ST_NANOS6_UNREGISTER, "Dependencies: Unregistering task accesses" },
{ ST_NANOS6_IF0_WAIT, "If0: Wait for If0 task" }, { ST_NANOS6_IF0_WAIT, "If0: Waiting for an If0 task" },
{ ST_NANOS6_IF0_INLINE, "If0: Execute If0 task inline" }, { ST_NANOS6_IF0_INLINE, "If0: Executing an If0 task inline" },
{ ST_NANOS6_TASKWAIT, "Taskwait: Taskwait" }, { ST_NANOS6_TASKWAIT, "Taskwait: Taskwait" },
{ ST_NANOS6_CREATING, "Add Task: Create a task" }, { ST_NANOS6_CREATE, "Add Task: Creating a task" },
{ ST_NANOS6_SUBMITTING, "Add Task: Submit a task" }, { ST_NANOS6_SUBMIT, "Add Task: Submitting a task" },
{ ST_NANOS6_SPAWN, "Spawn Function: Spawn a function" }, { ST_NANOS6_SPAWN, "Spawn Function: Spawning a function" },
{ -1, NULL }, { -1, NULL },
}; };
struct event_type cpu_nanos6_mode = { struct event_type cpu_nanos6_mode = {
0, chan_to_prvtype[CHAN_NANOS6_SUBSYSTEM][CHAN_CPU], 0, chan_to_prvtype[CHAN_NANOS6_SUBSYSTEM][CHAN_CPU],
"CPU: Nanos6 mode of the RUNNING thread", "CPU: Nanos6 subsystem of the RUNNING thread",
nanos6_mode_values nanos6_mode_values
}; };
struct event_type thread_nanos6_mode = { struct event_type thread_nanos6_mode = {
0, chan_to_prvtype[CHAN_NANOS6_SUBSYSTEM][CHAN_TH], 0, chan_to_prvtype[CHAN_NANOS6_SUBSYSTEM][CHAN_TH],
"Thread: Nanos6 mode of the RUNNING thread", "Thread: Nanos6 subsystem of the RUNNING thread",
nanos6_mode_values nanos6_mode_values
}; };