Commit 40f8ef6e authored by Brice Videau's avatar Brice Videau
Browse files

Merge branch 'modularize_merge' of xgitlab.cels.anl.gov:heteroflow/tracer into modularize_merge

parents edcd98d0 633b173c
Pipeline #13160 canceled with stage
......@@ -3,39 +3,41 @@
LTTNG_FLAGS=-fPIC -Wall -Wextra -Wno-unused-parameter -Wno-type-limits -Wno-sign-compare -Werror -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I../utils -I./
OPENCL_PROBES_TP = \
opencl_tracepoints.tp\
opencl_profiling.tp\
opencl_source.tp\
opencl_dump.tp\
opencl_arguments.tp\
opencl_build.tp\
opencl_devices.tp
opencl_tracepoints.tp \
opencl_profiling.tp \
opencl_source.tp \
opencl_dump.tp \
opencl_arguments.tp \
opencl_build.tp \
opencl_devices.tp
OPENCL_PROBES_INCL = \
opencl_tracepoints.h\
opencl_profiling.h\
opencl_source.h\
opencl_dump.h\
opencl_arguments.h\
opencl_build.h\
opencl_devices.h
opencl_tracepoints.h \
opencl_profiling.h \
opencl_source.h \
opencl_dump.h \
opencl_arguments.h \
opencl_build.h \
opencl_devices.h
OPENCL_PROBES_SRC = \
opencl_tracepoints.c\
opencl_profiling.c\
opencl_source.c\
opencl_dump.c\
opencl_arguments.c\
opencl_build.c\
opencl_devices.c
ML_FILES = $(srcdir)/opencl_meta_parameters.yaml\
$(srcdir)/supported_extensions.yaml\
$(srcdir)/supported_enums.yaml
TRACEPOINT_GEN = $(srcdir)/opencl_model.rb\
$(srcdir)/opencl_tracepoints.rb\
$(srcdir)/opencl_events.yaml
opencl_tracepoints.c \
opencl_profiling.c \
opencl_source.c \
opencl_dump.c \
opencl_arguments.c \
opencl_build.c \
opencl_devices.c
ML_FILES = \
$(srcdir)/opencl_meta_parameters.yaml \
$(srcdir)/supported_extensions.yaml \
$(srcdir)/supported_enums.yaml
TRACEPOINT_GEN = \
$(srcdir)/opencl_model.rb \
$(srcdir)/opencl_tracepoints.rb \
$(srcdir)/opencl_events.yaml
cl.xml.patched: $(srcdir)/cl.xml $(srcdir)/cl.xml.patch
$(PATCH) $(srcdir)/cl.xml $(srcdir)/cl.xml.patch -o cl.xml.patched
......@@ -199,7 +201,6 @@ libTestingCLProf_la_CFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror $(BABEL
libTestingCLProf_la_CXXFLAGS = -std=c++17 -Wall -Wextra -Wno-unused-parameter -Werror $(BABELTRACE2_CFLAGS)
libTestingCLProf_la_LDFLAGS = $(BABELTRACE2_LIBS) -avoid-version -module
clinterval_callbacks.cpp: $(srcdir)/clinterval_callbacks.cpp.erb $(srcdir)/gen_clinterval.rb opencl_model.yaml babeltrace_cl_callbacks.h tracer_opencl.h
SRC_DIR=$(srcdir) $(RUBY) $(srcdir)/gen_clinterval.rb
......@@ -307,6 +308,7 @@ TRACE_FILES = \
tests/interval_profiling_with_error.yaml \
tests/interval_profiling_normal_command_queue_created_in_other_thread.yaml \
tests/interval_profiling_normal_nd_range_kernel_name.yaml
TESTS = \
tests/opencl_dummy_trace.dust \
tests/trace.dust \
......@@ -315,6 +317,7 @@ TESTS = \
TEST_EXTENSIONS = .dust
DUST_LOG_COMPILER = ./test_wrapper.sh
check_DATA = \
test_wrapper.sh \
tests/opencl_dummy_trace.yaml
......
......@@ -66,4 +66,3 @@ babeltrace_cl_register_callback(struct babeltrace_cl_dispatch *dispatch,
#endif
#endif
......@@ -273,6 +273,7 @@ static void clinterval_<%= dbt_event.name %>_callback(
const auto [device,subdevice] = state->function_name_to_dsd[hpt_function_name_t(hostname,process_id,thread_id, function_name)];
const hp_device_t hp_device{hostname, process_id, device};
// This need to be commented due to intel bugs where clGetEventProfilingInfo return host time
//const uint64_t start_event = state->device_ts_to_llng_ts.count(hp_device) ? state->device_ts_to_llng_ts[hp_device] + start: ts + (start - queued);
const uint64_t start_event = ts + (start - queued);
......@@ -283,7 +284,7 @@ static void clinterval_<%= dbt_event.name %>_callback(
} else {
const thread_id_t thread_id = borrow_thread_id(bt_evt);
const auto [function_name, ts] = state->profiled_function_name_and_ts[hpt_t(hostname,process_id,thread_id)];
// This need to be commented due to intel bugs where clGetEventProfilingInfo return host time
//const auto [device,subdevice] = state->function_name_to_dsd[hpt_function_name_t(hostname,process_id,thread_id, function_name)];
//const hp_device_t hp_device{hostname, process_id, device};
//const uint64_t start_event = state->device_ts_to_llng_ts.count(hp_device) ? state->device_ts_to_llng_ts[hp_device] + start: ts + (start - queued);
......@@ -308,11 +309,3 @@ void init_clinterval_callbacks(struct clinterval_dispatch *opencl_interval) {
clinterval_register_callback(opencl_interval, "<%= dbt_event.name_unsanitized %>", (void *) &clinterval_<%= dbt_event.name %>_callback);
<% end %>
}
<%#
_
|_ o ._ _. | o _ _
| | | | (_| | | /_ (/_
%>
//void finalize_zeinterval_callbacks() {}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment