Commit 16b6c36b authored by Thomas Applencourt's avatar Thomas Applencourt

Fix xprof.sh and util.cpp

parent 2608fe68
Pipeline #12613 failed with stage
......@@ -117,7 +117,7 @@ CLEANFILES = \
clinterval_dispatchers.c \
clinterval.h \
clinterval.c \
xprof_utils.cpp
xprof_utils.cpp
BUILT_SOURCES += \
clinterval.h \
......@@ -131,7 +131,8 @@ nodist_libCLProf_la_SOURCES = \
clinterval_dispatchers.c \
clinterval.c \
clinterval.h \
tracer_opencl.h
tracer_opencl.h \
xprof_utils.cpp
libCLProf_la_SOURCES = \
clprof.c
......
......@@ -147,7 +147,14 @@ summary() {
done
if [[ "$timeline" ]]; then
babeltrace2 --plugin-path=$libdir --component=filter.clprof.interval --component=sink.xprof.timeline ${lttng_last_session}
<% if languages.include?("opencl") %>
echo "Generating ${lttng_last_session}/timeline_cl.json"
babeltrace2 --plugin-path=$libdir --component=filter.clprof.interval --component=sink.xprof.timeline ${lttng_last_session} > ${lttng_last_session}/timeline_cl.json
<% end %>
<% if languages.include?("ze") %>
echo "Generating ${lttng_last_session}/timeline_ze.json"
babeltrace2 --plugin-path=$libdir --component=filter.zeprof.interval --component=sink.xprof.timeline ${lttng_last_session} > ${lttng_last_session}/timeline_ze.json
<% end %>
fi
if [[ "$trace" ]] ; then
......@@ -162,14 +169,14 @@ summary() {
if [[ -z "$timeline" ]] ; then
<% if languages.include?("opencl") %>
ocl_output=$(babeltrace2 --plugin-path=$libdir --component=filter.clprof.interval --component=sink.xprof.tally --params="display=$display" ${lttng_last_session})
ocl_output=$(babeltrace2 --plugin-path=$libdir --component=filter.clprof.interval --component=sink.xprof.tally --params="display=$display" ${lttng_last_session})
if [ -n "$ocl_output" ]; then
echo "== OpenCL == "
echo "$ocl_output"
fi
<% end %>
<% if languages.include?("ze") %>
ze_output=$(babeltrace2 --plugin-path=$libdir --component=sink.zeprof.dispatch --params="display=$display" ${lttng_last_session})
ze_output=$(babeltrace2 --plugin-path=$libdir --component=filter.zeprof.interval --component=sink.xprof.tally --params="display=$display" ${lttng_last_session})
if [ -n "$ze_output" ]; then
echo "== Level0 == "
echo "$ze_output"
......
......@@ -225,7 +225,7 @@ zeinterval.c: $(top_srcdir)/xprof/interval.c.erb
$(ERB) namespace="zeinterval" $(top_srcdir)/xprof/interval.c.erb > zeinterval.c
xprof_utils.cpp: $(top_srcdir)/utils/xprof_utils.cpp
ln -s $(top_srcdir)/utils/xprof_utils.cpp xprof_utils.cpp
ln -s $(top_srcdir)/utils/xprof_utils.cpp xprof_utils.cpp
CLEANFILES += \
zeprof.c \
......@@ -242,15 +242,14 @@ BUILT_SOURCES += \
zeinterval_callbacks.h \
xprof_utils.cpp
# For a strange reason we should not put `xprof_utils.cpp` neither in the `sources`
nodist_libZEProf_la_SOURCES = \
zeinterval_callbacks.cpp \
zeinterval_callbacks.h \
zeinterval_dispatchers.c \
zeinterval.c \
zeinterval.h \
babeltrace_ze.h
babeltrace_ze.h \
xprof_utils.cpp
libZEProf_la_SOURCES = \
zeprof.c
......
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