Skip to content

Commit

Permalink
fix pedantic warnings (MR #24)
Browse files Browse the repository at this point in the history
  • Loading branch information
@biojppm
biojppm committed Dec 29, 2019
2 parents 3dc1f66 + 9904f1e commit d92d81e
Show file tree
Hide file tree
Showing 48 changed files with 331 additions and 166 deletions.
12 changes: 7 additions & 5 deletions bm/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ryml_setup_benchmarking(ryml)
# -----------------------------------------------------------------------------
# json libs that will be compared with ryml (and the other yaml libs)

set(_ed ${CMAKE_CURRENT_BINARY_DIR}/extern) # casual ryml extern dir (these projects are not part of ryml and are downloaded and compiled on the fly)
set(_ed ${CMAKE_CURRENT_BINARY_DIR}/ext) # casual ryml extern dir (these projects are not part of ryml and are downloaded and compiled on the fly)

# jsoncpp needs to be compiled
c4_override(JSONCPP_WITH_TESTS OFF)
Expand Down Expand Up @@ -32,16 +32,18 @@ ryml_require_subproject(nlohmann_json REMOTE
GIT_TAG master)

# rapidjson is header only
ryml_download_remote_proj(rapidjson ${_ed}/rapidjson
set(rapidjson_dir ${_ed}/rapidjson)
ryml_download_remote_proj(rapidjson rapidjson_dir
GIT_REPOSITORY https://github.com/Tencent/rapidjson
GIT_TAG version1.1.0)
set(RYML_RAPIDJSON_INC_DIR ${_ed}/rapidjson/src/include)
set(RYML_RAPIDJSON_INC_DIR ${rapidjson_dir}/include)

# sajson is header only
ryml_download_remote_proj(sajson ${_ed}/sajson
set(sajson_dir ${_ed}/sajson)
ryml_download_remote_proj(sajson sajson_dir
GIT_REPOSITORY https://github.com/chadaustin/sajson
GIT_TAG master)
set(RYML_SAJSON_INC_DIR ${_ed}/sajson/src/include)
set(RYML_SAJSON_INC_DIR ${sajson_dir}/include)


# -----------------------------------------------------------------------------
Expand Down
148 changes: 103 additions & 45 deletions bm/parse.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,69 @@
#include <benchmark/benchmark.h>
#include <ryml.hpp>
#include <ryml_std.hpp>
#include <c4/fs/fs.hpp>
#include "../test/libyaml.hpp"

#include <vector>
#include <iostream>
#include <yaml-cpp/yaml.h>

#include <benchmark/benchmark.h>

#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 4100) // sajson.h(1313,41): warning C4100: 'input_document_size_in_bytes': unreferenced formal parameter
# pragma warning(disable : 4127) // conditional expression is constant
# pragma warning(disable : 4200) // sajson.h(209,28): warning C4200: nonstandard extension used: zero-sized array in struct/union
# pragma warning(disable : 4244) // sajson.h(2295,26): warning C4244: '=': conversion from 'unsigned int' to 'char', possible loss of data
# pragma warning(disable : 4389) // '==': signed/unsigned mismatch
# pragma warning(disable : 4996) // warning C4996: 'Json::Reader': Use CharReader and CharReaderBuilder instead.
#elif defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wunused-parameter"
# pragma clang diagnostic ignored "-Wc99-extensions"
# pragma clang diagnostic ignored "-Wfloat-equal"
# pragma clang diagnostic ignored "-Wshadow"
#elif defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wshadow"
# pragma GCC diagnostic ignored "-Wunused-parameter"
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
# pragma GCC diagnostic ignored "-Wfloat-equal"
# pragma GCC diagnostic ignored "-Wpedantic"
# if __GNUC__ >= 8
# pragma GCC diagnostic ignored "-Wclass-memaccess" // rapidjson/document.h:1952:24
# endif
#endif
#include <rapidjson/document.h>
#include <sajson.h>
#include <json/json.h>
#include <nlohmann/json.hpp>
#include <yaml-cpp/yaml.h>
#if defined(_MSC_VER)
# pragma warning(pop)
#elif defined(__clang__)
# pragma clang diagnostic pop
#elif defined(__GNUC__)
# pragma GCC diagnostic pop
#endif


namespace bm = benchmark;


// now for our code
#if defined(_MSC_VER)
# pragma warning(push)
# pragma warning(disable : 4996) // warning C4996: 'Json::Reader': Use CharReader and CharReaderBuilder instead.
#elif defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wdeprecated-declarations"
# pragma clang diagnostic ignored "-Wunused-variable"
#elif defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
# pragma GCC diagnostic ignored "-Wunused-variable"
#endif

//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -98,14 +148,14 @@ struct BmCase
*
* don't declare the case as static as there's no guarantee the allocator's
* lifetime starts before and ends after the case's lifetime */
static BmCase * C4_RESTRICT c = nullptr;
static BmCase * C4_RESTRICT s_bm_case = nullptr;


int main(int argc, char** argv)
{
BmCase fixture;
c = &fixture;
c->run(argc, argv);
s_bm_case = &fixture;
s_bm_case->run(argc, argv);
}


Expand All @@ -114,167 +164,167 @@ int main(int argc, char** argv)
//-----------------------------------------------------------------------------

#define ONLY_FOR_JSON \
if(!c->is_json) { st.SkipWithError("not a json file"); return; }
if(!s_bm_case->is_json) { st.SkipWithError("not a json file"); return; }

void rapidjson_ro(bm::State& st)
{
const char *src = c->src.data();
const char *src = s_bm_case->src.data();
for(auto _ : st)
{
ONLY_FOR_JSON;
rapidjson::Document doc;
doc.Parse(src);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void rapidjson_rw(bm::State& st)
{
char *src = c->in_place.data();
char *src = s_bm_case->in_place.data();
for(auto _ : st)
{
ONLY_FOR_JSON;
c->prepare(st, kResetInPlace);
s_bm_case->prepare(st, kResetInPlace);
rapidjson::Document doc;
doc.ParseInsitu(src);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void sajson_ro(bm::State& st)
{
sajson::string src = {c->src.data(), c->src.size()};
sajson::string src = {s_bm_case->src.data(), s_bm_case->src.size()};
for(auto _ : st)
{
ONLY_FOR_JSON;
sajson::document document = sajson::parse(sajson::dynamic_allocation(), src);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void sajson_rw(bm::State& st)
{
sajson::mutable_string_view src = {c->in_place.size(), c->in_place.data()};
sajson::mutable_string_view src = {s_bm_case->in_place.size(), s_bm_case->in_place.data()};
for(auto _ : st)
{
ONLY_FOR_JSON;
c->prepare(st, kResetInPlace);
s_bm_case->prepare(st, kResetInPlace);
sajson::document document = sajson::parse(sajson::dynamic_allocation(), src);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void jsoncpp_ro(bm::State& st)
{
const char *b = &c->src.front(), *e = &c->src.back();
const char *b = &s_bm_case->src.front(), *e = &s_bm_case->src.back();
for(auto _ : st)
{
ONLY_FOR_JSON;
Json::Value root;
Json::Reader reader;
reader.parse(b, e, root);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void nlohmann_json_ro(bm::State& st)
{
const char* src = c->src.data();
const char* src = s_bm_case->src.data();
for(auto _ : st)
{
ONLY_FOR_JSON;
auto root = nlohmann::json::parse(src);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void yamlcpp_ro(bm::State& st)
{
const char* src = c->src.data();
const char* src = s_bm_case->src.data();
for(auto _ : st)
{
YAML::Node node = YAML::Load(src);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void libyaml_ro(bm::State& st)
{
c4::csubstr src = c4::to_csubstr(c->src.data());
c4::csubstr src = c4::to_csubstr(s_bm_case->src.data());
for(auto _ : st)
{
c4::yml::LibyamlParser p;
c4::yml::Tree t;
p.parse(&t, src);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void libyaml_ro_reuse(bm::State& st)
{
c4::csubstr src = c4::to_csubstr(c->src.data());
c4::csubstr src = c4::to_csubstr(s_bm_case->src.data());
for(auto _ : st)
{
c4::yml::LibyamlParser libyaml_parser;
c->prepare(st, kClearTree|kClearTreeArena);
libyaml_parser.parse(&c->libyaml_tree, src);
s_bm_case->prepare(st, kClearTree|kClearTreeArena);
libyaml_parser.parse(&s_bm_case->libyaml_tree, src);
}
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void ryml_ro(bm::State& st)
{
size_t sz = 0;
c4::csubstr src = c4::to_csubstr(c->src);
c4::csubstr src = c4::to_csubstr(s_bm_case->src);
for(auto _ : st)
{
ryml::Tree tree = ryml::parse(c->filename, src);
ryml::Tree tree = ryml::parse(s_bm_case->filename, src);
sz = tree.size();
}
st.SetItemsProcessed(st.iterations() * sz);
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void ryml_rw(bm::State& st)
{
size_t sz = 0;
c4::substr src = c4::to_substr(c->in_place);
c4::substr src = c4::to_substr(s_bm_case->in_place);
for(auto _ : st)
{
c->prepare(st, kResetInPlace);
ryml::Tree tree = ryml::parse(c->filename, src);
s_bm_case->prepare(st, kResetInPlace);
ryml::Tree tree = ryml::parse(s_bm_case->filename, src);
sz = tree.size();
}
st.SetItemsProcessed(st.iterations() * sz);
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void ryml_ro_reuse(bm::State& st)
{
size_t sz = 0;
c4::csubstr src = c4::to_csubstr(c->src);
c4::csubstr src = c4::to_csubstr(s_bm_case->src);
for(auto _ : st)
{
c->prepare(st, kClearTree|kClearTreeArena);
c->ryml_parser.parse(c->filename, src, &c->ryml_tree);
sz = c->ryml_tree.size();
s_bm_case->prepare(st, kClearTree|kClearTreeArena);
s_bm_case->ryml_parser.parse(s_bm_case->filename, src, &s_bm_case->ryml_tree);
sz = s_bm_case->ryml_tree.size();
}
st.SetItemsProcessed(st.iterations() * sz);
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

void ryml_rw_reuse(bm::State& st)
{
size_t sz = 0;
c4::substr src = c4::to_substr(c->in_place);
c4::substr src = c4::to_substr(s_bm_case->in_place);
for(auto _ : st)
{
c->prepare(st, kResetInPlace|kClearTree|kClearTreeArena);
c->ryml_parser.parse(c->filename, c4::to_substr(c->in_place), &c->ryml_tree);
sz = c->ryml_tree.size();
s_bm_case->prepare(st, kResetInPlace|kClearTree|kClearTreeArena);
s_bm_case->ryml_parser.parse(s_bm_case->filename, src, &s_bm_case->ryml_tree);
sz = s_bm_case->ryml_tree.size();
}
st.SetItemsProcessed(st.iterations() * sz);
st.SetBytesProcessed(st.iterations() * c->src.size());
st.SetBytesProcessed(st.iterations() * s_bm_case->src.size());
}

BENCHMARK(rapidjson_ro);
Expand All @@ -290,3 +340,11 @@ BENCHMARK(ryml_ro);
BENCHMARK(ryml_rw);
BENCHMARK(ryml_ro_reuse);
BENCHMARK(ryml_rw_reuse);

#if defined(_MSC_VER)
# pragma warning(pop)
#elif defined(__clang__)
# pragma clang diagnostic pop
#elif defined(__GNUC__)
# pragma GCC diagnostic pop
#endif
2 changes: 1 addition & 1 deletion extern/c4core
Submodule c4core updated 29 files
+33 −33 bm/charconv.cpp
+1 −1 cmake
+1 −1 src/c4/allocator.hpp
+26 −0 src/c4/base64.cpp
+17 −3 src/c4/bitmask.hpp
+2 −2 src/c4/charconv.hpp
+25 −11 src/c4/error.hpp
+2 −2 src/c4/format.hpp
+10 −2 src/c4/memory_resource.hpp
+54 −54 src/c4/memory_util.hpp
+11 −0 src/c4/restrict.hpp
+2 −3 src/c4/substr.hpp
+10 −10 src/c4/type_name.hpp
+11 −0 src/c4/unrestrict.hpp
+3 −0 test/allocator.cpp
+4 −0 test/base64.cpp
+3 −0 test/c4/libtest/supprwarn_push.hpp
+41 −34 test/char_traits.cpp
+3 −0 test/charconv.cpp
+49 −49 test/ctor_dtor.cpp
+11 −9 test/enum.cpp
+3 −0 test/error.cpp
+4 −1 test/format.cpp
+6 −2 test/memory_resource.cpp
+6 −3 test/memory_util.cpp
+91 −91 test/span.cpp
+4 −2 test/substr.cpp
+1 −1 test/szconv.cpp
+16 −16 test/type_name.cpp
17 changes: 14 additions & 3 deletions src/c4/yml/detail/checks.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@

#include "c4/yml/tree.hpp"

#ifdef __clang__
# pragma clang diagnostic push
#elif defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wtype-limits" // error: comparison of unsigned expression >= 0 is always true
#endif

namespace c4 {
namespace yml {
Expand Down Expand Up @@ -145,7 +151,7 @@ inline void check_free_list(Tree const& t)
C4_CHECK(t.m_free_tail >= 0 && t.m_free_tail < t.m_cap)

auto const& head = *t._p(t.m_free_head);
auto const& tail = *t._p(t.m_free_tail);
//auto const& tail = *t._p(t.m_free_tail);

//C4_CHECK(head.m_prev_sibling == NONE);
//C4_CHECK(tail.m_next_sibling == NONE);
Expand All @@ -171,14 +177,19 @@ inline void check_free_list(Tree const& t)

inline void check_arena(Tree const& t)
{
C4_CHECK(t.m_arena.len == 0 || t.m_arena_pos >= 0 && t.m_arena_pos < t.m_arena.len);
C4_CHECK(t.m_arena.len == 0 || (t.m_arena_pos >= 0 && t.m_arena_pos < t.m_arena.len));
C4_CHECK(t.arena_size() == t.m_arena_pos);
C4_CHECK(t.arena_slack() == t.m_arena.len - t.m_arena_pos);
C4_CHECK(t.arena_slack() + t.m_arena_pos == t.m_arena.len);
}


} /* namespace yml */
} /* namespace c4 */

#ifdef __clang__
# pragma clang diagnostic pop
#elif defined(__GNUC__)
# pragma GCC diagnostic pop
#endif

#endif /* C4_YML_DETAIL_CHECKS_HPP_ */
Loading

0 comments on commit d92d81e

Please sign in to comment.