From b25883a44d1a3e04927bab94f326625a593ec640 Mon Sep 17 00:00:00 2001 From: Pablo Marquez Tello Date: Mon, 19 Apr 2021 14:58:57 +0100 Subject: Remove experimental tracing feature * This commit removes the tracing code which has not been maintained for a few releases. * Resolves MLCE-445 Change-Id: I14793c82fe58ffef0cf936edf4af077b5dde85f8 Signed-off-by: Pablo Marquez Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5455 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- SConscript | 7 -- SConstruct | 1 - arm_compute/core/TracePoint.h | 134 --------------------- docs/00_introduction.dox | 3 - scripts/enable_tracing.py | 137 ---------------------- src/core/CL/CLTracePoint.cpp | 60 ---------- src/core/NEON/NETracePoint.cpp | 53 --------- src/core/TracePoint.cpp | 257 ----------------------------------------- src/runtime/CL/TracePoint.cpp | 41 ------- src/runtime/TracePoint.cpp | 49 -------- 10 files changed, 742 deletions(-) delete mode 100644 arm_compute/core/TracePoint.h delete mode 100755 scripts/enable_tracing.py delete mode 100644 src/core/CL/CLTracePoint.cpp delete mode 100644 src/core/NEON/NETracePoint.cpp delete mode 100644 src/core/TracePoint.cpp delete mode 100644 src/runtime/CL/TracePoint.cpp delete mode 100644 src/runtime/TracePoint.cpp diff --git a/SConscript b/SConscript index 936090581c..b09551fc82 100644 --- a/SConscript +++ b/SConscript @@ -300,13 +300,6 @@ if env['neon']: runtime_files += Glob('src/runtime/cpu/*.cpp') runtime_files += Glob('src/runtime/cpu/operators/*.cpp') -if env['tracing']: - arm_compute_env.Append(CPPDEFINES = ['ARM_COMPUTE_TRACING_ENABLED']) -else: - # Remove TracePoint files if tracing is disabled: - core_files = [ f for f in core_files if not "TracePoint" in str(f)] - runtime_files = [ f for f in runtime_files if not "TracePoint" in str(f)] - bootcode_o = [] if env['os'] == 'bare_metal': bootcode_files = Glob('bootcode/*.s') diff --git a/SConstruct b/SConstruct index 5f65099322..d36fbab275 100644 --- a/SConstruct +++ b/SConstruct @@ -59,7 +59,6 @@ vars.AddVariables( BoolVariable("embed_kernels", "Embed OpenCL kernels and OpenGL ES compute shaders in library binary", True), BoolVariable("compress_kernels", "Compress embedded OpenCL kernels in library binary. Note embed_kernels should be enabled", False), BoolVariable("set_soname", "Set the library's soname and shlibversion (requires SCons 2.4 or above)", False), - BoolVariable("tracing", "Enable runtime tracing", False), BoolVariable("openmp", "Enable OpenMP backend", False), BoolVariable("cppthreads", "Enable C++11 threads backend", True), PathVariable("build_dir", "Specify sub-folder for the build", ".", PathVariable.PathAccept), diff --git a/arm_compute/core/TracePoint.h b/arm_compute/core/TracePoint.h deleted file mode 100644 index 508c86acff..0000000000 --- a/arm_compute/core/TracePoint.h +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2020-2021 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#ifndef ARM_COMPUTE_TRACEPOINT_H -#define ARM_COMPUTE_TRACEPOINT_H - -#include -#include -#include - -namespace arm_compute -{ -#ifdef ARM_COMPUTE_TRACING_ENABLED -#define ARM_COMPUTE_CREATE_TRACEPOINT(...) TracePoint __tp(__VA_ARGS__) - -/** Class used to dump configuration values in functions and kernels */ -class TracePoint final -{ -public: - /** Layer types */ - enum class Layer - { - CORE, - RUNTIME - }; - /** struct describing the arguments for a tracepoint */ - struct Args final - { - std::vector args{}; - }; - /** Constructor - * - * @param[in] source type of layer for the tracepoint - * @param[in] class_name the name of the class creating the tracepoint - * @param[in] object a pointer to the actual object owning the tracepoint - * @param[in] args a struct describing all the arguments used in the call to the configure() method - * - */ - TracePoint(Layer source, const std::string &class_name, void *object, Args &&args); - /** Destructor */ - ~TracePoint(); - -private: - static int g_depth; /**< current depth */ - int _depth; /**< tracepoint depth */ -}; - -/** Operator to write an argument to a @ref TracePoint - * - * @param[in] tp Tracepoint to be used for writing - * @param[in] arg Argument to be written in the tracepoint - * - * @return A referece to the updated tracepoint - */ -template -TracePoint::Args &&operator<<(typename std::enable_if < !std::is_pointer::value, TracePoint::Args >::type &&tp, const T &arg); -template -TracePoint::Args &&operator<<(TracePoint::Args &&tp, const T *arg); - -#define ARM_COMPUTE_CONST_REF_CLASS(type) \ - template <> \ - TracePoint::Args &&operator<<(TracePoint::Args &&tp, const type &arg) \ - { \ - ARM_COMPUTE_UNUSED(tp); \ - tp.args.push_back(#type "(" + to_string(arg) + ")"); \ - return std::move(tp); \ - } - -#define ARM_COMPUTE_CONST_PTR_ADDRESS(type) \ - template <> \ - TracePoint::Args &&operator<<(TracePoint::Args &&tp, const type *arg) \ - { \ - ARM_COMPUTE_UNUSED(tp); \ - tp.args.push_back(#type "*(" + to_ptr_string(arg) + ")"); \ - return std::move(tp); \ - } -#define ARM_COMPUTE_CONST_PTR_CLASS(type) \ - template <> \ - TracePoint::Args &&operator<<(TracePoint::Args &&tp, const type *arg) \ - { \ - ARM_COMPUTE_UNUSED(tp); \ - if(arg) \ - tp.args.push_back(#type "(" + to_string(*arg) + ")"); \ - else \ - tp.args.push_back(#type "( nullptr )"); \ - return std::move(tp); \ - } - -#define ARM_COMPUTE_CONST_REF_SIMPLE(type) \ - template <> \ - TracePoint::Args &&operator<<(TracePoint::Args &&tp, const type &arg) \ - { \ - ARM_COMPUTE_UNUSED(tp); \ - tp.args.push_back(#type "(" + support::cpp11::to_string(arg) + ")"); \ - return std::move(tp); \ - } - -#define ARM_COMPUTE_TRACE_TO_STRING(type) \ - std::string to_string(const type &arg) \ - { \ - ARM_COMPUTE_UNUSED(arg); \ - return ""; \ - } -#else /* ARM_COMPUTE_TRACING_ENABLED */ -#define ARM_COMPUTE_CREATE_TRACEPOINT(...) -#define ARM_COMPUTE_CONST_REF_CLASS(type) -#define ARM_COMPUTE_CONST_PTR_ADDRESS(type) -#define ARM_COMPUTE_CONST_PTR_CLASS(type) -#define ARM_COMPUTE_CONST_REF_SIMPLE(type) -#define ARM_COMPUTE_TRACE_TO_STRING(type) -#endif /* ARM_COMPUTE_TRACING_ENABLED */ -} //namespace arm_compute - -#endif /* ARM_COMPUTE_TRACEPOINT_H */ diff --git a/docs/00_introduction.dox b/docs/00_introduction.dox index cfb27ff8b2..8c83259934 100644 --- a/docs/00_introduction.dox +++ b/docs/00_introduction.dox @@ -1485,9 +1485,6 @@ To see the build options available simply run ```scons -h```: set_soname: Set the library's soname and shlibversion (requires SCons 2.4 or above) (yes|no) default: False - tracing: Enable runtime tracing (yes|no) - default: False - openmp: Enable OpenMP backend (yes|no) default: False diff --git a/scripts/enable_tracing.py b/scripts/enable_tracing.py deleted file mode 100755 index fb06a8c6c2..0000000000 --- a/scripts/enable_tracing.py +++ /dev/null @@ -1,137 +0,0 @@ -# -# Copyright (c) 2020 Arm Limited. -# -# SPDX-License-Identifier: MIT -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. -# -# -#!/usr/bin/env python -import re -import os -import sys -import argparse -import fnmatch -import logging - -import json -import glob - -logger = logging.getLogger("acl_tracing") - -# Returns the files matching the given pattern -def find(path, pattern): - matches = [] - for root, dirnames, filenames, in os.walk(path): - for filename in fnmatch.filter(filenames, pattern): - matches.append(os.path.join(root,filename)) - return matches - -# Returns the class name (Core or Runtime) and arguments of the given function -def get_class_and_args(function): - decl = " ".join(function_signature) - m = re.match("void ([^:]+)::configure\(([^)]*)\)", decl) - if m: - assert m, "Can't parse '%s'" % line - class_name = m.group(1) - args = m.group(2) - #Remove comments: - args = re.sub("\/\*.*?\*\/","",args) - #Remove templates - args = re.sub("<.*?>","",args) - logger.debug(args) - arg_names = [] - for arg in args.split(","): - m = re.match(".*?([^ &*]+)$", arg.strip()) - arg_names.append(m.group(1)) - logger.debug(" %s" % m.group(1)) - return (class_name, arg_names) - else: - return ('','') - -# Adds the tracepoints to the source file for the given function -def do_insert_tracing(source, function, fd): - logger.debug("Full signature = %s" % " ".join(function_signature)) - class_name, arg_names = get_class_and_args(function) - if len(arg_names): - assert len(arg_names), "No argument to configure for %s ?" % class_name - spaces = re.match("([ ]*)void", function[0]).group(1) - fd.write("%s ARM_COMPUTE_CREATE_TRACEPOINT(%s, \"%s\", this, TracePoint::Args()" % (spaces, source, class_name)) - for arg in arg_names: - fd.write("<<%s" % arg) - fd.write(");\n") - else: - print('Failed to get class name in %s ' % " ".join(function_signature)) - - -if __name__ == "__main__": - parser = argparse.ArgumentParser( - formatter_class=argparse.RawDescriptionHelpFormatter, - description="Post process JSON benchmark files", - ) - - parser.add_argument("-D", "--debug", action='store_true', help="Enable script debugging output") - args = parser.parse_args() - logging_level = logging.INFO - if args.debug: - logging_level = logging.DEBUG - logging.basicConfig(level=logging_level) - logger.debug("Arguments passed: %s" % str(args.__dict__)) - for f in find("src","*.cpp"): - logger.debug(f) - fd = open(f,'r+') - lines = fd.readlines() - contains_configure = False - for line in lines: - if re.search(r"void.*::configure\(",line): - contains_configure = True - break - if not contains_configure: - continue - fd.seek(0) - fd.truncate() - function_signature = None - insert_tracing = False - start = True - for line in lines: - write = True - if start: - if not (line.startswith("/*") or line.startswith(" *") or line.startswith("#") or len(line.strip()) == 0): - start = False - fd.write("#include \"arm_compute/core/TracePoint.h\"\n") - elif not function_signature: - if re.search(r"void.*::configure\(",line): - function_signature = [ line.rstrip() ] - else: - if re.search("[ ]*{$", line): - insert_tracing = True - else: - function_signature.append(line.rstrip()) - if write: - fd.write(line) - if insert_tracing: - if "/core/" in f: - source = "TracePoint::Layer::CORE" - elif "/runtime/" in f: - source = "TracePoint::Layer::RUNTIME" - else: - assert "Can't find layer for file %s" %f - do_insert_tracing(source, function_signature, fd) - insert_tracing = False - function_signature = None diff --git a/src/core/CL/CLTracePoint.cpp b/src/core/CL/CLTracePoint.cpp deleted file mode 100644 index c76eee74ad..0000000000 --- a/src/core/CL/CLTracePoint.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2020-2021 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/core/TracePoint.h" - -#include "arm_compute/core/CL/ICLTensor.h" -#include "utils/TypePrinter.h" - -#include - -namespace arm_compute -{ -std::string to_string(const ICLTensor &arg) -{ - std::stringstream str; - str << "TensorInfo(" << *arg.info() << ")"; - return str.str(); -} - -template <> -TracePoint::Args &&operator<<(TracePoint::Args &&tp, const ICLTensor *arg) -{ - tp.args.push_back("ICLTensor(" + to_string_if_not_null(arg) + ")"); - return std::move(tp); -} - -ARM_COMPUTE_TRACE_TO_STRING(std::vector) -ARM_COMPUTE_TRACE_TO_STRING(ICLLKInternalKeypointArray) -ARM_COMPUTE_TRACE_TO_STRING(ICLCoefficientTableArray) -ARM_COMPUTE_TRACE_TO_STRING(ICLOldValArray) -ARM_COMPUTE_TRACE_TO_STRING(cl::Buffer) -ARM_COMPUTE_TRACE_TO_STRING(std::vector) - -ARM_COMPUTE_CONST_PTR_CLASS(std::vector) -ARM_COMPUTE_CONST_PTR_CLASS(ICLLKInternalKeypointArray) -ARM_COMPUTE_CONST_PTR_CLASS(ICLCoefficientTableArray) -ARM_COMPUTE_CONST_PTR_CLASS(ICLOldValArray) -ARM_COMPUTE_CONST_PTR_CLASS(cl::Buffer) -ARM_COMPUTE_CONST_PTR_CLASS(std::vector) -} // namespace arm_compute diff --git a/src/core/NEON/NETracePoint.cpp b/src/core/NEON/NETracePoint.cpp deleted file mode 100644 index 756451d230..0000000000 --- a/src/core/NEON/NETracePoint.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2020-2021 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/core/TracePoint.h" - -#include "src/core/NEON/kernels/NELKTrackerKernel.h" -#include "src/core/NEON/kernels/assembly/INEGEMMWrapperKernel.h" -#include "src/core/NEON/kernels/convolution/common/convolution.hpp" -#include "utils/TypePrinter.h" - -#include - -namespace arm_compute -{ -std::string to_string(const PaddingType &arg) -{ - return ((arg == PADDING_SAME) ? "PADDING_SAME" : "PADDING_VALID"); -} - -ARM_COMPUTE_TRACE_TO_STRING(INELKInternalKeypointArray) -ARM_COMPUTE_TRACE_TO_STRING(std::unique_ptr) - -ARM_COMPUTE_CONST_PTR_CLASS(INELKInternalKeypointArray) -ARM_COMPUTE_CONST_PTR_CLASS(std::unique_ptr) - -template <> -TracePoint::Args &&operator<<(TracePoint::Args &&tp, const PaddingType &arg) -{ - tp.args.push_back("PaddingType(" + to_string(arg) + ")"); - return std::move(tp); -} - -} // namespace arm_compute diff --git a/src/core/TracePoint.cpp b/src/core/TracePoint.cpp deleted file mode 100644 index c72c15f13d..0000000000 --- a/src/core/TracePoint.cpp +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Copyright (c) 2020-2021 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/core/TracePoint.h" - -#include "arm_compute/core/ITensor.h" -#include "arm_compute/core/KernelDescriptors.h" -#include "arm_compute/core/PixelValue.h" -#include "arm_compute/core/Window.h" -#include "arm_compute/runtime/FunctionDescriptors.h" -#include "arm_compute/runtime/IWeightsManager.h" -#include "arm_compute/runtime/MemoryGroup.h" -#include "src/core/NEON/kernels/assembly/arm_gemm.hpp" -#include "utils/TypePrinter.h" - -#include -#include - -namespace arm_compute -{ -#ifndef DOXYGEN_SKIP_THIS -int TracePoint::g_depth = 0; - -TracePoint::TracePoint(Layer layer, const std::string &class_name, void *object, Args &&args) - : _depth(++g_depth) -{ - ARM_COMPUTE_UNUSED(layer, object, args); - const std::string indentation = " "; - std::string prefix = ""; - for(int i = 0; i < _depth; ++i) - { - prefix += indentation; - prefix += indentation; - } - printf("%s%s::configure(", prefix.c_str(), class_name.c_str()); - for(auto &arg : args.args) - { - printf("\n%s%s%s", prefix.c_str(), indentation.c_str(), arg.c_str()); - } - printf("\n%s)\n", prefix.c_str()); -} - -TracePoint::~TracePoint() -{ - --g_depth; -} - -std::string to_string(const arm_gemm::Activation &arg) -{ - switch(arg.type) - { - case arm_gemm::Activation::Type::None: - return "None"; - case arm_gemm::Activation::Type::ReLU: - return "ReLU"; - case arm_gemm::Activation::Type::BoundedReLU: - return "BoundedReLU"; - default: - ARM_COMPUTE_ERROR("Not supported"); - return "Uknown"; - }; -} - -std::string to_string(const arm_gemm::GemmArgs &arg) -{ - std::stringstream str; - for(size_t k = 0; k < arg._ci->get_cpu_num(); ++k) - { - str << "[CPUCore " << k << "]" << to_string(arg._ci->get_cpu_model(0)) << " "; - } - str << "Msize= " << arg._Msize << " "; - str << "Nsize= " << arg._Nsize << " "; - str << "Ksize= " << arg._Ksize << " "; - str << "nbatches= " << arg._nbatches << " "; - str << "nmulti= " << arg._nmulti << " "; - str << "trA= " << arg._trA << " "; - str << "trB= " << arg._trB << " "; - str << "Activation= " << to_string(arg._act) << " "; - str << "maxthreads= " << arg._maxthreads << " "; - str << "pretransposed_hint= " << arg._pretransposed_hint << " "; - return str.str(); -} - -std::string to_string(const ITensor &arg) -{ - std::stringstream str; - str << "TensorInfo(" << *arg.info() << ")"; - return str.str(); -} - -std::string to_ptr_string(const void *arg) -{ - std::stringstream ss; - ss << arg; - return ss.str(); -} - -ARM_COMPUTE_TRACE_TO_STRING(ThresholdType) -using pair_uint = std::pair; -ARM_COMPUTE_TRACE_TO_STRING(pair_uint) -ARM_COMPUTE_TRACE_TO_STRING(MemoryGroup) -ARM_COMPUTE_TRACE_TO_STRING(BoxNMSLimitInfo) -ARM_COMPUTE_TRACE_TO_STRING(DepthwiseConvolutionReshapeInfo) -ARM_COMPUTE_TRACE_TO_STRING(DWCWeightsKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(DWCKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(GEMMLHSMatrixInfo) -ARM_COMPUTE_TRACE_TO_STRING(GEMMRHSMatrixInfo) -ARM_COMPUTE_TRACE_TO_STRING(GEMMKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(InstanceNormalizationLayerKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(SoftmaxKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(FuseBatchNormalizationType) -ARM_COMPUTE_TRACE_TO_STRING(DirectConvolutionLayerOutputStageKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(FFTScaleKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(GEMMLowpOutputStageInfo) -ARM_COMPUTE_TRACE_TO_STRING(FFT1DInfo) -ARM_COMPUTE_TRACE_TO_STRING(FFT2DInfo) -ARM_COMPUTE_TRACE_TO_STRING(FFTDigitReverseKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(FFTRadixStageKernelInfo) -ARM_COMPUTE_TRACE_TO_STRING(IWeightsManager) -ARM_COMPUTE_TRACE_TO_STRING(Coordinates2D) -ARM_COMPUTE_TRACE_TO_STRING(ITensorInfo) -ARM_COMPUTE_TRACE_TO_STRING(InternalKeypoint) -ARM_COMPUTE_TRACE_TO_STRING(arm_gemm::Nothing) -ARM_COMPUTE_TRACE_TO_STRING(PixelValue) -ARM_COMPUTE_TRACE_TO_STRING(std::allocator) -using array_f32 = std::array; -ARM_COMPUTE_TRACE_TO_STRING(array_f32) - -ARM_COMPUTE_CONST_REF_CLASS(arm_gemm::GemmArgs) -ARM_COMPUTE_CONST_REF_CLASS(arm_gemm::Nothing) -ARM_COMPUTE_CONST_REF_CLASS(arm_gemm::Activation) -ARM_COMPUTE_CONST_REF_CLASS(DirectConvolutionLayerOutputStageKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(GEMMLowpOutputStageInfo) -ARM_COMPUTE_CONST_REF_CLASS(DWCWeightsKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(DWCKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(DepthwiseConvolutionReshapeInfo) -ARM_COMPUTE_CONST_REF_CLASS(GEMMLHSMatrixInfo) -ARM_COMPUTE_CONST_REF_CLASS(GEMMRHSMatrixInfo) -ARM_COMPUTE_CONST_REF_CLASS(GEMMKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(InstanceNormalizationLayerKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(SoftmaxKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(PaddingMode) -ARM_COMPUTE_CONST_REF_CLASS(Coordinates) -ARM_COMPUTE_CONST_REF_CLASS(FFT1DInfo) -ARM_COMPUTE_CONST_REF_CLASS(FFT2DInfo) -ARM_COMPUTE_CONST_REF_CLASS(FFTDigitReverseKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(FFTRadixStageKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(FFTScaleKernelInfo) -ARM_COMPUTE_CONST_REF_CLASS(MemoryGroup) -ARM_COMPUTE_CONST_REF_CLASS(IWeightsManager) -ARM_COMPUTE_CONST_REF_CLASS(ActivationLayerInfo) -ARM_COMPUTE_CONST_REF_CLASS(PoolingLayerInfo) -ARM_COMPUTE_CONST_REF_CLASS(PadStrideInfo) -ARM_COMPUTE_CONST_REF_CLASS(NormalizationLayerInfo) -ARM_COMPUTE_CONST_REF_CLASS(Size2D) -ARM_COMPUTE_CONST_REF_CLASS(WeightsInfo) -ARM_COMPUTE_CONST_REF_CLASS(GEMMInfo) -ARM_COMPUTE_CONST_REF_CLASS(GEMMReshapeInfo) -ARM_COMPUTE_CONST_REF_CLASS(Window) -ARM_COMPUTE_CONST_REF_CLASS(BorderSize) -ARM_COMPUTE_CONST_REF_CLASS(BorderMode) -ARM_COMPUTE_CONST_REF_CLASS(PhaseType) -ARM_COMPUTE_CONST_REF_CLASS(MagnitudeType) -ARM_COMPUTE_CONST_REF_CLASS(Termination) -ARM_COMPUTE_CONST_REF_CLASS(ReductionOperation) -ARM_COMPUTE_CONST_REF_CLASS(InterpolationPolicy) -ARM_COMPUTE_CONST_REF_CLASS(SamplingPolicy) -ARM_COMPUTE_CONST_REF_CLASS(DataType) -ARM_COMPUTE_CONST_REF_CLASS(DataLayout) -ARM_COMPUTE_CONST_REF_CLASS(Channel) -ARM_COMPUTE_CONST_REF_CLASS(ConvertPolicy) -ARM_COMPUTE_CONST_REF_CLASS(TensorShape) -ARM_COMPUTE_CONST_REF_CLASS(PixelValue) -ARM_COMPUTE_CONST_REF_CLASS(Strides) -ARM_COMPUTE_CONST_REF_CLASS(WinogradInfo) -ARM_COMPUTE_CONST_REF_CLASS(RoundingPolicy) -ARM_COMPUTE_CONST_REF_CLASS(MatrixPattern) -ARM_COMPUTE_CONST_REF_CLASS(NonLinearFilterFunction) -ARM_COMPUTE_CONST_REF_CLASS(ThresholdType) -ARM_COMPUTE_CONST_REF_CLASS(ROIPoolingLayerInfo) -ARM_COMPUTE_CONST_REF_CLASS(BoundingBoxTransformInfo) -ARM_COMPUTE_CONST_REF_CLASS(ComparisonOperation) -ARM_COMPUTE_CONST_REF_CLASS(ArithmeticOperation) -ARM_COMPUTE_CONST_REF_CLASS(BoxNMSLimitInfo) -ARM_COMPUTE_CONST_REF_CLASS(FuseBatchNormalizationType) -ARM_COMPUTE_CONST_REF_CLASS(ElementWiseUnary) -ARM_COMPUTE_CONST_REF_CLASS(ComputeAnchorsInfo) -ARM_COMPUTE_CONST_REF_CLASS(PriorBoxLayerInfo) -ARM_COMPUTE_CONST_REF_CLASS(DetectionOutputLayerInfo) -ARM_COMPUTE_CONST_REF_CLASS(Coordinates2D) -ARM_COMPUTE_CONST_REF_CLASS(std::vector) -ARM_COMPUTE_CONST_REF_CLASS(std::vector) -ARM_COMPUTE_CONST_REF_CLASS(std::vector) -ARM_COMPUTE_CONST_REF_CLASS(pair_uint) -ARM_COMPUTE_CONST_REF_CLASS(array_f32) - -ARM_COMPUTE_CONST_PTR_CLASS(ITensor) -ARM_COMPUTE_CONST_PTR_CLASS(ITensorInfo) -ARM_COMPUTE_CONST_PTR_CLASS(IWeightsManager) -ARM_COMPUTE_CONST_PTR_CLASS(InternalKeypoint) -ARM_COMPUTE_CONST_PTR_CLASS(Window) -ARM_COMPUTE_CONST_PTR_CLASS(HOGInfo) -ARM_COMPUTE_CONST_PTR_CLASS(std::allocator) -ARM_COMPUTE_CONST_PTR_CLASS(std::vector) - -ARM_COMPUTE_CONST_REF_SIMPLE(bool) -ARM_COMPUTE_CONST_REF_SIMPLE(uint64_t) -ARM_COMPUTE_CONST_REF_SIMPLE(int64_t) -ARM_COMPUTE_CONST_REF_SIMPLE(uint32_t) -ARM_COMPUTE_CONST_REF_SIMPLE(int32_t) -ARM_COMPUTE_CONST_REF_SIMPLE(int16_t) -ARM_COMPUTE_CONST_REF_SIMPLE(float) - -ARM_COMPUTE_CONST_PTR_ADDRESS(float) -ARM_COMPUTE_CONST_PTR_ADDRESS(uint8_t) -ARM_COMPUTE_CONST_PTR_ADDRESS(void) -ARM_COMPUTE_CONST_PTR_ADDRESS(short) -ARM_COMPUTE_CONST_PTR_ADDRESS(int) -ARM_COMPUTE_CONST_PTR_ADDRESS(uint64_t) -ARM_COMPUTE_CONST_PTR_ADDRESS(uint32_t) -ARM_COMPUTE_CONST_PTR_ADDRESS(uint16_t) - -template <> -TracePoint::Args &&operator<<(TracePoint::Args &&tp, const uint16_t &arg) -{ - tp.args.push_back("uint16_t(" + support::cpp11::to_string(arg) + ")"); - return std::move(tp); -} - -template <> -TracePoint::Args &&operator<<(TracePoint::Args &&tp, const uint8_t &arg) -{ - tp.args.push_back("uint8_t(" + support::cpp11::to_string(arg) + ")"); - return std::move(tp); -} -#endif /* DOXYGEN_SKIP_THIS */ -} // namespace arm_compute diff --git a/src/runtime/CL/TracePoint.cpp b/src/runtime/CL/TracePoint.cpp deleted file mode 100644 index 542bb185bc..0000000000 --- a/src/runtime/CL/TracePoint.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2020-2021 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/core/TracePoint.h" -#include "arm_compute/runtime/CL/CLArray.h" -#include "arm_compute/runtime/CL/CLPyramid.h" -#include "arm_compute/runtime/CL/functions/CLLSTMLayer.h" -#include "utils/TypePrinter.h" - -#include -#include - -namespace arm_compute -{ -ARM_COMPUTE_TRACE_TO_STRING(CLPyramid) -ARM_COMPUTE_TRACE_TO_STRING(LSTMParams) -ARM_COMPUTE_TRACE_TO_STRING(CLCoordinates2DArray) -ARM_COMPUTE_CONST_PTR_CLASS(CLPyramid) -ARM_COMPUTE_CONST_PTR_CLASS(LSTMParams) -ARM_COMPUTE_CONST_PTR_CLASS(CLCoordinates2DArray) -} // namespace arm_compute diff --git a/src/runtime/TracePoint.cpp b/src/runtime/TracePoint.cpp deleted file mode 100644 index 1732df4432..0000000000 --- a/src/runtime/TracePoint.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2020-2021 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/core/TracePoint.h" -#include -#include - -#include "arm_compute/runtime/Array.h" -#include "arm_compute/runtime/Pyramid.h" -#include "arm_compute/runtime/common/LSTMParams.h" -#include "src/core/NEON/kernels/assembly/arm_gemm.hpp" -#include "utils/TypePrinter.h" - -namespace arm_compute -{ -ARM_COMPUTE_TRACE_TO_STRING(KeyPointArray) -ARM_COMPUTE_TRACE_TO_STRING(Pyramid) -ARM_COMPUTE_TRACE_TO_STRING(LSTMParams) -ARM_COMPUTE_TRACE_TO_STRING(FullyConnectedLayerInfo) -ARM_COMPUTE_TRACE_TO_STRING(arm_gemm::Requantize32) - -ARM_COMPUTE_CONST_PTR_CLASS(KeyPointArray) -ARM_COMPUTE_CONST_PTR_CLASS(Pyramid) -ARM_COMPUTE_CONST_PTR_CLASS(LSTMParams) -ARM_COMPUTE_CONST_PTR_CLASS(DetectionPostProcessLayerInfo) -ARM_COMPUTE_CONST_PTR_CLASS(FullyConnectedLayerInfo) -ARM_COMPUTE_CONST_PTR_CLASS(GenerateProposalsInfo) -ARM_COMPUTE_CONST_PTR_CLASS(arm_gemm::Requantize32) -} // namespace arm_compute -- cgit v1.2.1