Visitar URL original
fixed #11925 (build slowest files first) (#5419) · cppcheck-opensource/cppcheck@b31860b · GitHub
Skip to content

Commit b31860b

Browse files
firewavefirewave
authored
fixed #11925 (build slowest files first) (#5419)
This will mainly help if you only build the `cppcheck` targets and the more threads you utilize for compilation.
1 parent 1b5b74d commit b31860b

5 files changed

Lines changed: 53 additions & 28 deletions

File tree

‎Makefile‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,10 @@ MAN_SOURCE=man/cppcheck.1.xml
189189

190190
###### Object Files
191191

192-
LIBOBJ = $(libcppdir)/analyzerinfo.o \
192+
LIBOBJ = $(libcppdir)/valueflow.o \
193+
$(libcppdir)/tokenize.o \
194+
$(libcppdir)/symboldatabase.o \
195+
$(libcppdir)/analyzerinfo.o \
193196
$(libcppdir)/astutils.o \
194197
$(libcppdir)/check.o \
195198
$(libcppdir)/check64bit.o \
@@ -241,14 +244,11 @@ LIBOBJ = $(libcppdir)/analyzerinfo.o \
241244
$(libcppdir)/settings.o \
242245
$(libcppdir)/summaries.o \
243246
$(libcppdir)/suppressions.o \
244-
$(libcppdir)/symboldatabase.o \
245247
$(libcppdir)/templatesimplifier.o \
246248
$(libcppdir)/timer.o \
247249
$(libcppdir)/token.o \
248-
$(libcppdir)/tokenize.o \
249250
$(libcppdir)/tokenlist.o \
250251
$(libcppdir)/utils.o \
251-
$(libcppdir)/valueflow.o \
252252
$(libcppdir)/vfvalue.o
253253

254254
EXTOBJ = externals/simplecpp/simplecpp.o \
@@ -342,12 +342,12 @@ TESTOBJ = test/fixture.o \
342342

343343
###### Targets
344344

345-
cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)
345+
cppcheck: $(EXTOBJ) $(LIBOBJ) $(CLIOBJ)
346346
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
347347

348348
all: cppcheck testrunner
349349

350-
testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/executor.o cli/processexecutor.o cli/singleexecutor.o cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/cppcheckexecutorseh.o cli/cppcheckexecutorsig.o cli/stacktrace.o cli/filelister.o
350+
testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ) cli/executor.o cli/processexecutor.o cli/singleexecutor.o cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/cppcheckexecutorseh.o cli/cppcheckexecutorsig.o cli/stacktrace.o cli/filelister.o
351351
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)
352352

353353
test: all
@@ -456,6 +456,15 @@ validateRules:
456456

457457
###### Build
458458

459+
$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
460+
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
461+
462+
$(libcppdir)/tokenize.o: lib/tokenize.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
463+
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenize.cpp
464+
465+
$(libcppdir)/symboldatabase.o: lib/symboldatabase.cpp lib/astutils.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
466+
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/symboldatabase.cpp
467+
459468
$(libcppdir)/analyzerinfo.o: lib/analyzerinfo.cpp externals/tinyxml2/tinyxml2.h lib/analyzerinfo.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/path.h lib/platform.h lib/utils.h
460469
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/analyzerinfo.cpp
461470

@@ -612,9 +621,6 @@ $(libcppdir)/summaries.o: lib/summaries.cpp lib/analyzerinfo.h lib/config.h lib/
612621
$(libcppdir)/suppressions.o: lib/suppressions.cpp externals/tinyxml2/tinyxml2.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/mathlib.h lib/path.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
613622
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/suppressions.cpp
614623

615-
$(libcppdir)/symboldatabase.o: lib/symboldatabase.cpp lib/astutils.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
616-
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/symboldatabase.cpp
617-
618624
$(libcppdir)/templatesimplifier.o: lib/templatesimplifier.cpp lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
619625
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/templatesimplifier.cpp
620626

@@ -624,18 +630,12 @@ $(libcppdir)/timer.o: lib/timer.cpp lib/config.h lib/timer.h lib/utils.h
624630
$(libcppdir)/token.o: lib/token.cpp lib/astutils.h lib/config.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/tokenrange.h lib/utils.h lib/valueflow.h lib/vfvalue.h
625631
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/token.cpp
626632

627-
$(libcppdir)/tokenize.o: lib/tokenize.cpp externals/simplecpp/simplecpp.h lib/check.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/library.h lib/mathlib.h lib/platform.h lib/preprocessor.h lib/settings.h lib/sourcelocation.h lib/standards.h lib/summaries.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/vfvalue.h
628-
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenize.cpp
629-
630633
$(libcppdir)/tokenlist.o: lib/tokenlist.cpp externals/simplecpp/simplecpp.h lib/astutils.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/importproject.h lib/keywords.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenlist.h lib/utils.h lib/vfvalue.h
631634
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/tokenlist.cpp
632635

633636
$(libcppdir)/utils.o: lib/utils.cpp lib/config.h lib/utils.h
634637
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/utils.cpp
635638

636-
$(libcppdir)/valueflow.o: lib/valueflow.cpp lib/analyzer.h lib/astutils.h lib/calculate.h lib/check.h lib/checkuninitvar.h lib/color.h lib/config.h lib/ctu.h lib/errorlogger.h lib/errortypes.h lib/forwardanalyzer.h lib/importproject.h lib/infer.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/reverseanalyzer.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/suppressions.h lib/symboldatabase.h lib/templatesimplifier.h lib/timer.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/valueflow.h lib/valueptr.h lib/vfvalue.h
637-
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/valueflow.cpp
638-
639639
$(libcppdir)/vfvalue.o: lib/vfvalue.cpp lib/config.h lib/errortypes.h lib/mathlib.h lib/templatesimplifier.h lib/token.h lib/utils.h lib/vfvalue.h
640640
$(CXX) ${INCLUDE_FOR_LIB} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(libcppdir)/vfvalue.cpp
641641

‎lib/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
file(GLOB_RECURSE hdrs "*.h")
22
file(GLOB_RECURSE srcs "*.cpp")
33

4+
# move the slowest files to the top
5+
set(srcs_slow "${CMAKE_CURRENT_SOURCE_DIR}/valueflow.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/tokenize.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/symboldatabase.cpp")
6+
list(REMOVE_ITEM srcs ${srcs_slow})
7+
list(INSERT srcs 0 ${srcs_slow})
8+
49
function(build_src output filename)
510
get_filename_component(file ${filename} NAME)
611
set(outfile ${CMAKE_CURRENT_BINARY_DIR}/build/mc_${file})

‎lib/cppcheck.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<ItemGroup Label="SourceFiles">
2121
<ClCompile Include="..\externals\simplecpp\simplecpp.cpp" />
2222
<ClCompile Include="..\externals\tinyxml2\tinyxml2.cpp" />
23+
<ClCompile Include="valueflow.cpp" />
24+
<ClCompile Include="tokenize.cpp" />
25+
<ClCompile Include="symboldatabase.cpp" />
2326
<ClCompile Include="analyzerinfo.cpp" />
2427
<ClCompile Include="astutils.cpp" />
2528
<ClCompile Include="check.cpp">
@@ -77,14 +80,11 @@
7780
<ClCompile Include="settings.cpp" />
7881
<ClCompile Include="summaries.cpp" />
7982
<ClCompile Include="suppressions.cpp" />
80-
<ClCompile Include="symboldatabase.cpp" />
8183
<ClCompile Include="templatesimplifier.cpp" />
8284
<ClCompile Include="timer.cpp" />
8385
<ClCompile Include="token.cpp" />
84-
<ClCompile Include="tokenize.cpp" />
8586
<ClCompile Include="tokenlist.cpp" />
8687
<ClCompile Include="utils.cpp" />
87-
<ClCompile Include="valueflow.cpp" />
8888
<ClCompile Include="vfvalue.cpp" />
8989
</ItemGroup>
9090
<ItemGroup Label="HeaderFiles">

‎lib/lib.pri‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,10 @@ HEADERS += $${PWD}/analyzer.h \
7575
$${PWD}/version.h \
7676
$${PWD}/vfvalue.h
7777

78-
SOURCES += $${PWD}/analyzerinfo.cpp \
78+
SOURCES += $${PWD}/valueflow.cpp \
79+
$${PWD}/tokenize.cpp \
80+
$${PWD}/symboldatabase.cpp \
81+
$${PWD}/analyzerinfo.cpp \
7982
$${PWD}/astutils.cpp \
8083
$${PWD}/check.cpp \
8184
$${PWD}/check64bit.cpp \
@@ -127,12 +130,9 @@ SOURCES += $${PWD}/analyzerinfo.cpp \
127130
$${PWD}/settings.cpp \
128131
$${PWD}/summaries.cpp \
129132
$${PWD}/suppressions.cpp \
130-
$${PWD}/symboldatabase.cpp \
131133
$${PWD}/templatesimplifier.cpp \
132134
$${PWD}/timer.cpp \
133135
$${PWD}/token.cpp \
134-
$${PWD}/tokenize.cpp \
135136
$${PWD}/tokenlist.cpp \
136137
$${PWD}/utils.cpp \
137-
$${PWD}/valueflow.cpp \
138138
$${PWD}/vfvalue.cpp

‎tools/dmake.cpp‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,25 @@ static std::string make_vcxproj_cl_entry(const std::string& file, ClType type)
251251
return outstr;
252252
}
253253

254+
static std::vector<std::string> prioritizelib(const std::vector<std::string>& libfiles)
255+
{
256+
std::map<std::string, std::size_t> priorities;
257+
std::size_t prio = libfiles.size();
258+
for (const auto &l : libfiles) {
259+
priorities.emplace(l, prio--);
260+
}
261+
priorities["lib/valueflow.cpp"] = 1000;
262+
priorities["lib/tokenize.cpp"] = 900;
263+
priorities["lib/symboldatabase.cpp"] = 800;
264+
std::vector<std::string> libfiles_prio = libfiles;
265+
std::sort(libfiles_prio.begin(), libfiles_prio.end(), [&](const std::string &l1, const std::string &l2) {
266+
const auto p1 = priorities.find(l1);
267+
const auto p2 = priorities.find(l2);
268+
return (p1 != priorities.end() ? p1->second : 0) > (p2 != priorities.end() ? p2->second : 0);
269+
});
270+
return libfiles_prio;
271+
}
272+
254273
int main(int argc, char **argv)
255274
{
256275
const bool release(argc >= 2 && std::string(argv[1]) == "--release");
@@ -262,6 +281,7 @@ int main(int argc, char **argv)
262281
std::cerr << err << std::endl;
263282
return EXIT_FAILURE;
264283
}
284+
const std::vector<std::string> libfiles_prio = prioritizelib(libfiles);
265285

266286
std::vector<std::string> extfiles;
267287
err = getCppFiles(extfiles, "externals/", true);
@@ -349,7 +369,7 @@ int main(int argc, char **argv)
349369
outstr += make_vcxproj_cl_entry(R"(..\externals\simplecpp\simplecpp.cpp)", Compile);
350370
outstr += make_vcxproj_cl_entry(R"(..\externals\tinyxml2\tinyxml2.cpp)", Compile);
351371

352-
for (const std::string &libfile: libfiles) {
372+
for (const std::string &libfile: libfiles_prio) {
353373
const std::string l = libfile.substr(4);
354374
outstr += make_vcxproj_cl_entry(l, l == "check.cpp" ? Precompile : Compile);
355375
}
@@ -400,7 +420,7 @@ int main(int argc, char **argv)
400420
fout1 << " \\\n" << std::string(11, ' ');
401421
}
402422
fout1 << "\n\nSOURCES += ";
403-
for (const std::string &libfile : libfiles) {
423+
for (const std::string &libfile : libfiles_prio) {
404424
fout1 << "$${PWD}/" << libfile.substr(4);
405425
if (libfile != libfiles.back())
406426
fout1 << " \\\n" << std::string(11, ' ');
@@ -638,18 +658,18 @@ int main(int argc, char **argv)
638658
fout << "MAN_SOURCE=man/cppcheck.1.xml\n\n";
639659

640660
fout << "\n###### Object Files\n\n";
641-
fout << "LIBOBJ = " << objfiles(libfiles) << "\n\n";
661+
fout << "LIBOBJ = " << objfiles(libfiles_prio) << "\n\n";
642662
fout << "EXTOBJ = " << objfiles(extfiles) << "\n\n";
643663
fout << "CLIOBJ = " << objfiles(clifiles) << "\n\n";
644664
fout << "TESTOBJ = " << objfiles(testfiles) << "\n\n";
645665

646666
fout << ".PHONY: run-dmake tags\n\n";
647667
fout << "\n###### Targets\n\n";
648-
fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
668+
fout << "cppcheck: $(EXTOBJ) $(LIBOBJ) $(CLIOBJ)\n";
649669
fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
650670
fout << "all:\tcppcheck testrunner\n\n";
651671
// TODO: generate from clifiles
652-
fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/executor.o cli/processexecutor.o cli/singleexecutor.o cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/cppcheckexecutorseh.o cli/cppcheckexecutorsig.o cli/stacktrace.o cli/filelister.o\n";
672+
fout << "testrunner: $(EXTOBJ) $(TESTOBJ) $(LIBOBJ) cli/executor.o cli/processexecutor.o cli/singleexecutor.o cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/cppcheckexecutorseh.o cli/cppcheckexecutorsig.o cli/stacktrace.o cli/filelister.o\n";
653673
fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
654674
fout << "test:\tall\n";
655675
fout << "\t./testrunner\n\n";
@@ -745,7 +765,7 @@ int main(int argc, char **argv)
745765

746766
fout << "\n###### Build\n\n";
747767

748-
compilefiles(fout, libfiles, "${INCLUDE_FOR_LIB}");
768+
compilefiles(fout, libfiles_prio, "${INCLUDE_FOR_LIB}");
749769
compilefiles(fout, clifiles, "${INCLUDE_FOR_CLI}");
750770
compilefiles(fout, testfiles, "${INCLUDE_FOR_TEST}");
751771
compilefiles(fout, extfiles, emptyString);

0 commit comments

Comments
 (0)