From c586815ee2fe79ef9434b013d6bcd06b8b457956 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=ED=95=9C=EC=A2=85/On-Device=20Lab=28SR=29/Enginee?= =?utf8?q?r/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Wed, 20 Nov 2019 15:54:44 +0900 Subject: [PATCH] [xtrace] Move Event tools to libs/misc (#9056) Move EventRecorder and EventCollector to `libs/misc` from `contrib/xtrace` so that those can be used from neurun. Signed-off-by: Hanjoung Lee --- runtime/contrib/xtrace/src/EventCollectingListener.cc | 2 +- runtime/contrib/xtrace/src/EventCollectingListener.h | 2 +- runtime/contrib/xtrace/src/xtrace.cc | 2 +- runtime/libs/misc/CMakeLists.txt | 5 +---- .../misc/include/misc/EventCollector.h} | 2 +- .../event_recorder.h => libs/misc/include/misc/EventRecorder.h} | 0 runtime/{contrib/xtrace/src => libs/misc/include/misc}/str.h | 0 .../src/event_collector.cc => libs/misc/src/EventCollector.cpp} | 9 ++------- .../src/event_recorder.cc => libs/misc/src/EventRecorder.cpp} | 2 +- 9 files changed, 8 insertions(+), 16 deletions(-) rename runtime/{contrib/xtrace/src/event_collector.h => libs/misc/include/misc/EventCollector.h} (97%) rename runtime/{contrib/xtrace/src/event_recorder.h => libs/misc/include/misc/EventRecorder.h} (100%) rename runtime/{contrib/xtrace/src => libs/misc/include/misc}/str.h (100%) rename runtime/{contrib/xtrace/src/event_collector.cc => libs/misc/src/EventCollector.cpp} (94%) rename runtime/{contrib/xtrace/src/event_recorder.cc => libs/misc/src/EventRecorder.cpp} (98%) diff --git a/runtime/contrib/xtrace/src/EventCollectingListener.cc b/runtime/contrib/xtrace/src/EventCollectingListener.cc index e1634b7..03c7ed9 100644 --- a/runtime/contrib/xtrace/src/EventCollectingListener.cc +++ b/runtime/contrib/xtrace/src/EventCollectingListener.cc @@ -20,7 +20,7 @@ #include #include "benchmark_event.h" -#include "str.h" +#include "misc/str.h" namespace { diff --git a/runtime/contrib/xtrace/src/EventCollectingListener.h b/runtime/contrib/xtrace/src/EventCollectingListener.h index 384d08b..7f24425 100644 --- a/runtime/contrib/xtrace/src/EventCollectingListener.h +++ b/runtime/contrib/xtrace/src/EventCollectingListener.h @@ -19,7 +19,7 @@ #include -#include "event_collector.h" +#include "misc/EventCollector.h" class EventCollectingListener final : public xray::listener { diff --git a/runtime/contrib/xtrace/src/xtrace.cc b/runtime/contrib/xtrace/src/xtrace.cc index 409b3bd..879264b 100644 --- a/runtime/contrib/xtrace/src/xtrace.cc +++ b/runtime/contrib/xtrace/src/xtrace.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "event_recorder.h" +#include "misc/EventRecorder.h" #include "EventCollectingListener.h" #include "benchmark_runner.h" diff --git a/runtime/libs/misc/CMakeLists.txt b/runtime/libs/misc/CMakeLists.txt index 537c544..557d403 100644 --- a/runtime/libs/misc/CMakeLists.txt +++ b/runtime/libs/misc/CMakeLists.txt @@ -1,8 +1,5 @@ # Library `nnfw_lib_misc` -set(NNFW_UTILITY_SRCS src/tensor/Shape.cpp) -list(APPEND NNFW_UTILITY_SRCS src/tensor/NonIncreasingStride.cpp) -list(APPEND NNFW_UTILITY_SRCS src/tensor/IndexFormatter.cpp) -list(APPEND NNFW_UTILITY_SRCS src/tensor/Comparator.cpp) +file(GLOB_RECURSE NNFW_UTILITY_SRCS "src/*.cpp") add_library(nnfw_lib_misc STATIC ${NNFW_UTILITY_SRCS}) target_include_directories(nnfw_lib_misc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/runtime/contrib/xtrace/src/event_collector.h b/runtime/libs/misc/include/misc/EventCollector.h similarity index 97% rename from runtime/contrib/xtrace/src/event_collector.h rename to runtime/libs/misc/include/misc/EventCollector.h index d1672de..bcb2d07 100644 --- a/runtime/contrib/xtrace/src/event_collector.h +++ b/runtime/libs/misc/include/misc/EventCollector.h @@ -17,7 +17,7 @@ #ifndef __EVENT_COLLECTOR_H__ #define __EVENT_COLLECTOR_H__ -#include "event_recorder.h" +#include "misc/EventRecorder.h" class EventCollector { diff --git a/runtime/contrib/xtrace/src/event_recorder.h b/runtime/libs/misc/include/misc/EventRecorder.h similarity index 100% rename from runtime/contrib/xtrace/src/event_recorder.h rename to runtime/libs/misc/include/misc/EventRecorder.h diff --git a/runtime/contrib/xtrace/src/str.h b/runtime/libs/misc/include/misc/str.h similarity index 100% rename from runtime/contrib/xtrace/src/str.h rename to runtime/libs/misc/include/misc/str.h diff --git a/runtime/contrib/xtrace/src/event_collector.cc b/runtime/libs/misc/src/EventCollector.cpp similarity index 94% rename from runtime/contrib/xtrace/src/event_collector.cc rename to runtime/libs/misc/src/EventCollector.cpp index 7de4d39..f8ec96d 100644 --- a/runtime/contrib/xtrace/src/event_collector.cc +++ b/runtime/libs/misc/src/EventCollector.cpp @@ -14,13 +14,10 @@ * limitations under the License. */ -#include "event_collector.h" +#include "misc/EventCollector.h" // xtrace-internal libraries -#include "str.h" - -// NNFW-internal libraries -#include +#include "misc/str.h" // C++ standard libraries #include @@ -29,8 +26,6 @@ #include #include -using nnfw::cpp14::make_unique; - namespace { diff --git a/runtime/contrib/xtrace/src/event_recorder.cc b/runtime/libs/misc/src/EventRecorder.cpp similarity index 98% rename from runtime/contrib/xtrace/src/event_recorder.cc rename to runtime/libs/misc/src/EventRecorder.cpp index fb3a1de..e234c06 100644 --- a/runtime/contrib/xtrace/src/event_recorder.cc +++ b/runtime/libs/misc/src/EventRecorder.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "event_recorder.h" +#include "misc/EventRecorder.h" #include #include -- 2.7.4