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

Fix xprof.sh and util.cpp

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