From 323ce0f0b06bca785959913e75e1f51d383c351a Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Fri, 30 Nov 2018 16:30:43 +0000 Subject: COMPMID-1819 Add option to build library with -fno-exceptions Change-Id: I3de6bb33746d52f8d8c337ab7776eccee8c205fb Reviewed-on: https://review.mlplatform.org/328 Reviewed-by: Georgios Pinitas Reviewed-by: Pablo Marquez Tested-by: Arm Jenkins --- src/core/Error.cpp | 4 ++-- src/core/Utils.cpp | 4 ++++ src/graph/TypeLoader.cpp | 15 +++++++++++++++ src/runtime/CPP/CPPScheduler.cpp | 11 +++++++++-- src/runtime/MEMUtils.cpp | 4 ++++ 5 files changed, 34 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/Error.cpp b/src/core/Error.cpp index 2f6a94bb85..e7b43655a2 100644 --- a/src/core/Error.cpp +++ b/src/core/Error.cpp @@ -54,9 +54,9 @@ void arm_compute::error(const char *function, const char *file, const int line, va_start(args, msg); auto err = create_error_va_list(ErrorCode::RUNTIME_ERROR, function, file, line, msg, args); va_end(args); - throw std::runtime_error(err.error_description()); + ARM_COMPUTE_THROW(std::runtime_error(err.error_description())); } void Status::internal_throw_on_error() const { - throw std::runtime_error(_error_description); + ARM_COMPUTE_THROW(std::runtime_error(_error_description)); } diff --git a/src/core/Utils.cpp b/src/core/Utils.cpp index 39dad8f581..6080dc45ba 100644 --- a/src/core/Utils.cpp +++ b/src/core/Utils.cpp @@ -48,8 +48,10 @@ std::string arm_compute::read_file(const std::string &filename, bool binary) std::string out; std::ifstream fs; +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED try { +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ fs.exceptions(std::ifstream::failbit | std::ifstream::badbit); std::ios_base::openmode mode = std::ios::in; @@ -68,11 +70,13 @@ std::string arm_compute::read_file(const std::string &filename, bool binary) fs.seekg(0, std::ios::beg); // Copy the content of the file out.assign(std::istreambuf_iterator(fs), std::istreambuf_iterator()); +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } catch(const std::ifstream::failure &e) { ARM_COMPUTE_ERROR("Accessing %s: %s", filename.c_str(), e.what()); } +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ return out; } diff --git a/src/graph/TypeLoader.cpp b/src/graph/TypeLoader.cpp index 30a3546821..096188a7f9 100644 --- a/src/graph/TypeLoader.cpp +++ b/src/graph/TypeLoader.cpp @@ -38,14 +38,19 @@ arm_compute::DataType data_type_from_name(const std::string &name) { "qasymm8", DataType::QASYMM8 }, }; +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED try { +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ return data_types.at(arm_compute::utility::tolower(name)); + +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } catch(const std::out_of_range &) { throw std::invalid_argument(name); } +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ } arm_compute::DataLayout data_layout_from_name(const std::string &name) @@ -56,14 +61,19 @@ arm_compute::DataLayout data_layout_from_name(const std::string &name) { "nchw", DataLayout::NCHW }, }; +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED try { +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ return data_layouts.at(arm_compute::utility::tolower(name)); + +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } catch(const std::out_of_range &) { throw std::invalid_argument(name); } +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ } namespace graph { @@ -76,14 +86,19 @@ Target target_from_name(const std::string &name) { "gles", Target::GC }, }; +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED try { +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ return targets.at(arm_compute::utility::tolower(name)); + +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } catch(const std::out_of_range &) { throw std::invalid_argument(name); } +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ } } // namespace graph } // namespace arm_compute diff --git a/src/runtime/CPP/CPPScheduler.cpp b/src/runtime/CPP/CPPScheduler.cpp index 2b179fd5ff..5916bb46fd 100644 --- a/src/runtime/CPP/CPPScheduler.cpp +++ b/src/runtime/CPP/CPPScheduler.cpp @@ -190,15 +190,19 @@ void CPPScheduler::Thread::worker_thread() return; } +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED try { +#endif /* ARM_COMPUTE_EXCEPTIONS_ENABLED */ process_workloads(*_workloads, *_feeder, _info); + +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } catch(...) { _current_exception = std::current_exception(); } - +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ _job_complete = true; lock.unlock(); _cv.notify_one(); @@ -250,18 +254,21 @@ void CPPScheduler::run_workloads(std::vector &workloads) info.thread_id = t; process_workloads(workloads, feeder, info); - +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED try { +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ for(auto &thread : _threads) { thread.wait(); } +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } catch(const std::system_error &e) { std::cerr << "Caught system_error with code " << e.code() << " meaning " << e.what() << '\n'; } +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ } #endif /* DOXYGEN_SKIP_THIS */ diff --git a/src/runtime/MEMUtils.cpp b/src/runtime/MEMUtils.cpp index a45f9c80c1..be6a3b690d 100644 --- a/src/runtime/MEMUtils.cpp +++ b/src/runtime/MEMUtils.cpp @@ -48,8 +48,10 @@ void parse_mem_info(size_t &total, size_t &free, size_t &buffer) std::stringstream str_stream; str_stream << meminfo_f.rdbuf(); const std::string str = str_stream.str(); +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED try { +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ std::smatch match; if(std::regex_search(str, match, std::regex("MemTotal: (.*)kB")) && match.size() > 1) { @@ -72,12 +74,14 @@ void parse_mem_info(size_t &total, size_t &free, size_t &buffer) memcache = arm_compute::support::cpp11::stoul(result, nullptr); } free = memfree + (buffer + memcache); +#ifndef ARM_COMPUTE_EXCEPTIONS_DISABLED } catch(std::regex_error &e) { // failed parsing /proc/meminfo // return 0s on all fields } +#endif /* ARM_COMPUTE_EXCEPTIONS_DISABLED */ } #endif // ifndef BARE_METAL } -- cgit v1.2.1