use parallel-hashmap

.github/workflows/linux.yml

@@ -13,6 +13,8 @@ jobs:
       image: fedora:40
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
     - name: Install dependencies
       run: dnf install -y ninja-build cmake gtest-devel re2c clang util-linux
     - name: Linting
@@ -42,6 +44,8 @@ jobs:
       image: rockylinux:8
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
     - uses: codespell-project/actions-codespell@master
       with:
         ignore_words_list: fo,wee,addin,notin
@@ -104,6 +108,8 @@ jobs:
       image: ubuntu:20.04
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
     - name: Install dependencies
       run: |
         apt update
@@ -160,6 +166,8 @@ jobs:
         image: ['ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:24.04']
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
     - name: Install dependencies
       run: |
         apt update
@@ -176,6 +184,8 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - name: Build
       uses: uraimo/run-on-arch-action@v2

.github/workflows/macos.yml

@@ -12,6 +12,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - name: Install dependencies
       run: brew install re2c p7zip cmake

.github/workflows/windows.yml

@@ -21,6 +21,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: recursive
 
     - name: Install dependencies
       run: choco install re2c

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "parallel-hashmap"]
+	path = parallel-hashmap
+	url = https://github.com/greg7mdp/parallel-hashmap.git

CMakeLists.txt

@@ -61,6 +61,8 @@ else()
 	endif()
 endif()
 
+include_directories(parallel-hashmap)
+
 # --- optional re2c
 set(RE2C_MAJOR_VERSION 0)
 find_program(RE2C re2c)

configure.py

@@ -345,6 +345,7 @@ def search_system_path(file_name: str) -> Optional[str]:  # type: ignore # Missi
               # Disable size_t -> int truncation warning.
               # We never have strings or arrays larger than 2**31.
               '/wd4267',
+              '/Iparallel-hashmap',
               '/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS',
               '/D_HAS_EXCEPTIONS=0',
               '/DNINJA_PYTHON="%s"' % options.with_python]
@@ -363,6 +364,7 @@ def search_system_path(file_name: str) -> Optional[str]:  # type: ignore # Missi
               '-fno-exceptions',
               '-std=c++11',
               '-fvisibility=hidden', '-pipe',
+              '-Iparallel-hashmap',
               '-DNINJA_PYTHON="%s"' % options.with_python]
     if options.debug:
         cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC']

src/hash_map.h

@@ -17,6 +17,8 @@
 
 #include <algorithm>
 #include <string.h>
+#include "parallel_hashmap/phmap.h"
+#include "parallel_hashmap/phmap_utils.h"
 #include "string_piece.h"
 #include "util.h"
 
@@ -53,8 +55,6 @@ unsigned int MurmurHash2(const void* key, size_t len) {
   return h;
 }
 
-#include <unordered_map>
-
 namespace std {
 template<>
 struct hash<StringPiece> {
@@ -73,7 +73,7 @@ struct hash<StringPiece> {
 /// mapping StringPiece => Foo*.
 template<typename V>
 struct ExternalStringHashMap {
-  typedef std::unordered_map<StringPiece, V> Type;
+  typedef phmap::flat_hash_map<StringPiece, V> Type;
 };
 
 #endif // NINJA_MAP_H_