diff --git a/Makefile b/Makefile index 02c943f..ffe734d 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ dump: ovni.o dump.o parson.o test_speed: test_speed.c ovni.o parson.o -emu: emu.o emu_ovni.o emu_nosv.o emu_tampi.o emu_openmp.o emu_nanos6lite.o ovni.o prv.o pcf.o parson.o chan.o +emu: emu.o emu_ovni.o emu_nosv.o emu_tampi.o emu_openmp.o emu_nanos6.o ovni.o prv.o pcf.o parson.o chan.o libovni.so: ovni.o parson.o $(LINK.c) -shared $^ -o $@ diff --git a/cfg/cpu-nanos6lite-mode.cfg b/cfg/cpu-nanos6-mode.cfg similarity index 90% rename from cfg/cpu-nanos6lite-mode.cfg rename to cfg/cpu-nanos6-mode.cfg index c6b0359..29e7a79 100644 --- a/cfg/cpu-nanos6lite-mode.cfg +++ b/cfg/cpu-nanos6-mode.cfg @@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1 ################################################################################ -< NEW DISPLAYING WINDOW Thread: Nanos6-Lite mode > +< NEW DISPLAYING WINDOW Thread: Nanos6 mode > ################################################################################ -window_name CPU: Nanos6-Lite mode +window_name CPU: Nanos6 mode 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-Lite running thread mode" +window_filter_module evt_type_label 1 "CPU: Nanos6 running thread mode" window_synchronize 1 diff --git a/cfg/thread-nanos6lite-mode.cfg b/cfg/thread-nanos6-mode.cfg similarity index 91% rename from cfg/thread-nanos6lite-mode.cfg rename to cfg/thread-nanos6-mode.cfg index f212fa2..ec8eac7 100644 --- a/cfg/thread-nanos6lite-mode.cfg +++ b/cfg/thread-nanos6-mode.cfg @@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1 ################################################################################ -< NEW DISPLAYING WINDOW Thread: Nanos6-Lite mode > +< NEW DISPLAYING WINDOW Thread: Nanos6 mode > ################################################################################ -window_name Thread: Nanos6-Lite mode +window_name Thread: Nanos6 mode 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-Lite mode" +window_filter_module evt_type_label 1 "Thread: Nanos6 mode" window_synchronize 1 diff --git a/doc/emu_events.txt b/doc/emu_events.txt index 29997db..3fd0c3c 100644 --- a/doc/emu_events.txt +++ b/doc/emu_events.txt @@ -98,7 +98,7 @@ MT] Task ends MP] Parallel region begins MP[ Parallel region ends --------------------- Nanos6-Lite (model=L) ---------------------- +-------------------- Nanos6 (model=L) ---------------------- LR[ Enters the registering of a task's accesses LR] Exits the registering of a task's accesses diff --git a/emu.c b/emu.c index 76fe837..2c9d92a 100644 --- a/emu.c +++ b/emu.c @@ -262,7 +262,7 @@ hook_init(struct ovni_emu *emu) hook_init_nosv(emu); hook_init_tampi(emu); hook_init_openmp(emu); - hook_init_nanos6lite(emu); + hook_init_nanos6(emu); } static void @@ -274,7 +274,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_nanos6lite(emu); break; + case 'L': hook_pre_nanos6(emu); break; default: break; } diff --git a/emu.h b/emu.h index 346408d..0ce258b 100644 --- a/emu.h +++ b/emu.h @@ -100,15 +100,15 @@ enum nosv_openmp_state { ST_OPENMP_PARALLEL = 2, }; -enum nosv_nanos6lite_state { - ST_NANOS6LITE_REGISTER = 1, - ST_NANOS6LITE_UNREGISTER = 2, - ST_NANOS6LITE_IF0_WAIT = 3, - ST_NANOS6LITE_IF0_INLINE = 4, - ST_NANOS6LITE_TASKWAIT = 5, - ST_NANOS6LITE_CREATE = 6, - ST_NANOS6LITE_SUBMIT = 7, - ST_NANOS6LITE_SPAWN = 8, +enum nosv_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, }; struct ovni_ethread; @@ -159,7 +159,7 @@ enum chan { CHAN_TAMPI_MODE, CHAN_OPENMP_MODE, - CHAN_NANOS6LITE_MODE, + CHAN_NANOS6_MODE, CHAN_MAX }; @@ -190,7 +190,7 @@ static const int chan_to_prvtype[CHAN_MAX][3] = { { CHAN_OPENMP_MODE, 40, 90 }, - { CHAN_NANOS6LITE_MODE, 50, 100 }, + { CHAN_NANOS6_MODE, 50, 100 }, }; struct ovni_chan { @@ -480,8 +480,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_nanos6lite(struct ovni_emu *emu); -void hook_pre_nanos6lite(struct ovni_emu *emu); +void hook_init_nanos6(struct ovni_emu *emu); +void hook_pre_nanos6(struct ovni_emu *emu); struct ovni_cpu *emu_get_cpu(struct ovni_loom *loom, int cpuid); diff --git a/emu_nanos6lite.c b/emu_nanos6.c similarity index 67% rename from emu_nanos6lite.c rename to emu_nanos6.c index d6c57b9..46b6136 100644 --- a/emu_nanos6lite.c +++ b/emu_nanos6.c @@ -10,7 +10,7 @@ /* --------------------------- init ------------------------------- */ void -hook_init_nanos6lite(struct ovni_emu *emu) +hook_init_nanos6(struct ovni_emu *emu) { struct ovni_ethread *th; struct ovni_cpu *cpu; @@ -31,7 +31,7 @@ hook_init_nanos6lite(struct ovni_emu *emu) row = th->gindex + 1; uth = &emu->th_chan; - chan_th_init(th, uth, CHAN_NANOS6LITE_MODE, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_th, clock); + chan_th_init(th, uth, CHAN_NANOS6_MODE, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_th, clock); } /* Init the channels in all cpus */ @@ -41,7 +41,7 @@ hook_init_nanos6lite(struct ovni_emu *emu) row = cpu->gindex + 1; ucpu = &emu->cpu_chan; - chan_cpu_init(cpu, ucpu, CHAN_NANOS6LITE_MODE, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_cpu, clock); + chan_cpu_init(cpu, ucpu, CHAN_NANOS6_MODE, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_cpu, clock); } } @@ -56,10 +56,10 @@ pre_register(struct ovni_emu *emu) switch(emu->cur_ev->header.value) { case '[': - chan_push(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_REGISTER); + chan_push(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_REGISTER); break; case ']': - chan_pop(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_REGISTER); + chan_pop(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_REGISTER); break; default: abort(); @@ -75,10 +75,10 @@ pre_unregister(struct ovni_emu *emu) switch(emu->cur_ev->header.value) { case '[': - chan_push(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_UNREGISTER); + chan_push(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_UNREGISTER); break; case ']': - chan_pop(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_UNREGISTER); + chan_pop(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_UNREGISTER); break; default: abort(); @@ -94,10 +94,10 @@ pre_wait(struct ovni_emu *emu) switch(emu->cur_ev->header.value) { case '[': - chan_push(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_IF0_WAIT); + chan_push(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_IF0_WAIT); break; case ']': - chan_pop(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_IF0_WAIT); + chan_pop(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_IF0_WAIT); break; default: abort(); @@ -113,10 +113,10 @@ pre_inline(struct ovni_emu *emu) switch(emu->cur_ev->header.value) { case '[': - chan_push(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_IF0_INLINE); + chan_push(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_IF0_INLINE); break; case ']': - chan_pop(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_IF0_INLINE); + chan_pop(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_IF0_INLINE); break; default: abort(); @@ -132,10 +132,10 @@ pre_taskwait(struct ovni_emu *emu) switch(emu->cur_ev->header.value) { case '[': - chan_push(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_TASKWAIT); + chan_push(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_TASKWAIT); break; case ']': - chan_pop(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_TASKWAIT); + chan_pop(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_TASKWAIT); break; default: abort(); @@ -151,10 +151,10 @@ pre_create(struct ovni_emu *emu) switch(emu->cur_ev->header.value) { case '[': - chan_push(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_CREATE); + chan_push(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_CREATE); break; case ']': - chan_pop(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_CREATE); + chan_pop(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_CREATE); break; default: abort(); @@ -170,10 +170,10 @@ pre_submit(struct ovni_emu *emu) switch(emu->cur_ev->header.value) { case '[': - chan_push(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_SUBMIT); + chan_push(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_SUBMIT); break; case ']': - chan_pop(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_SUBMIT); + chan_pop(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_SUBMIT); break; default: abort(); @@ -189,10 +189,10 @@ pre_spawn(struct ovni_emu *emu) switch(emu->cur_ev->header.value) { case '[': - chan_push(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_SPAWN); + chan_push(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_SPAWN); break; case ']': - chan_pop(&th->chan[CHAN_NANOS6LITE_MODE], ST_NANOS6LITE_SPAWN); + chan_pop(&th->chan[CHAN_NANOS6_MODE], ST_NANOS6_SPAWN); break; default: abort(); @@ -200,7 +200,7 @@ pre_spawn(struct ovni_emu *emu) } void -hook_pre_nanos6lite(struct ovni_emu *emu) +hook_pre_nanos6(struct ovni_emu *emu) { assert(emu->cur_ev->header.model == 'L'); diff --git a/pcf.c b/pcf.c index 147bd1b..b280641 100644 --- a/pcf.c +++ b/pcf.c @@ -362,32 +362,32 @@ struct event_type thread_openmp_mode = { openmp_mode_values }; -/* ---------------- CHAN_NANOS6LITE_MODE ---------------- */ +/* ---------------- CHAN_NANOS6_MODE ---------------- */ -struct event_value nanos6lite_mode_values[] = { - { ST_NULL, "NULL" }, - { ST_TOO_MANY_TH, "Nanos6-Lite: Multiple threads running" }, - { ST_NANOS6LITE_REGISTER, "Dependencies: Register task accesses" }, - { ST_NANOS6LITE_UNREGISTER, "Dependencies: Unregister task accesses" }, - { ST_NANOS6LITE_IF0_WAIT, "If0: Wait for If0 task" }, - { ST_NANOS6LITE_IF0_INLINE, "If0: Execute If0 task inline" }, - { ST_NANOS6LITE_TASKWAIT, "Taskwait: Taskwait" }, - { ST_NANOS6LITE_CREATE, "Add Task: Create a task" }, - { ST_NANOS6LITE_SUBMIT, "Add Task: Submit a task" }, - { ST_NANOS6LITE_SPAWN, "Spawn Function: Spawn a function" }, +struct event_value nanos6_mode_values[] = { + { ST_NULL, "NULL" }, + { ST_TOO_MANY_TH, "Nanos6: Multiple threads running" }, + { ST_NANOS6_REGISTER, "Dependencies: Register task accesses" }, + { ST_NANOS6_UNREGISTER, "Dependencies: Unregister task accesses" }, + { ST_NANOS6_IF0_WAIT, "If0: Wait for If0 task" }, + { ST_NANOS6_IF0_INLINE, "If0: Execute If0 task inline" }, + { ST_NANOS6_TASKWAIT, "Taskwait: Taskwait" }, + { ST_NANOS6_CREATE, "Add Task: Create a task" }, + { ST_NANOS6_SUBMIT, "Add Task: Submit a task" }, + { ST_NANOS6_SPAWN, "Spawn Function: Spawn a function" }, { -1, NULL }, }; -struct event_type cpu_nanos6lite_mode = { - 0, chan_to_prvtype[CHAN_NANOS6LITE_MODE][CHAN_CPU], - "CPU: Nanos6-Lite mode of the RUNNING thread", - nanos6lite_mode_values +struct event_type cpu_nanos6_mode = { + 0, chan_to_prvtype[CHAN_NANOS6_MODE][CHAN_CPU], + "CPU: Nanos6 mode of the RUNNING thread", + nanos6_mode_values }; -struct event_type thread_nanos6lite_mode = { - 0, chan_to_prvtype[CHAN_NANOS6LITE_MODE][CHAN_TH], - "Thread: Nanos6-Lite mode of the RUNNING thread", - nanos6lite_mode_values +struct event_type thread_nanos6_mode = { + 0, chan_to_prvtype[CHAN_NANOS6_MODE][CHAN_TH], + "Thread: Nanos6 mode of the RUNNING thread", + nanos6_mode_values }; /* ----------------------------------------------- */ @@ -478,7 +478,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_nanos6lite_mode); + write_event_type(f, &thread_nanos6_mode); /* CPU */ write_event_type(f, &cpu_ovni_pid); @@ -494,7 +494,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_nanos6lite_mode); + write_event_type(f, &cpu_nanos6_mode); /* Custom */ write_cpu_type(f, &thread_cpu_affinity, emu);