From 07cf70b46cd2bf7db94a8d0e0d845eb44be24d1c Mon Sep 17 00:00:00 2001 From: Anton Moberg Date: Wed, 7 Jul 2021 11:08:17 +0200 Subject: Improved Logging - Core Software Logging macros: Added ethosu_logging.h as a lib, containing logging macros controlled by a parameter ETHOSU_LOG_SEVERITY set in core_software CMakeLists.txt Updated inference_process: Updated inference_process to include ethosu_logging and use the logging macros rather than printf() Updated message_process: Updated message_process to include ethosu_logging and use the logging macros rather than printf() Updated ethosu_monitor: Updated ethosu_monitor to include ethosu_logging and use the logging macros rather than printf() Updated layer_by_layer_profiler: Updated layer_by_layer_profiler to include ethosu_logging and use the logging macros rather than printf() Updated mhu_v2: Updated mhu_v2 to include ethosu_logging and use the logging macros rather than printf() Change-Id: I5d6fd80b7645b3e0af5b494eea6dbb7755f02122 --- lib/CMakeLists.txt | 3 + lib/ethosu_log/CMakeLists.txt | 21 ++++++ lib/ethosu_log/include/ethosu_log.h | 80 ++++++++++++++++++++++ lib/ethosu_monitor/CMakeLists.txt | 2 +- lib/ethosu_monitor/src/ethosu_monitor.cpp | 3 +- lib/layer_by_layer_profiler/CMakeLists.txt | 2 +- .../src/layer_by_layer_profiler.cpp | 9 +-- 7 files changed, 113 insertions(+), 7 deletions(-) create mode 100644 lib/ethosu_log/CMakeLists.txt create mode 100644 lib/ethosu_log/include/ethosu_log.h (limited to 'lib') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 5536949..7e47499 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -24,3 +24,6 @@ add_subdirectory(arm_profiler) # Build ethosu_monitor add_subdirectory(ethosu_monitor) + +# Build ethosu_logging +add_subdirectory(ethosu_log) \ No newline at end of file diff --git a/lib/ethosu_log/CMakeLists.txt b/lib/ethosu_log/CMakeLists.txt new file mode 100644 index 0000000..fbbed78 --- /dev/null +++ b/lib/ethosu_log/CMakeLists.txt @@ -0,0 +1,21 @@ +# +# Copyright (c) 2021 Arm Limited. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# +# Licensed under the Apache License, Version 2.0 (the License); you may +# not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an AS IS BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +add_library(ethosu_log INTERFACE) +target_include_directories(ethosu_log INTERFACE include) +target_compile_definitions(ethosu_log INTERFACE ETHOSU_LOG_SEVERITY=${LOG_SEVERITY}) \ No newline at end of file diff --git a/lib/ethosu_log/include/ethosu_log.h b/lib/ethosu_log/include/ethosu_log.h new file mode 100644 index 0000000..4564b98 --- /dev/null +++ b/lib/ethosu_log/include/ethosu_log.h @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2021 Arm Limited. All rights reserved. + * + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the License); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ETHOSU_LOG_H +#define ETHOSU_LOG_H + +/****************************************************************************** + * Includes + ******************************************************************************/ + +#include +#include + +/****************************************************************************** + * Defines + ******************************************************************************/ + +// Log severity levels +#define ETHOSU_LOG_ERR 0 +#define ETHOSU_LOG_WARN 1 +#define ETHOSU_LOG_INFO 2 +#define ETHOSU_LOG_DEBUG 3 + +// Define default log severity +#ifndef ETHOSU_LOG_SEVERITY +#define ETHOSU_LOG_SEVERITY ETHOSU_LOG_WARN +#endif + +// Log formatting + +#define LOG(f, ...) fprintf(stdout, f, ##__VA_ARGS__) + +#if ETHOSU_LOG_SEVERITY >= ETHOSU_LOG_ERR +#define LOG_ERR_N(f, ...) fprintf(stderr, f, ##__VA_ARGS__) +#define LOG_ERR(f, ...) LOG_ERR_N("E: " f " (%s:%d)", ##__VA_ARGS__, strrchr("/" __FILE__, '/') + 1, __LINE__) +#else +#define LOG_ERR(f, ...) +#define LOG_ERR_N(f, ...) +#endif + +#if ETHOSU_LOG_SEVERITY >= ETHOSU_LOG_WARN +#define LOG_WARN_N(f, ...) fprintf(stdout, f, ##__VA_ARGS__) +#define LOG_WARN(f, ...) LOG_WARN_N("W: " f, ##__VA_ARGS__) +#else +#define LOG_WARN(f, ...) +#define LOG_WARN_N(f, ...) +#endif + +#if ETHOSU_LOG_SEVERITY >= ETHOSU_LOG_INFO +#define LOG_INFO_N(f, ...) fprintf(stdout, f, ##__VA_ARGS__) +#define LOG_INFO(f, ...) LOG_INFO_N("I: " f, ##__VA_ARGS__) +#else +#define LOG_INFO(f, ...) +#define LOG_INFO_N(f, ...) +#endif + +#if ETHOSU_LOG_SEVERITY >= ETHOSU_LOG_DEBUG +#define LOG_DEBUG_N(f, ...) fprintf(stdout, f, ##__VA_ARGS__) +#define LOG_DEBUG(f, ...) LOG_DEBUG_N("D: %s(): " f, __FUNCTION__, ##__VA_ARGS__) +#else +#define LOG_DEBUG(f, ...) +#define LOG_DEBUG_N(f, ...) +#endif + +#endif \ No newline at end of file diff --git a/lib/ethosu_monitor/CMakeLists.txt b/lib/ethosu_monitor/CMakeLists.txt index 50f6526..7983c48 100644 --- a/lib/ethosu_monitor/CMakeLists.txt +++ b/lib/ethosu_monitor/CMakeLists.txt @@ -21,6 +21,6 @@ if (NOT TARGET ethosu_core_driver) endif() add_library(ethosu_monitor INTERFACE) -target_link_libraries(ethosu_monitor INTERFACE ethosu_core_driver event_recorder) +target_link_libraries(ethosu_monitor INTERFACE ethosu_core_driver event_recorder ethosu_log) target_include_directories(ethosu_monitor INTERFACE include) target_sources(ethosu_monitor INTERFACE src/ethosu_monitor.cpp) diff --git a/lib/ethosu_monitor/src/ethosu_monitor.cpp b/lib/ethosu_monitor/src/ethosu_monitor.cpp index d5cfce9..651fc28 100644 --- a/lib/ethosu_monitor/src/ethosu_monitor.cpp +++ b/lib/ethosu_monitor/src/ethosu_monitor.cpp @@ -17,6 +17,7 @@ */ #include "ethosu_monitor.hpp" +#include "ethosu_log.h" #include EthosUMonitor::EthosUMonitor(std::vector __eventRecordIds, Backend __backend) : @@ -33,7 +34,7 @@ void EthosUMonitor::monitorSample(ethosu_driver *drv) { break; case PRINTF: default: - printf("ethosu_pmu_cntr%d : %u\n", i, eventCount[i]); + LOG("ethosu_pmu_cntr%d : %u\n", i, eventCount[i]); } } } diff --git a/lib/layer_by_layer_profiler/CMakeLists.txt b/lib/layer_by_layer_profiler/CMakeLists.txt index 9774685..7a16da2 100644 --- a/lib/layer_by_layer_profiler/CMakeLists.txt +++ b/lib/layer_by_layer_profiler/CMakeLists.txt @@ -21,6 +21,6 @@ if (NOT TARGET ethosu_core_driver) endif() add_library(layer_by_layer_profiler INTERFACE) -target_link_libraries(layer_by_layer_profiler INTERFACE ethosu_core_driver tflu event_recorder) +target_link_libraries(layer_by_layer_profiler INTERFACE ethosu_core_driver tflu event_recorder ethosu_log) target_include_directories(layer_by_layer_profiler INTERFACE include) target_sources(layer_by_layer_profiler INTERFACE src/layer_by_layer_profiler.cpp) diff --git a/lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp b/lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp index f7922cb..0211414 100644 --- a/lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp +++ b/lib/layer_by_layer_profiler/src/layer_by_layer_profiler.cpp @@ -23,6 +23,7 @@ #include +#include "ethosu_log.h" #include "layer_by_layer_profiler.hpp" #include #include @@ -88,9 +89,9 @@ void LayerByLayerProfiler::EndEvent(uint32_t event_handle) { } if (backend_ == PRINTF) { - printf("%s : cycle_cnt : %" PRIu64 " cycles\n", - tags_[event_handle], - end_ticks_[event_handle] - start_ticks_[event_handle]); + LOG("%s : cycle_cnt : %" PRIu64 " cycles\n", + tags_[event_handle], + end_ticks_[event_handle] - start_ticks_[event_handle]); } else { EventRecord2(event_id_, (int32_t)event_handle, end_ticks_[event_handle] - start_ticks_[event_handle]); } @@ -112,7 +113,7 @@ void LayerByLayerProfiler::Log() const { if (backend_ == PRINTF) { for (size_t i = 0; i < num_events_; ++i) { uint64_t ticks = end_ticks_[i] - start_ticks_[i]; - printf("%s took %" PRIu64 " cycles\n", tags_[i], ticks); + LOG("%s took %" PRIu64 " cycles", tags_[i], ticks); } } #endif -- cgit v1.2.1