Skip to content

Commit d91e07c

Browse files
committed
Use greg7mdp/parallel-hashmap for faster execution
This implements option 1 in ninja-build#2462 (comment). This uses https://github.com/greg7mdp/parallel-hashmap instead of unordered_map for faster ninja execution. Some more context is in https://crbug.com/346910589. This makes noop build for chromium * 12% faster on Linux * 2% slower on Windows * 96% faster on macOS ``` $ hyperfine --warmup 1 \ '~/ninja_master -C out/non_component build:buildflag_header_h' \ '~/ninja_faster_hash -C out/non_component build:buildflag_header_h' Benchmark 1: ~/ninja_master -C out/non_component build:buildflag_header_h Time (mean ± σ): 5.251 s ± 0.027 s [User: 4.641 s, System: 0.608 s] Range (min … max): 5.222 s … 5.309 s 10 runs Benchmark 2: ~/ninja_faster_hash -C out/non_component build:buildflag_header_h Time (mean ± σ): 4.689 s ± 0.022 s [User: 4.055 s, System: 0.633 s] Range (min … max): 4.648 s … 4.737 s 10 runs Summary ~/ninja_faster_hash -C out/non_component build:buildflag_header_h ran 1.12 ± 0.01 times faster than ~/ninja_master -C out/non_component build:buildflag_header_h ``` ``` Benchmark 1: C:\Users\tikuta\source\repos\ninja-build\ninja\ninja_master -C out/non_component build:buildflag_header_h Time (mean ± σ): 13.161 s ± 0.105 s [User: 10.657 s, System: 2.194 s] Range (min … max): 13.005 s … 13.328 s 10 runs Benchmark 2: C:\Users\tikuta\source\repos\ninja-build\ninja\ninja_faster_hash -C out/non_component build:buildflag_header_h Time (mean ± σ): 13.206 s ± 0.210 s [User: 10.653 s, System: 2.194 s] Range (min … max): 12.951 s … 13.578 s 10 runs Summary C:\Users\tikuta\source\repos\ninja-build\ninja\ninja_master -C out/non_component build:buildflag_header_h ran 1.00 ± 0.02 times faster than C:\Users\tikuta\source\repos\ninja-build\ninja\ninja_faster_hash -C out/non_component build:buildflag_header_h ``` ``` $ hyperfine --warmup 1 '~/ninja_master -C out/non_component build:buildflag_header_h' '~/ninja_faster_hash -C out/non_component build:buildflag_header_h' Benchmark 1: ~/ninja_master -C out/non_component build:buildflag_header_h Time (mean ± σ): 14.360 s ± 0.706 s [User: 9.006 s, System: 1.681 s] Range (min … max): 12.832 s … 15.297 s 10 runs Benchmark 2: ~/ninja_faster_hash -C out/non_component build:buildflag_header_h Time (mean ± σ): 7.340 s ± 0.260 s [User: 6.263 s, System: 0.828 s] Range (min … max): 6.948 s … 7.799 s 10 runs Summary ~/ninja_faster_hash -C out/non_component build:buildflag_header_h ran 1.96 ± 0.12 times faster than ~/ninja_master -C out/non_component build:buildflag_header_h ```
1 parent 0b4b43a commit d91e07c

File tree

15 files changed

+12587
-3
lines changed

15 files changed

+12587
-3
lines changed

.clang-format-ignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/third_party/parallel_hashmap/parallel_hashmap/*

.github/workflows/linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
- uses: codespell-project/actions-codespell@master
4646
with:
4747
ignore_words_list: fo,wee,addin,notin
48+
skip: ./third_party
4849
- name: Install dependencies
4950
run: |
5051
dnf install -y make gcc-c++ libasan clang-analyzer cmake dnf-plugins-core epel-release

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ else()
6161
endif()
6262
endif()
6363

64+
include_directories(third_party/parallel_hashmap)
65+
6466
# --- optional re2c
6567
set(RE2C_MAJOR_VERSION 0)
6668
find_program(RE2C re2c)

configure.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ def search_system_path(file_name: str) -> Optional[str]: # type: ignore # Missi
345345
# Disable size_t -> int truncation warning.
346346
# We never have strings or arrays larger than 2**31.
347347
'/wd4267',
348+
'/Ithird_party/parallel_hashmap',
348349
'/DNOMINMAX', '/D_CRT_SECURE_NO_WARNINGS',
349350
'/D_HAS_EXCEPTIONS=0',
350351
'/DNINJA_PYTHON="%s"' % options.with_python]
@@ -363,6 +364,7 @@ def search_system_path(file_name: str) -> Optional[str]: # type: ignore # Missi
363364
'-fno-exceptions',
364365
'-std=c++11',
365366
'-fvisibility=hidden', '-pipe',
367+
'-Ithird_party/parallel_hashmap',
366368
'-DNINJA_PYTHON="%s"' % options.with_python]
367369
if options.debug:
368370
cflags += ['-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC']

misc/ci.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
'misc/afl-fuzz-tokens/',
88
'src/depfile_parser.cc',
99
'src/lexer.cc',
10+
'third_party/',
1011
]
1112

1213
error_count = 0

src/hash_map.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
#include <algorithm>
1919
#include <string.h>
20+
#include "parallel_hashmap/phmap.h"
21+
#include "parallel_hashmap/phmap_utils.h"
2022
#include "string_piece.h"
2123
#include "util.h"
2224

@@ -53,8 +55,6 @@ unsigned int MurmurHash2(const void* key, size_t len) {
5355
return h;
5456
}
5557

56-
#include <unordered_map>
57-
5858
namespace std {
5959
template<>
6060
struct hash<StringPiece> {
@@ -73,7 +73,7 @@ struct hash<StringPiece> {
7373
/// mapping StringPiece => Foo*.
7474
template<typename V>
7575
struct ExternalStringHashMap {
76-
typedef std::unordered_map<StringPiece, V> Type;
76+
typedef phmap::flat_hash_map<StringPiece, V> Type;
7777
};
7878

7979
#endif // NINJA_MAP_H_
Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
https://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
https://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
This directory has partial copy of
2+
https://github.com/greg7mdp/parallel-hashmap
3+
to avoid using git submodule.
4+
5+
Use `download.sh` to get necessary files other than this README.md.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env bash
2+
set -eu
3+
4+
cd $(dirname $0)
5+
6+
revision=d88c5e15079047777b418132ece5879e7c9aaa2b
7+
8+
for file in LICENSE \
9+
parallel_hashmap/phmap.h \
10+
parallel_hashmap/phmap_base.h \
11+
parallel_hashmap/phmap_bits.h \
12+
parallel_hashmap/phmap_config.h \
13+
parallel_hashmap/phmap_fwd_decl.h \
14+
parallel_hashmap/phmap_utils.h
15+
do
16+
mkdir -p $(dirname $file)
17+
curl --silent https://raw.githubusercontent.com/greg7mdp/parallel-hashmap/$revision/$file > $file
18+
done

0 commit comments

Comments
 (0)