diff --git a/cfg/cpu/openmp/mode.cfg b/cfg/cpu/openmp/mode.cfg deleted file mode 100644 index d6fa749..0000000 --- a/cfg/cpu/openmp/mode.cfg +++ /dev/null @@ -1,42 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 1 - - -################################################################################ -< NEW DISPLAYING WINDOW CPU: OpenMP mode of the RUNNING thread > -################################################################################ -window_name CPU: OpenMP mode of the RUNNING thread -window_type single -window_id 1 -window_position_x 0 -window_position_y 0 -window_width 600 -window_height 150 -window_comm_lines_enabled true -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 1000.0 -window_minimum_y 1.0 -window_compute_y_max true -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open true -window_drawmode draw_randnotzero -window_drawmode_rows draw_randnotzero -window_pixel_size 1 -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 25 -window_filter_module evt_type_label 1 "CPU: OpenMP mode of the RUNNING thread" - diff --git a/cfg/cpu/tampi/mode.cfg b/cfg/cpu/tampi/mode.cfg deleted file mode 100644 index bb39c18..0000000 --- a/cfg/cpu/tampi/mode.cfg +++ /dev/null @@ -1,42 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 1 - - -################################################################################ -< NEW DISPLAYING WINDOW CPU: TAMPI mode of the RUNNING thread > -################################################################################ -window_name CPU: TAMPI mode of the RUNNING thread -window_type single -window_id 1 -window_position_x 0 -window_position_y 0 -window_width 600 -window_height 150 -window_comm_lines_enabled true -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 1000.0 -window_minimum_y 1.0 -window_compute_y_max true -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open true -window_drawmode draw_randnotzero -window_drawmode_rows draw_randnotzero -window_pixel_size 1 -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 20 -window_filter_module evt_type_label 1 "CPU: TAMPI mode of the RUNNING thread" - diff --git a/cfg/thread/openmp/mode.cfg b/cfg/thread/openmp/mode.cfg deleted file mode 100644 index 2e26a2b..0000000 --- a/cfg/thread/openmp/mode.cfg +++ /dev/null @@ -1,42 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 1 - - -################################################################################ -< NEW DISPLAYING WINDOW Thread: OpenMP mode of the RUNNING thread > -################################################################################ -window_name Thread: OpenMP mode of the RUNNING thread -window_type single -window_id 1 -window_position_x 0 -window_position_y 0 -window_width 600 -window_height 150 -window_comm_lines_enabled true -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 1000.0 -window_minimum_y 1.0 -window_compute_y_max true -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open true -window_drawmode draw_randnotzero -window_drawmode_rows draw_randnotzero -window_pixel_size 1 -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 25 -window_filter_module evt_type_label 1 "Thread: OpenMP mode of the RUNNING thread" - diff --git a/cfg/thread/tampi/mode.cfg b/cfg/thread/tampi/mode.cfg deleted file mode 100644 index 33789c3..0000000 --- a/cfg/thread/tampi/mode.cfg +++ /dev/null @@ -1,42 +0,0 @@ -#ParaverCFG -ConfigFile.Version: 3.4 -ConfigFile.NumWindows: 1 - - -################################################################################ -< NEW DISPLAYING WINDOW Thread: TAMPI mode of the RUNNING thread > -################################################################################ -window_name Thread: TAMPI mode of the RUNNING thread -window_type single -window_id 1 -window_position_x 0 -window_position_y 0 -window_width 600 -window_height 150 -window_comm_lines_enabled true -window_flags_enabled false -window_noncolor_mode true -window_logical_filtered true -window_physical_filtered false -window_comm_fromto true -window_comm_tagsize true -window_comm_typeval true -window_units Microseconds -window_maximum_y 1000.0 -window_minimum_y 1.0 -window_compute_y_max true -window_level thread -window_scale_relative 1.000000000000 -window_end_time_relative 1.000000000000 -window_object appl { 1, { All } } -window_begin_time_relative 0.000000000000 -window_open true -window_drawmode draw_randnotzero -window_drawmode_rows draw_randnotzero -window_pixel_size 1 -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 20 -window_filter_module evt_type_label 1 "Thread: TAMPI mode of the RUNNING thread" - diff --git a/doc/emulation/events.md b/doc/emulation/events.md index 952b831..13e26c5 100644 --- a/doc/emulation/events.md +++ b/doc/emulation/events.md @@ -76,34 +76,6 @@ VHW Ends the execution as a worker VHd Begins the execution as the delegate VHD Ends the execution as the delegate --------------------- TAMPI (model=T) ---------------------- - -TS[ Enters MPI_Send() -TS] Exits MPI_Send() - -TR[ Enters MPI_Recv() -TR] Exits MPI_Recv() - -Ts[ Enters MPI_Isend() -Ts] Exits MPI_Isend() - -Tr[ Enters MPI_Irecv() -Tr] Exits MPI_Irecv() - -TV[ Enters MPI_Wait() -TV] Exits MPI_Wait() - -TW[ Enters MPI_Waitall() -TW] Exits MPI_Waitall() - --------------------- OpenMP (model=M) ---------------------- - -MT[ Task begins -MT] Task ends - -MP] Parallel region begins -MP[ Parallel region ends - -------------------- NODES (model=D) ---------------------- DR[ Begins the registration of a task's accesses diff --git a/src/emu/openmp.c b/src/emu/openmp.c deleted file mode 100644 index aa03315..0000000 --- a/src/emu/openmp.c +++ /dev/null @@ -1,82 +0,0 @@ -/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC) - * SPDX-License-Identifier: GPL-3.0-or-later */ - -#include "uthash.h" - -#include "chan.h" -#include "emu.h" -#include "ovni.h" -#include "prv.h" - -/* --------------------------- init ------------------------------- */ - -void -hook_init_openmp(struct ovni_emu *emu) -{ - int64_t *clock = &emu->delta_time; - FILE *prv_th = emu->prv_thread; - FILE *prv_cpu = emu->prv_cpu; - - /* Init the channels in all threads */ - for (size_t i = 0; i < emu->total_nthreads; i++) { - struct ovni_ethread *th = emu->global_thread[i]; - int row = th->gindex + 1; - struct ovni_chan **uth = &emu->th_chan; - - chan_th_init(th, uth, CHAN_OPENMP_MODE, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_th, clock); - } - - /* Init the channels in all cpus */ - for (size_t i = 0; i < emu->total_ncpus; i++) { - struct ovni_cpu *cpu = emu->global_cpu[i]; - int row = cpu->gindex + 1; - struct ovni_chan **ucpu = &emu->cpu_chan; - - chan_cpu_init(cpu, ucpu, CHAN_OPENMP_MODE, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_cpu, clock); - } -} - -/* --------------------------- pre ------------------------------- */ - -static void -pre_mode(struct ovni_emu *emu, int st) -{ - struct ovni_ethread *th = emu->cur_thread; - struct ovni_chan *chan = &th->chan[CHAN_OPENMP_MODE]; - - switch (emu->cur_ev->header.value) { - case '[': - chan_push(chan, st); - break; - case ']': - chan_pop(chan, st); - break; - default: - err("unexpected value '%c' (expecting '[' or ']')\n", - emu->cur_ev->header.value); - abort(); - } -} - -void -hook_pre_openmp(struct ovni_emu *emu) -{ - if (emu->cur_ev->header.model != 'M') - die("hook_pre_openmp: unexpected event with model %c\n", - emu->cur_ev->header.model); - - if (!emu->cur_thread->is_active) - die("hook_pre_openmp: current thread %d not active\n", - emu->cur_thread->tid); - - switch (emu->cur_ev->header.category) { - case 'T': - pre_mode(emu, ST_OPENMP_TASK); - break; - case 'P': - pre_mode(emu, ST_OPENMP_PARALLEL); - break; - default: - break; - } -} diff --git a/src/emu/pcf.c b/src/emu/pcf.c index 6ffb35e..2ffcb4f 100644 --- a/src/emu/pcf.c +++ b/src/emu/pcf.c @@ -119,26 +119,6 @@ struct pcf_value_label nosv_ss_values[] = { { -1, NULL }, }; -struct pcf_value_label tampi_mode_values[] = { - { ST_NULL, "NULL" }, - { ST_TOO_MANY_TH, "TAMPI: Unknown, multiple threads running" }, - { ST_TAMPI_SEND, "TAMPI: Send" }, - { ST_TAMPI_RECV, "TAMPI: Recv" }, - { ST_TAMPI_ISEND, "TAMPI: Isend" }, - { ST_TAMPI_IRECV, "TAMPI: Irecv" }, - { ST_TAMPI_WAIT, "TAMPI: Wait" }, - { ST_TAMPI_WAITALL, "TAMPI: Waitall" }, - { -1, NULL }, -}; - -struct pcf_value_label openmp_mode_values[] = { - { ST_NULL, "NULL" }, - { ST_TOO_MANY_TH, "OpenMP: Unknown, multiple threads running" }, - { ST_OPENMP_TASK, "OpenMP: Task" }, - { ST_OPENMP_PARALLEL, "OpenMP: Parallel" }, - { -1, NULL }, -}; - struct pcf_value_label nodes_mode_values[] = { { ST_NULL, "NULL" }, { ST_TOO_MANY_TH, "NODES: Multiple threads running" }, @@ -219,8 +199,6 @@ struct pcf_value_label (*pcf_chan_value_labels[CHAN_MAX])[] = { [CHAN_NOSV_SUBSYSTEM] = &nosv_ss_values, [CHAN_NOSV_RANK] = &default_values, - [CHAN_TAMPI_MODE] = &tampi_mode_values, - [CHAN_OPENMP_MODE] = &openmp_mode_values, [CHAN_NODES_SUBSYSTEM] = &nodes_mode_values, [CHAN_NANOS6_TASKID] = &default_values, @@ -249,8 +227,6 @@ char *pcf_chan_name[CHAN_MAX] = { [CHAN_NOSV_SUBSYSTEM] = "nOS-V subsystem", [CHAN_NOSV_RANK] = "nOS-V task MPI rank", - [CHAN_TAMPI_MODE] = "TAMPI mode", - [CHAN_OPENMP_MODE] = "OpenMP mode", [CHAN_NODES_SUBSYSTEM] = "NODES subsystem", [CHAN_NANOS6_TASKID] = "Nanos6 task ID", @@ -287,8 +263,6 @@ int pcf_chan_suffix[CHAN_MAX][CHAN_MAXTYPE] = { [CHAN_NOSV_SUBSYSTEM] = { ACT_TH, RUN_TH }, [CHAN_NOSV_RANK] = { RUN_TH, RUN_TH }, - [CHAN_TAMPI_MODE] = { RUN_TH, RUN_TH }, - [CHAN_OPENMP_MODE] = { RUN_TH, RUN_TH }, [CHAN_NODES_SUBSYSTEM] = { RUN_TH, RUN_TH }, [CHAN_NANOS6_TASKID] = { RUN_TH, RUN_TH }, diff --git a/src/emu/tampi.c b/src/emu/tampi.c deleted file mode 100644 index 985466c..0000000 --- a/src/emu/tampi.c +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2021 Barcelona Supercomputing Center (BSC) - * SPDX-License-Identifier: GPL-3.0-or-later */ - -#include "uthash.h" - -#include "chan.h" -#include "emu.h" -#include "ovni.h" -#include "prv.h" - -/* --------------------------- init ------------------------------- */ - -void -hook_init_tampi(struct ovni_emu *emu) -{ - int64_t *clock = &emu->delta_time; - FILE *prv_th = emu->prv_thread; - FILE *prv_cpu = emu->prv_cpu; - - /* Init the channels in all threads */ - for (size_t i = 0; i < emu->total_nthreads; i++) { - struct ovni_ethread *th = emu->global_thread[i]; - int row = th->gindex + 1; - struct ovni_chan **uth = &emu->th_chan; - - chan_th_init(th, uth, CHAN_TAMPI_MODE, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_th, clock); - } - - /* Init the channels in all cpus */ - for (size_t i = 0; i < emu->total_ncpus; i++) { - struct ovni_cpu *cpu = emu->global_cpu[i]; - int row = cpu->gindex + 1; - struct ovni_chan **ucpu = &emu->cpu_chan; - - chan_cpu_init(cpu, ucpu, CHAN_TAMPI_MODE, CHAN_TRACK_TH_RUNNING, 0, 0, 1, row, prv_cpu, clock); - } -} - -/* --------------------------- pre ------------------------------- */ - -static void -pre_tampi_mode(struct ovni_emu *emu, int state) -{ - struct ovni_ethread *th = emu->cur_thread; - - switch (emu->cur_ev->header.value) { - case '[': - chan_push(&th->chan[CHAN_TAMPI_MODE], state); - break; - case ']': - chan_pop(&th->chan[CHAN_TAMPI_MODE], state); - break; - default: - edie(emu, "unexpected event value %c for tampi mode\n", - emu->cur_ev->header.value); - } -} - -void -hook_pre_tampi(struct ovni_emu *emu) -{ - if (emu->cur_ev->header.model != 'T') - edie(emu, "hook_pre_tampi: unexpected event with model %c\n", - emu->cur_ev->header.model); - - switch (emu->cur_ev->header.category) { - case 'S': - pre_tampi_mode(emu, ST_TAMPI_SEND); - break; - case 'R': - pre_tampi_mode(emu, ST_TAMPI_RECV); - break; - case 's': - pre_tampi_mode(emu, ST_TAMPI_ISEND); - break; - case 'r': - pre_tampi_mode(emu, ST_TAMPI_IRECV); - break; - case 'V': - pre_tampi_mode(emu, ST_TAMPI_WAIT); - break; - case 'W': - pre_tampi_mode(emu, ST_TAMPI_WAITALL); - break; - default: - break; - } -}