mirror of
https://github.com/simdjson/simdjson
synced 2026-06-08 17:27:07 +00:00
strager
5510089d45
* Rename simdjson_really_inline -> simdjson_inline I want to change the simdjson_really_inline macro to sometimes not force inlining. After that upcoming change, the name simdjson_really_inline will no longer makes sense. Rename simdjson_really_inline to simdjson_inline. This patch should not change semantics; simdjson_inline still forces inlining as before. Some functions still need to be really inlined for ABI reasons. (GCC's -Wpsabi complains otherwise.) Leave those functions marked as simdjson_really_inline. * Improve build times for debug builds simdjson_inline is used for most simdjson functions. It forces inlining. In unoptimized/debug builds, this can lead to a lot of machine code being generated (especially with Address Sanitizer), causing slow compilation. Change simdjson_inline to force inlining only for optimized builds. Sometimes, the programmer might want a slightly-optimized build and want fast compilation (e.g. GCC's -Og mode). Allow simdjson users to define the simdjson_inline macro themselves (e.g. on the command line: -Dsimdjson_inline=inline) in cases where the default behavior is undesired. This patch reduced build times by over 75% for ondemand_object_tests.cpp with GCC 9.4.0 and CMAKE_BUILD_TYPE=Debug on my AMD 5950X: Before: 6.885 6.683 6.971 6.957 6.949 seconds (5 samples) After: 1.492 1.551 1.494 1.490 1.531 seconds (5 samples)
67 lines
2.9 KiB
C++
67 lines
2.9 KiB
C++
namespace simdjson {
|
|
namespace SIMDJSON_IMPLEMENTATION {
|
|
namespace ondemand {
|
|
|
|
simdjson_inline array_iterator::array_iterator(const value_iterator &_iter) noexcept
|
|
: iter{_iter}
|
|
{}
|
|
|
|
simdjson_inline simdjson_result<value> array_iterator::operator*() noexcept {
|
|
if (iter.error()) { iter.abandon(); return iter.error(); }
|
|
return value(iter.child());
|
|
}
|
|
simdjson_inline bool array_iterator::operator==(const array_iterator &other) const noexcept {
|
|
return !(*this != other);
|
|
}
|
|
simdjson_inline bool array_iterator::operator!=(const array_iterator &) const noexcept {
|
|
return iter.is_open();
|
|
}
|
|
simdjson_inline array_iterator &array_iterator::operator++() noexcept {
|
|
error_code error;
|
|
// PERF NOTE this is a safety rail ... users should exit loops as soon as they receive an error, so we'll never get here.
|
|
// However, it does not seem to make a perf difference, so we add it out of an abundance of caution.
|
|
if (( error = iter.error() )) { return *this; }
|
|
if (( error = iter.skip_child() )) { return *this; }
|
|
if (( error = iter.has_next_element().error() )) { return *this; }
|
|
return *this;
|
|
}
|
|
|
|
} // namespace ondemand
|
|
} // namespace SIMDJSON_IMPLEMENTATION
|
|
} // namespace simdjson
|
|
|
|
namespace simdjson {
|
|
|
|
simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>::simdjson_result(
|
|
SIMDJSON_IMPLEMENTATION::ondemand::array_iterator &&value
|
|
) noexcept
|
|
: SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>(std::forward<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>(value))
|
|
{
|
|
first.iter.assert_is_valid();
|
|
}
|
|
simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>::simdjson_result(error_code error) noexcept
|
|
: SIMDJSON_IMPLEMENTATION::implementation_simdjson_result_base<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>({}, error)
|
|
{
|
|
}
|
|
|
|
simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::value> simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>::operator*() noexcept {
|
|
if (error()) { return error(); }
|
|
return *first;
|
|
}
|
|
simdjson_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>::operator==(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> &other) const noexcept {
|
|
if (!first.iter.is_valid()) { return !error(); }
|
|
return first == other.first;
|
|
}
|
|
simdjson_inline bool simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>::operator!=(const simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> &other) const noexcept {
|
|
if (!first.iter.is_valid()) { return error(); }
|
|
return first != other.first;
|
|
}
|
|
simdjson_inline simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator> &simdjson_result<SIMDJSON_IMPLEMENTATION::ondemand::array_iterator>::operator++() noexcept {
|
|
// Clear the error if there is one, so we don't yield it twice
|
|
if (error()) { second = SUCCESS; return *this; }
|
|
++(first);
|
|
return *this;
|
|
}
|
|
|
|
} // namespace simdjson
|