jlebar updated this revision to Diff 44377.
jlebar added a dependency: D16013: Make Driver::BuildJobsForAction return an
InputInfo, instead of using an outparam..
jlebar added a comment.
Fixing bug caused by missing an outparam.
Covered by tests in WIP CUDA+ptxas+fatbin patch.
Depends on http://reviews.llvm.org/D16013.
http://reviews.llvm.org/D15960
Files:
include/clang/Driver/Driver.h
lib/Driver/Driver.cpp
Index: lib/Driver/Driver.cpp
===================================================================
--- lib/Driver/Driver.cpp
+++ lib/Driver/Driver.cpp
@@ -1628,6 +1628,8 @@
if (A->getOption().matches(options::OPT_arch))
ArchNames.insert(A->getValue());
+ // Set of (Action, canonical ToolChain triple) pairs we've built jobs for.
+ std::map<std::pair<const Action *, std::string>, InputInfo> CachedResults;
for (Action *A : C.getActions()) {
// If we are linking an image for multiple archs then the linker wants
// -arch_multiple and -final_output <final image name>. Unfortunately, this
@@ -1647,7 +1649,7 @@
/*BoundArch*/ nullptr,
/*AtTopLevel*/ true,
/*MultipleArchs*/ ArchNames.size() > 1,
- /*LinkingOutput*/ LinkingOutput);
+ /*LinkingOutput*/ LinkingOutput, CachedResults);
}
// If the user passed -Qunused-arguments or there were errors, don't warn
@@ -1775,19 +1777,38 @@
return ToolForJob;
}
-InputInfo Driver::BuildJobsForAction(Compilation &C, const Action *A,
- const ToolChain *TC, const char *BoundArch,
- bool AtTopLevel, bool MultipleArchs,
- const char *LinkingOutput) const {
+InputInfo Driver::BuildJobsForAction(
+ Compilation &C, const Action *A, const ToolChain *TC, const char *BoundArch,
+ bool AtTopLevel, bool MultipleArchs, const char *LinkingOutput,
+ std::map<std::pair<const Action *, std::string>, InputInfo> &CachedResults)
+ const {
+ std::pair<const Action *, std::string> ActionTC = {
+ A, TC->getTriple().normalize()};
+ auto CachedResult = CachedResults.find(ActionTC);
+ if (CachedResult != CachedResults.end()) {
+ return CachedResult->second;
+ }
+ InputInfo Result =
+ BuildJobsForActionNoCache(C, A, TC, BoundArch, AtTopLevel, MultipleArchs,
+ LinkingOutput, CachedResults);
+ CachedResults[ActionTC] = Result;
+ return Result;
+}
+
+InputInfo Driver::BuildJobsForActionNoCache(
+ Compilation &C, const Action *A, const ToolChain *TC, const char *BoundArch,
+ bool AtTopLevel, bool MultipleArchs, const char *LinkingOutput,
+ std::map<std::pair<const Action *, std::string>, InputInfo> &CachedResults)
+ const {
llvm::PrettyStackTraceString CrashInfo("Building compilation jobs");
InputInfoList CudaDeviceInputInfos;
if (const CudaHostAction *CHA = dyn_cast<CudaHostAction>(A)) {
// Append outputs of device jobs to the input list.
for (const Action *DA : CHA->getDeviceActions()) {
- CudaDeviceInputInfos.push_back(
- BuildJobsForAction(C, DA, TC, nullptr, AtTopLevel,
- /*MultipleArchs*/ false, LinkingOutput));
+ CudaDeviceInputInfos.push_back(BuildJobsForAction(
+ C, DA, TC, nullptr, AtTopLevel,
+ /*MultipleArchs*/ false, LinkingOutput, CachedResults));
}
// Override current action with a real host compile action and continue
// processing it.
@@ -1818,16 +1839,17 @@
TC = &C.getDefaultToolChain();
return BuildJobsForAction(C, *BAA->begin(), TC, ArchName, AtTopLevel,
- MultipleArchs, LinkingOutput);
+ MultipleArchs, LinkingOutput, CachedResults);
}
if (const CudaDeviceAction *CDA = dyn_cast<CudaDeviceAction>(A)) {
// Initial processing of CudaDeviceAction carries host params.
// Call BuildJobsForAction() again, now with correct device parameters.
assert(CDA->getGpuArchName() && "No GPU name in device action.");
return BuildJobsForAction(C, *CDA->begin(), C.getCudaDeviceToolChain(),
CDA->getGpuArchName(), CDA->isAtTopLevel(),
- /*MultipleArchs*/ true, LinkingOutput);
+ /*MultipleArchs*/ true, LinkingOutput,
+ CachedResults);
}
const ActionList *Inputs = &A->getInputs();
@@ -1843,9 +1865,9 @@
// need to build jobs for device-side inputs it may have held.
if (CollapsedCHA) {
for (const Action *DA : CollapsedCHA->getDeviceActions()) {
- CudaDeviceInputInfos.push_back(
- BuildJobsForAction(C, DA, TC, "", AtTopLevel,
- /*MultipleArchs*/ false, LinkingOutput));
+ CudaDeviceInputInfos.push_back(BuildJobsForAction(
+ C, DA, TC, "", AtTopLevel,
+ /*MultipleArchs*/ false, LinkingOutput, CachedResults));
}
}
@@ -1859,7 +1881,7 @@
AtTopLevel && (isa<DsymutilJobAction>(A) || isa<VerifyJobAction>(A));
InputInfos.push_back(BuildJobsForAction(C, Input, TC, BoundArch,
SubJobAtTopLevel, MultipleArchs,
- LinkingOutput));
+ LinkingOutput, CachedResults));
}
// Always use the first input as the base input.
Index: include/clang/Driver/Driver.h
===================================================================
--- include/clang/Driver/Driver.h
+++ include/clang/Driver/Driver.h
@@ -21,6 +21,7 @@
#include "llvm/Support/Path.h" // FIXME: Kill when CompilationInfo lands.
#include <list>
+#include <map>
#include <memory>
#include <set>
#include <string>
@@ -380,11 +381,14 @@
Action *Input) const;
/// BuildJobsForAction - Construct the jobs to perform for the
- /// action \p A.
+ /// action \p A. Will only construct jobs for a given (Action,
+ /// ToolChain) pair once.
InputInfo BuildJobsForAction(Compilation &C, const Action *A,
const ToolChain *TC, const char *BoundArch,
bool AtTopLevel, bool MultipleArchs,
- const char *LinkingOutput) const;
+ const char *LinkingOutput,
+ std::map<std::pair<const Action *, std::string>,
+ InputInfo> &CachedResults) const;
/// Returns the default name for linked images (e.g., "a.out").
const char *getDefaultImageName() const;
@@ -441,6 +445,16 @@
/// the driver mode.
std::pair<unsigned, unsigned> getIncludeExcludeOptionFlagMasks() const;
+ /// Helper used in BuildJobsForAction. Doesn't use the cache when building
+ /// jobs specifically for the given action, but will use the cache when
+ /// building jobs for the Action's inputs.
+ InputInfo BuildJobsForActionNoCache(
+ Compilation &C, const Action *A, const ToolChain *TC,
+ const char *BoundArch, bool AtTopLevel, bool MultipleArchs,
+ const char *LinkingOutput,
+ std::map<std::pair<const Action *, std::string>, InputInfo>
+ &CachedResults) const;
+
public:
/// GetReleaseVersion - Parse (([0-9]+)(.([0-9]+)(.([0-9]+)?))?)? and
/// return the grouped values as integers. Numbers which are not
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
