sammccall created this revision. sammccall added a reviewer: ilya-biryukov. Herald added subscribers: usaxena95, kadircet, arphaman. Herald added a project: All. sammccall requested review of this revision. Herald added subscribers: cfe-commits, MaskRay. Herald added a project: clang-tools-extra.
These aren't needed. With them the generated predefines buffer is 13KB. For every TestTU, we must: - generate the buffer (3 times: parsing preamble, scanning preamble, main file) - parse the buffer (again 3 times) - serialize all the macros it defines in the PCH - compress the buffer itself to write it into the PCH - decompress it from the PCH Avoiding this reduces unit test time by ~25%. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D125172 Files: clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp clang-tools-extra/clangd/unittests/TestTU.cpp Index: clang-tools-extra/clangd/unittests/TestTU.cpp =================================================================== --- clang-tools-extra/clangd/unittests/TestTU.cpp +++ clang-tools-extra/clangd/unittests/TestTU.cpp @@ -40,7 +40,9 @@ ParseInputs Inputs; Inputs.FeatureModules = FeatureModules; auto &Argv = Inputs.CompileCommand.CommandLine; - Argv = {"clang"}; + // In tests, we don't need predefined macros (__GNUC__, __CHAR_BIT__) etc. + // There are hundreds, and we'd generate, parse, serialize, and re-parse them! + Argv = {"clang", "-Xclang", "-undef"}; // FIXME: this shouldn't need to be conditional, but it breaks a // GoToDefinition test for some reason (getMacroArgExpandedLocation fails). if (!HeaderCode.empty()) { Index: clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp +++ clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp @@ -386,9 +386,9 @@ using flags::FLAGS_FOO; - // CLI will come from a define, __llvm__ is a built-in. In both cases, they + // CLI will come from a define, __cplusplus is a built-in. In both cases, they // come from non-existent files. - int y = CLI + __llvm__; + int y = CLI + __cplusplus; int concat(a, b) = 42; )cpp";
Index: clang-tools-extra/clangd/unittests/TestTU.cpp =================================================================== --- clang-tools-extra/clangd/unittests/TestTU.cpp +++ clang-tools-extra/clangd/unittests/TestTU.cpp @@ -40,7 +40,9 @@ ParseInputs Inputs; Inputs.FeatureModules = FeatureModules; auto &Argv = Inputs.CompileCommand.CommandLine; - Argv = {"clang"}; + // In tests, we don't need predefined macros (__GNUC__, __CHAR_BIT__) etc. + // There are hundreds, and we'd generate, parse, serialize, and re-parse them! + Argv = {"clang", "-Xclang", "-undef"}; // FIXME: this shouldn't need to be conditional, but it breaks a // GoToDefinition test for some reason (getMacroArgExpandedLocation fails). if (!HeaderCode.empty()) { Index: clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp +++ clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp @@ -386,9 +386,9 @@ using flags::FLAGS_FOO; - // CLI will come from a define, __llvm__ is a built-in. In both cases, they + // CLI will come from a define, __cplusplus is a built-in. In both cases, they // come from non-existent files. - int y = CLI + __llvm__; + int y = CLI + __cplusplus; int concat(a, b) = 42; )cpp";
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits