Rename DependencyGraph and DependencyGraphImp with CoarseGrained prefix.

Author: David Ungar

include/swift/Driver/CoarseGrainedDependencyGraph.h

@@ -36,14 +36,14 @@ namespace swift {
 
 class UnifiedStatsReporter;
 
-/// The non-templated implementation of DependencyGraph.
+/// The non-templated implementation of CoarseGrainedDependencyGraph.
 ///
-/// \see DependencyGraph
+/// \see CoarseGrainedDependencyGraph
 class CoarseGrainedDependencyGraphImpl {
 public:
   /// Possible dependency kinds.
   ///
-  /// Clients of DependencyGraph should have no reason to use this type.
+  /// Clients of CoarseGrainedDependencyGraph should have no reason to use this type.
   /// It is only used in the implementation.
   enum class DependencyKind : uint8_t;
 
@@ -62,9 +62,9 @@ class CoarseGrainedDependencyGraphImpl {
     AffectsDownstream
   };
 
-  /// The non-templated implementation of DependencyGraph::MarkTracer.
+  /// The non-templated implementation of CoarseGrainedDependencyGraph::MarkTracer.
   ///
-  /// \see DependencyGraph::MarkTracer
+  /// \see CoarseGrainedDependencyGraph::MarkTracer
   class MarkTracerImpl {
     class Entry;
     llvm::DenseMap<const void *, SmallVector<Entry, 4>> Table;
@@ -154,7 +154,7 @@ class CoarseGrainedDependencyGraphImpl {
     (void)newlyInserted;
   }
 
-  /// See DependencyGraph::markTransitive.
+  /// See CoarseGrainedDependencyGraph::markTransitive.
 
   void markTransitive(SmallVectorImpl<const void *> &visited,
                       const void *node, MarkTracerImpl *tracer = nullptr);
@@ -196,7 +196,7 @@ class CoarseGrainedDependencyGraphImpl {
 /// The graph also supports a "mark" operation, which is intended to track
 /// nodes that have been not just visited but transitively marked through.
 template <typename T>
-class DependencyGraph : public CoarseGrainedDependencyGraphImpl {
+class CoarseGrainedDependencyGraph : public CoarseGrainedDependencyGraphImpl {
   using Traits = llvm::PointerLikeTypeTraits<T>;
   static_assert(Traits::NumLowBitsAvailable >= 0, "not a pointer-like type");
 
@@ -210,7 +210,7 @@ class DependencyGraph : public CoarseGrainedDependencyGraphImpl {
   }
 
 public:
-  /// Traces the graph traversal performed in DependencyGraph::markTransitive.
+  /// Traces the graph traversal performed in CoarseGrainedDependencyGraph::markTransitive.
   ///
   /// This is intended to be a debugging aid.
   class MarkTracer : public MarkTracerImpl {

include/swift/Driver/FineGrainedDependencyDriverGraph.h

@@ -267,7 +267,7 @@ class ModuleDepGraph {
     assert(verify() && "ModuleDepGraph should be fine when created");
   }
 
-  /// Unlike the standard \c DependencyGraph, returns \c
+  /// Unlike the standard \c CoarseGrainedDependencyGraph, returns \c
   /// CoarseGrainedDependencyGraphImpl::LoadResult::AffectsDownstream when loading a new
   /// file, i.e. when determining the initial set. Caller compensates.
   CoarseGrainedDependencyGraphImpl::LoadResult loadFromPath(const driver::Job *, StringRef,

lib/Driver/Compilation.cpp

@@ -239,17 +239,17 @@ namespace driver {
     ///
     /// Dependency graphs for deciding which jobs are dirty (need running)
     /// or clean (can be skipped).
-    using DependencyGraph = DependencyGraph<const Job *>;
-    DependencyGraph StandardDepGraph;
-    DependencyGraph StandardDepGraphForRanges;
+    using CoarseGrainedDependencyGraph = CoarseGrainedDependencyGraph<const Job *>;
+    CoarseGrainedDependencyGraph CoarseGrainedDepGraph;
+    CoarseGrainedDependencyGraph CoarseGrainedDepGraphForRanges;
 
     fine_grained_dependencies::ModuleDepGraph ExpDepGraph;
     fine_grained_dependencies::ModuleDepGraph ExpDepGraphForRanges;
 
   private:
     /// Helper for tracing the propagation of marks in the graph.
-    DependencyGraph::MarkTracer ActualIncrementalTracer;
-    DependencyGraph::MarkTracer *IncrementalTracer = nullptr;
+    CoarseGrainedDependencyGraph::MarkTracer ActualIncrementalTracer;
+    CoarseGrainedDependencyGraph::MarkTracer *IncrementalTracer = nullptr;
 
     /// TaskQueue for execution.
     std::unique_ptr<TaskQueue> TQ;
@@ -1063,7 +1063,7 @@ namespace driver {
           // start nodes in the "Always" condition from the start instead of
           // using markIntransitive and having later functions call
           // markTransitive. That way markIntransitive would be an
-          // implementation detail of DependencyGraph.
+          // implementation detail of CoarseGrainedDependencyGraph.
           markIntransitiveInDepGraph(Cmd, forRanges);
         }
         LLVM_FALLTHROUGH;
@@ -1586,7 +1586,7 @@ namespace driver {
                  : getDepGraph(forRanges).markIntransitive(Cmd);
     }
 
-    DependencyGraph::LoadResult loadDepGraphFromPath(const Job *Cmd,
+    CoarseGrainedDependencyGraph::LoadResult loadDepGraphFromPath(const Job *Cmd,
                                                      StringRef path,
                                                      DiagnosticEngine &diags,
                                                      const bool forRanges) {
@@ -1599,7 +1599,7 @@ namespace driver {
     void
     markTransitiveInDepGraph(SmallVector<const Job *, N> &visited,
                              const Job *Cmd, const bool forRanges,
-                             DependencyGraph::MarkTracer *tracer = nullptr) {
+                             CoarseGrainedDependencyGraph::MarkTracer *tracer = nullptr) {
       if (Comp.getEnableFineGrainedDependencies())
         getExpDepGraph(forRanges).markTransitive(visited, Cmd, tracer);
       else
@@ -1617,15 +1617,15 @@ namespace driver {
     getExpDepGraph(const bool forRanges) {
       return forRanges ? ExpDepGraphForRanges : ExpDepGraph;
     }
-    DependencyGraph &getDepGraph(const bool forRanges) {
-      return forRanges ? StandardDepGraphForRanges : StandardDepGraph;
+    CoarseGrainedDependencyGraph &getDepGraph(const bool forRanges) {
+      return forRanges ? CoarseGrainedDepGraphForRanges : CoarseGrainedDepGraph;
     }
     const fine_grained_dependencies::ModuleDepGraph &
     getExpDepGraph(const bool forRanges) const {
       return forRanges ? ExpDepGraphForRanges : ExpDepGraph;
     }
-    const DependencyGraph &getDepGraph(const bool forRanges) const {
-      return forRanges ? StandardDepGraphForRanges : StandardDepGraph;
+    const CoarseGrainedDependencyGraph &getDepGraph(const bool forRanges) const {
+      return forRanges ? CoarseGrainedDepGraphForRanges : CoarseGrainedDepGraph;
     }
   };
 } // namespace driver