Updates.

- As Glaze and I have implemented new jump-tables for parsing/serializing and also for running string comparisons.
- I've also switched to using my other library BenchMarkSuite for benchmarking implementation.

Author: RealTimeChris

.github/workflows/CLANG-MacOS.yml

@@ -25,6 +25,10 @@ jobs:
       run: |
             brew install llvm
 
+    - name: Install Seaborn
+      run: |
+            pip install seaborn
+
     - name: Install Nasm.
       run: |
             brew install nasm

.github/workflows/GCC-Ubuntu.yml

@@ -20,6 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+     
+    - name: Install Seaborn
+      run: |
+            pip install seaborn
   
     - name: Install the latest gcc compiler.
       working-directory: ./

.github/workflows/MSVC-Windows.yml

@@ -27,6 +27,10 @@ jobs:
          name: PATH
          value: $env:PATH;C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build
 
+    - name: Install Seaborn
+      run: |
+            pip install seaborn
+
     - name: Configure CMake
       working-directory: ./
       run: |

CMakeLists.txt

@@ -1,24 +1,26 @@
 cmake_minimum_required(VERSION 3.18)
 
-set(CMAKE_CXX_STANDARD 20)
-
-set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/Install/")
+set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/Install/")
 
 project(
   "Json-Performance"
   VERSION "${PRODUCT_VERSION}"
   LANGUAGES CXX
 )
 
+set(CMAKE_CXX_STANDARD 20)
+
 include(FetchContent)
+include(GetCommitHash.cmake)
 
 FetchContent_Declare(
-  Jsonifier
-  GIT_REPOSITORY https://github.com/RealTimeChris/jsonifier.git
+  jsonifier
+  GIT_REPOSITORY https://github.com/realtimechris/jsonifier.git
   GIT_TAG dev
   GIT_SHALLOW TRUE
 )
-FetchContent_MakeAvailable(Jsonifier)
+FetchContent_MakeAvailable(jsonifier)
+getCommitHash("${jsonifier_SOURCE_DIR}" JSONIFIER_COMMIT_HASH)
 
 FetchContent_Declare(
   glaze
@@ -27,6 +29,16 @@ FetchContent_Declare(
   GIT_SHALLOW TRUE
 )
 FetchContent_MakeAvailable(glaze)
+getCommitHash("${glaze_SOURCE_DIR}" GLAZE_COMMIT_HASH)
+
+set(JSONIFIER_LIBRARY "TRUE" CACHE STRING "To avoid circular dependency issues." FORCE)
+FetchContent_Declare(
+  BenchmarkSuite
+  GIT_REPOSITORY https://github.com/RealTimeChris/BenchmarkSuite.git
+  GIT_TAG main
+  GIT_SHALLOW TRUE
+)
+FetchContent_MakeAvailable(BenchmarkSuite)
 
 FetchContent_Declare(
   simdjson
@@ -35,6 +47,7 @@ FetchContent_Declare(
   GIT_SHALLOW TRUE
 )
 FetchContent_MakeAvailable(simdjson)
+getCommitHash("${simdjson_SOURCE_DIR}" SIMDJSON_COMMIT_HASH)
 
 add_executable(
   "Json-Performance" 
@@ -43,7 +56,7 @@ add_executable(
 
 target_link_libraries(
 	"Json-Performance" PUBLIC 
-  Jsonifier::Jsonifier glaze::glaze simdjson
+	Jsonifier::Jsonifier glaze::glaze simdjson BenchmarkSuite::BenchmarkSuite
 )
 
 target_compile_options(
@@ -63,7 +76,6 @@ target_link_options(
 	"$<$<CXX_COMPILER_ID:GNU>:$<$<STREQUAL:${ASAN_ENABLED},TRUE>:-fsanitize=address>>"
 	"$<$<CXX_COMPILER_ID:MSVC>:/DEBUG>"
 	"$<$<CXX_COMPILER_ID:MSVC>:/OPT:REF>"
-	"$<$<CXX_COMPILER_ID:MSVC>:/OPT:ICF>"
 )
 
 if (WIN32)
@@ -77,14 +89,19 @@ endif()
 
 target_compile_definitions(
 	"Json-Performance" PUBLIC 
-	"JSON_TEST_PATH=\"${CMAKE_SOURCE_DIR}/Source/ConformanceTests\""
-	"JSON_PATH=\"${CMAKE_SOURCE_DIR}/Json\""
+	"JSON_TEST_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/Source/ConformanceTests\""
+	"JSON_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/Json\""
 	"README_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.md\""
+	"GRAPHS_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/Graphs\""
+	"BASE_PATH=\"${CMAKE_CURRENT_SOURCE_DIR}/\""
+	"JSONIFIER_COMMIT=\"${JSONIFIER_COMMIT_HASH}\""
+	"SIMDJSON_COMMIT=\"${SIMDJSON_COMMIT_HASH}\""
+	"GLAZE_COMMIT=\"${GLAZE_COMMIT_HASH}\""
 )
 
 install(
 	FILES 
 	"$<TARGET_FILE:Json-Performance>"
 	DESTINATION "$<IF:$<CONFIG:Debug>,bin,bin>"
 	OPTIONAL
-)
+)

GenerateGraphs.py

@@ -1,51 +1,64 @@
+import argparse
 import json
 import os
 import seaborn as sns
 import matplotlib.pyplot as plt
-import pandas as pd 
+import pandas as pd
+import re
 
-with open('./Json/Results.json', 'r') as file:
-    data = json.load(file)
+# Set up command-line argument parsing
+def parse_args():
+    parser = argparse.ArgumentParser(description='Process benchmark results from a JSON file.')
+    parser.add_argument('input_file', type=str, help='Path to the input JSON file')
+    parser.add_argument('output_directory', type=str, help='Path to the store the graphs')
+    return parser.parse_args()
 
-output_folder = 'Graphs'
-os.makedirs(output_folder, exist_ok=True)
+def main():
+    args = parse_args()
+    input_file = args.input_file
+    output_folder = args.output_directory
 
-for test in data:
-    df = pd.DataFrame(test["results"])
+    with open(input_file, 'r') as file:
+        data = json.load(file)
 
-    sns.set_style("dark")
-    sns.set_style(rc = {'axes.facecolor': '#0d1117' })
-    plt.figure(figsize=(10, 6))
-    ax = plt.gca()
+    os.makedirs(output_folder, exist_ok=True)
 
-    for i, library in enumerate(df["libraryName"].unique()):
-        library_data = df[df["libraryName"] == library]
-        for j, result_type in enumerate(library_data["resultType"].unique()):
-            result_data = library_data[library_data["resultType"] == result_type]
-            color = result_data["color"].iloc[0]
-            ax.bar(i + j * 0.2, result_data["resultSpeed"].iloc[0], width=0.2, color=color, label=result_type)
+    for test in data:
+        df = pd.DataFrame(test["results"])
 
-    ax.set_xticks(range(len(df["libraryName"].unique())))
-    ax.set_xticklabels(df["libraryName"].unique())
-    ax.set_title(f'{test["testName"]} Results', color='white')
-    outside_color = "#0d1117"
-    ax.set_xlabel('Library Name', color='white')
-    ax.set_ylabel('Result Speed MB/s', color='white')
+        sns.set_style("dark")
+        sns.set_style(rc = {'axes.facecolor': '#0d1117' })
+        plt.figure(figsize=(10, 6))
+        ax = plt.gca()
 
-    sns.set_theme(style="whitegrid", rc={"axes.edgecolor": outside_color, "xtick.color": outside_color, "ytick.color": outside_color})
-    plt.gcf().set_facecolor(outside_color)
+        for i, library in enumerate(df["libraryName"].unique()):
+            library_data = df[df["libraryName"] == library]
+            for j, result_type in enumerate(library_data["resultType"].unique()):
+                result_data = library_data[library_data["resultType"] == result_type]
+                color = result_data["color"].iloc[0]
+                ax.bar(i + j * 0.2, result_data["resultSpeed"].iloc[0], width=0.2, color=color, label=result_type)
 
-    handles, labels = ax.get_legend_handles_labels() 
-    for text in ax.get_xticklabels() + ax.get_yticklabels():
-        text.set_color('lightgray')
+        ax.set_xticks(range(len(df["libraryName"].unique())))
+        ax.set_xticklabels(df["libraryName"].unique())
+        ax.set_title(f'{test["testName"]} Results', color='white')
+        outside_color = "#0d1117"
+        ax.set_xlabel('Library Name', color='white')
+        ax.set_ylabel('Result Speed MB/s', color='white')
 
-    legend = ax.legend(title='Result Type', loc='best')
+        sns.set_theme(style="whitegrid", rc={"axes.edgecolor": outside_color, "xtick.color": outside_color, "ytick.color": outside_color})
+        plt.gcf().set_facecolor(outside_color)
 
-    outside_color = "lightgray"
+        handles, labels = ax.get_legend_handles_labels() 
+        for text in ax.get_xticklabels() + ax.get_yticklabels():
+            text.set_color('lightgray')
 
-    output_file_path = os.path.join(output_folder, f'{test["testName"]}_Results.png')
-    plt.savefig(output_file_path)
+        legend = ax.legend(title='Result Type', loc='best')
 
-    plt.show()
+        outside_color = "lightgray"
 
-    print('Graphs saved successfully in the "Graphs" folder.')
+        output_file_path = os.path.join(output_folder, f'{test["testName"]}_Results.png')
+        plt.savefig(output_file_path)
+
+        print('Graphs saved successfully in the "Graphs" folder.')
+
+main()

GetCommitHash.cmake

@@ -0,0 +1,14 @@
+# Define a function to get the short commit hash
+function(getCommitHash repo_path commit_var)
+    execute_process(
+        COMMAND git -C ${repo_path} rev-parse --short HEAD
+        OUTPUT_VARIABLE git_commit
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        RESULT_VARIABLE git_result
+    )
+    if (git_result EQUAL 0)
+        set(${commit_var} "${git_commit}" PARENT_SCOPE)
+    else()
+        message(FATAL_ERROR "Failed to get the short commit hash from ${repo_path}")
+    endif()
+endfunction()