- Updated to version 1.6.3

- e_subst has been rewritten and no longer requires specifying the format string twice.
- Added the e_int method for formatting integers.
- Bug fixes and code optimizations.
- Benchmarks and tests added.
- Updated documentation and benchmark results.

- Обновлена версия на 1.6.3
- e_subst переделан и теперь не требует указывать форматную строку дважды.
- Добавлен метод e_int для форматирования целых чисел.
- Исправлены ошибки, оптимизирован код.
- Добавлены бенчмарки и тесты.
- Обновлена документация и результаты бенчмарков.

Author: orefkov

CMakeLists.txt

@@ -5,7 +5,7 @@ include(FetchContent)
 
 project(
     simstr
-    VERSION 1.6.2
+    VERSION 1.6.3
     DESCRIPTION "Yet another modern C++ string library"
     HOMEPAGE_URL "https://github.com/orefkov/simstr"
     LANGUAGES CXX

bench/CMakeLists.txt

@@ -6,10 +6,10 @@ cmake_minimum_required (VERSION 3.15)
 add_executable(benchStr bench_str.cpp bench.h)
 target_link_libraries(benchStr simstr::simstr benchmark::benchmark)
 target_compile_features(benchStr PUBLIC cxx_std_23)
+target_compile_definitions(benchStr PRIVATE SIMSTR_VERSION="${PROJECT_VERSION}")
 
 add_executable(process_result process_result.cpp)
 target_link_libraries(process_result simstr_simstr)
-
 if (EMSCRIPTEN)
     #target_link_options(benchStr PRIVATE -sSTACK_SIZE=1048576 -sINITIAL_MEMORY=128MB -sALLOW_MEMORY_GROWTH=0)
     set_target_properties (benchStr PROPERTIES SUFFIX .html)

bench/bench_str.cpp

@@ -155,7 +155,7 @@ void ConcatSimToSimHexS(benchmark::State& state) {
     for (auto _: state) {
         for (unsigned i = 1; i <= 100'000; i *= 10) {
             benchmark::DoNotOptimize(s1);
-            stringa str = e_subst(S_FRM("{}{} end"), s1, e_hex<HexFlags::Short>(i));
+            stringa str = e_subst("{}{} end", s1, e_hex<HexFlags::Short>(i));
             benchmark::DoNotOptimize(str);
         }
     }
@@ -176,13 +176,58 @@ void ConcatSimToSimHexVS(benchmark::State& state) {
 BENCHMARK(__)->Name("-----  Concatenate string + Hex Number + \"Literal\" ---------")->Repetitions(1);
 BENCHMARK(ConcatStdToFmtHex)    ->Name("Concat std::string and format hex number and literal to std::string");
 BENCHMARK(ConcatAllFmtToHex)    ->Name("std::format std::string and hex number by literal to std::string");
-BENCHMARK(ConcatStdToCharsHex)  ->Name("Concat std::string and std::tochars and string to std::string");
+BENCHMARK(ConcatStdToCharsHex)  ->Name("Concat std::string and std::to_chars and string to std::string");
 BENCHMARK(ConcatSimToStdHex)    ->Name("Concat std::string and hex number and literal by StrExpr to std::string");
 BENCHMARK(ConcatSimToSimHex)    ->Name("Concat stringa and hex number and literal by StrExpr to simstr::stringa");
 BENCHMARK(ConcatSimToSimHexC)   ->Name("Concat stringa and hex number and literal by e_concat to simstr::stringa");
 BENCHMARK(ConcatSimToSimHexS)   ->Name("Subst stringa and hex number by e_subst literal to simstr::stringa");
 BENCHMARK(ConcatSimToSimHexVS)  ->Name("Subst stringa and hex number by e_vsubst stra to simstr::stringa");
 
+void SubstSimToSimBin(benchmark::State& state) {
+    static bool first = true;
+    for (auto _: state) {
+        for (unsigned i = 1; i <= 100'000; i *= 10) {
+            stringa str = e_subst("art {} end", e_int<8, f::w<10> | f::p | f::z>(i));
+            benchmark::DoNotOptimize(str);
+        }
+    }
+}
+
+void FormatStdToStdBin(benchmark::State& state) {
+    for (auto _: state) {
+        for (unsigned i = 1; i <= 100'000; i *= 10) {
+            std::string str = std::format("art {:#010o} end", i);
+            benchmark::DoNotOptimize(str);
+        }
+    }
+}
+
+void VSubstSimToSimBin(benchmark::State& state) {
+    ssa pattern = "art {} end";
+    for (auto _: state) {
+        for (unsigned i = 1; i <= 100'000; i *= 10) {
+            stringa str = e_vsubst(pattern, e_int<8, f::w<10> | f::p | f::z>(i));
+            benchmark::DoNotOptimize(str);
+        }
+    }
+}
+
+void VFormatStdToStdBin(benchmark::State& state) {
+    std::string_view pattern = "art {:#010o} end";
+    static bool first = true;
+    for (auto _: state) {
+        for (unsigned i = 1; i <= 100'000; i *= 10) {
+            std::string str = std::vformat(pattern, std::make_format_args(i));
+            benchmark::DoNotOptimize(str);
+        }
+    }
+}
+BENCHMARK(__)->Name("-----  format/vformat and subst/vsubst octal number ---------")->Repetitions(1);
+BENCHMARK(SubstSimToSimBin)     ->Name("e_subst(\"art {} end\", e_int<8, f::w<10> | f::p | f::z>(i))");
+BENCHMARK(FormatStdToStdBin)    ->Name("std::format(\"art {:#010o} end\", i)");
+BENCHMARK(VSubstSimToSimBin)    ->Name("e_vsubst(pattern, e_int<8, f::w<10> | f::p | f::z>(i))");
+BENCHMARK(VFormatStdToStdBin)   ->Name("std::vformat(pattern, std::make_format_args(i))");
+
 void ConcatStdToStdS(benchmark::State& state) {
     std::string s1 = "start ";
     for (auto _: state) {
@@ -2343,7 +2388,10 @@ BENCHMARK(BuildFuncNameSimStr)         ->Name("Build func full name stringa;");
 BENCHMARK(BuildFuncNameSimStr1)        ->Name("Build func full name stringa 1;");
 
 int main(int argc, char** argv) {
-    char arg1[] = "--benchmark_repetitions=10", arg2[] = "--benchmark_report_aggregates_only=true";
+    std::cout << "Benchmarks of simstr, version " SIMSTR_VERSION << "\n"
+        << "Sources: https://github.com/orefkov/simstr\n"
+        << "Results: https://orefkov.github.io/simstr/results.html\n" << std::endl;
+    char arg1[] = "--benchmark_repetitions=4", arg2[] = "--benchmark_report_aggregates_only=true";
     char* my_params[] = {argv[0], arg1, arg2};
     if (argc < 2) {
         argc = 3;

bench/header.txt

@@ -265,6 +265,7 @@
             }
         });
     </script>
-</head><body><div class="header"><h2>SimStr benchmarks results</h2>
+</head><body><div class="header"><h2>simstr benchmarks results</h2>
+<div style="font-size:16pt;margin:20px;text-align:center"><a href="https://github.com/orefkov/simstr">simstr</a> is a powerful and convenient library for productive work with strings in C++.</div>
 <span>All times in ns.</span>
 <span><a href="https://github.com/orefkov/simstr/blob/main/bench/bench_str.cpp">Source for benchmarks</a></span>

bench/process_result.cpp

@@ -117,7 +117,7 @@ void write_platforms_cpu(out_t& out, const results_vector& results) {
         size_t rp = r.cpu_info_.find('(') + 1, lp = r.cpu_info_.find(')', rp);
         ssa shortCpuInfo = r.cpu_info_.from_to(rp, lp);
         ssa cpuInfo = r.cpu_info_(lp + 2);
-        out.append_formatted(R"--(
+        out += e_subst(R"--(
 <li><span class="platform">{}</span><span class="tooltip">{}<span class="tooltiptext">{}</span></span>&nbsp;Include in charts: <input type="checkbox" id="pl{}" checked onchange="buildCharts()"/></li>)--",
             r.platform_, shortCpuInfo, cpuInfo, counter++);
         script += "'" + e_repl(r.platform_.to_str(), "'", "\\'") + "'" + e_choice(&r == &results.back(), "]", ",");