aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJade Lovelace <lix@jade.fyi>2024-05-30 13:44:01 -0700
committerjade <lix@jade.fyi>2024-05-30 21:54:21 +0000
commit0f99ed43f15aba7805ebe6d757a2d98418596205 (patch)
treef90b6b293ffc4036a24ec530566bbb0d383eeb50
parente6e5cacabeab0959d092aaf4957932a0b6f4b78e (diff)
build-time: remove 20% more by PCH'ing C++ stdlib
It seems like someone implemented precompiled headers a long time ago and then it never got ported to meson or maybe didn't work at all. This is, however, blessedly easy to simply implement. I went looking for `#define` that could affect the result of precompiling the headers, and as far as I can tell we aren't doing any of that, so this should truly just be free build time savings. Previous state: Compilation (551 times): Parsing (frontend): 1302.1 s Codegen & opts (backend): 956.3 s New state: **** Time summary: Compilation (567 times): Parsing (frontend): 1123.0 s Codegen & opts (backend): 1078.1 s I wonder if the "regression" in codegen time is just doing the PCH operation a few times, because meson does it per-target. Change-Id: I664366b8069bab4851308b3a7571bea97ac64022
-rw-r--r--misc/pre-commit.nix9
-rw-r--r--package.nix1
-rw-r--r--src/libcmd/meson.build1
-rw-r--r--src/libexpr/meson.build1
-rw-r--r--src/libfetchers/meson.build1
-rw-r--r--src/libmain/meson.build1
-rw-r--r--src/libstore/meson.build1
-rw-r--r--src/libutil/meson.build1
-rw-r--r--src/nix/meson.build1
-rw-r--r--src/pch/precompiled-headers.hh (renamed from precompiled-headers.h)0
-rw-r--r--tests/unit/meson.build6
11 files changed, 18 insertions, 5 deletions
diff --git a/misc/pre-commit.nix b/misc/pre-commit.nix
index ed2b152a3..4f54141b3 100644
--- a/misc/pre-commit.nix
+++ b/misc/pre-commit.nix
@@ -87,11 +87,12 @@ pre-commit-run {
"file"
"header"
];
- # generated files; these will never actually be seen by this
- # check, and are left here as documentation
excludes = [
- "(parser|lexer)-tab\\.hh$"
- "\\.gen\\.hh$"
+ ''^src/pch/.*$''
+ # generated files; these will never actually be seen by this
+ # check, and are left here as documentation
+ ''(parser|lexer)-tab\.hh$''
+ ''\.gen\.hh$''
];
entry = lib.getExe pkgs.check-headers;
};
diff --git a/package.nix b/package.nix
index 283a590c1..43b709023 100644
--- a/package.nix
+++ b/package.nix
@@ -169,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: {
./boehmgc-coroutine-sp-fallback.diff
./doc
./misc
- ./precompiled-headers.h
./src
./COPYING
]
diff --git a/src/libcmd/meson.build b/src/libcmd/meson.build
index 4da1b496b..4dc0714c8 100644
--- a/src/libcmd/meson.build
+++ b/src/libcmd/meson.build
@@ -54,6 +54,7 @@ libcmd = library(
nlohmann_json,
lix_doc
],
+ cpp_pch : ['../pch/precompiled-headers.hh'],
install : true,
# FIXME(Qyriad): is this right?
install_rpath : libdir,
diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build
index fda6fde2c..9a18c7ab3 100644
--- a/src/libexpr/meson.build
+++ b/src/libexpr/meson.build
@@ -145,6 +145,7 @@ libexpr = library(
include_directories : [
'../libmain',
],
+ cpp_pch : ['../pch/precompiled-headers.hh'],
install : true,
# FIXME(Qyriad): is this right?
install_rpath : libdir,
diff --git a/src/libfetchers/meson.build b/src/libfetchers/meson.build
index dbb85b84c..365bcd4a7 100644
--- a/src/libfetchers/meson.build
+++ b/src/libfetchers/meson.build
@@ -30,6 +30,7 @@ libfetchers = library(
liblixutil,
nlohmann_json,
],
+ cpp_pch : ['../pch/precompiled-headers.hh'],
install : true,
# FIXME(Qyriad): is this right?
install_rpath : libdir,
diff --git a/src/libmain/meson.build b/src/libmain/meson.build
index b17247a9d..075aa83b2 100644
--- a/src/libmain/meson.build
+++ b/src/libmain/meson.build
@@ -20,6 +20,7 @@ libmain = library(
liblixutil,
liblixstore,
],
+ cpp_pch : ['../pch/precompiled-headers.hh'],
install : true,
# FIXME(Qyriad): is this right?
install_rpath : libdir,
diff --git a/src/libstore/meson.build b/src/libstore/meson.build
index f776e9621..65ecacc20 100644
--- a/src/libstore/meson.build
+++ b/src/libstore/meson.build
@@ -220,6 +220,7 @@ libstore = library(
nlohmann_json,
],
cpp_args : cpp_args,
+ cpp_pch : ['../pch/precompiled-headers.hh'],
install : true,
# FIXME(Qyriad): is this right?
install_rpath : libdir,
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index 96450fbe2..cfdd0e52c 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -129,6 +129,7 @@ libutil = library(
openssl,
nlohmann_json,
],
+ cpp_pch : ['../pch/precompiled-headers.hh'],
implicit_include_directories : true,
install : true,
)
diff --git a/src/nix/meson.build b/src/nix/meson.build
index e41399b5d..45303641f 100644
--- a/src/nix/meson.build
+++ b/src/nix/meson.build
@@ -89,6 +89,7 @@ nix = executable(
boehm,
nlohmann_json,
],
+ cpp_pch : ['../pch/precompiled-headers.hh'],
install : true,
# FIXME(Qyriad): is this right?
install_rpath : libdir,
diff --git a/precompiled-headers.h b/src/pch/precompiled-headers.hh
index f52f1cab8..f52f1cab8 100644
--- a/precompiled-headers.h
+++ b/src/pch/precompiled-headers.hh
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index 35a11a5d3..d8d4a00d1 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -68,6 +68,7 @@ libutil_tester = executable(
liblixutil_test_support,
nlohmann_json,
],
+ cpp_pch : ['../../src/pch/precompiled-headers.hh'],
)
test(
@@ -102,6 +103,7 @@ libstore_test_support = library(
include_directories : include_directories(
'libstore-support',
),
+ cpp_pch : ['../../src/pch/precompiled-headers.hh'],
)
liblixstore_test_support = declare_dependency(
include_directories : include_directories('libstore-support'),
@@ -135,6 +137,7 @@ libstore_tester = executable(
gtest,
nlohmann_json,
],
+ cpp_pch : ['../../src/pch/precompiled-headers.hh'],
)
test(
@@ -166,6 +169,7 @@ libexpr_test_support = library(
include_directories : include_directories(
'libexpr-support',
),
+ cpp_pch : ['../../src/pch/precompiled-headers.hh'],
)
liblixexpr_test_support = declare_dependency(
include_directories : include_directories('libexpr-support'),
@@ -199,6 +203,7 @@ libexpr_tester = executable(
gtest,
nlohmann_json,
],
+ cpp_pch : ['../../src/pch/precompiled-headers.hh'],
)
test(
@@ -225,6 +230,7 @@ libcmd_tester = executable(
gtest,
boost,
],
+ cpp_pch : ['../../src/pch/precompiled-headers.hh'],
)
test(