Remove IncrementalSchemeComparator

Author: CodaFi

include/swift/Driver/Compilation.h

@@ -102,53 +102,6 @@ class Compilation {
     }
   };
 
-  class IncrementalSchemeComparator {
-    const bool EnableIncrementalBuildWhenConstructed;
-    const bool &EnableIncrementalBuild;
-    const bool EnableSourceRangeDependencies;
-
-    /// If not empty, the path to use to log the comparison.
-    const StringRef CompareIncrementalSchemesPath;
-
-    const unsigned SwiftInputCount;
-
-  public:
-    std::string WhyIncrementalWasDisabled = "";
-
-  private:
-    DiagnosticEngine &Diags;
-
-    CommandSet JobsWithoutRanges;
-    CommandSet JobsWithRanges;
-
-    unsigned CompileStagesWithoutRanges = 0;
-    unsigned CompileStagesWithRanges = 0;
-
-  public:
-    IncrementalSchemeComparator(const bool &EnableIncrementalBuild,
-                                bool EnableSourceRangeDependencies,
-                                const StringRef CompareIncrementalSchemesPath,
-                                unsigned SwiftInputCount,
-                                DiagnosticEngine &Diags)
-        : EnableIncrementalBuildWhenConstructed(EnableIncrementalBuild),
-          EnableIncrementalBuild(EnableIncrementalBuild),
-          EnableSourceRangeDependencies(EnableSourceRangeDependencies),
-          CompareIncrementalSchemesPath(CompareIncrementalSchemesPath),
-          SwiftInputCount(SwiftInputCount), Diags(Diags) {}
-
-    /// Record scheduled jobs in support of the
-    /// -compare-incremental-schemes[-path] options
-    void update(const CommandSet &withoutRangeJobs,
-                const CommandSet &withRangeJobs);
-
-    /// Write the information for the -compare-incremental-schemes[-path]
-    /// options
-    void outputComparison() const;
-
-  private:
-    void outputComparison(llvm::raw_ostream &) const;
-  };
-
 public:
   /// The filelist threshold value to pass to ensure file lists are never used
   static const size_t NEVER_USE_FILELIST = SIZE_MAX;
@@ -312,10 +265,6 @@ class Compilation {
   /// (experimental) Enable cross-module incremental build scheduling.
   const bool EnableCrossModuleIncrementalBuild;
 
-public:
-  /// Will contain a comparator if an argument demands it.
-  Optional<IncrementalSchemeComparator> IncrementalComparator;
-
 private:
   template <typename T>
   static T *unwrap(const std::unique_ptr<T> &p) {

lib/Driver/Compilation.cpp

@@ -2287,67 +2287,6 @@ void Compilation::disableIncrementalBuild(Twine why) {
     IncrementalComparator->WhyIncrementalWasDisabled = why.str();
 }
 
-void Compilation::IncrementalSchemeComparator::update(
-    const CommandSet &jobsWithoutRanges, const CommandSet &jobsWithRanges) {
-  for (const auto *cmd : jobsWithoutRanges)
-    JobsWithoutRanges.insert(cmd);
-  for (const auto *cmd : jobsWithRanges)
-    JobsWithRanges.insert(cmd);
-
-  if (!jobsWithoutRanges.empty())
-    ++CompileStagesWithoutRanges;
-  if (!jobsWithRanges.empty())
-    ++CompileStagesWithRanges;
-}
-
-void Compilation::IncrementalSchemeComparator::outputComparison() const {
-  if (CompareIncrementalSchemesPath.empty()) {
-    outputComparison(llvm::outs());
-    return;
-  }
-
-  std::error_code EC;
-  using namespace llvm::sys::fs;
-  llvm::raw_fd_ostream OS(CompareIncrementalSchemesPath, EC, CD_OpenAlways,
-                          FA_Write, OF_Append | OF_Text);
-
-  if (EC) {
-    Diags.diagnose(SourceLoc(), diag::unable_to_open_incremental_comparison_log,
-                   CompareIncrementalSchemesPath);
-    return;
-  }
-  outputComparison(OS);
-}
-
-void Compilation::IncrementalSchemeComparator::outputComparison(
-    llvm::raw_ostream &out) const {
-  if (!EnableIncrementalBuildWhenConstructed) {
-    out << "*** Incremental build was not enabled in the command line ***\n";
-    return;
-  }
-  if (!EnableIncrementalBuild) {
-    // No stats will have been gathered
-    assert(!WhyIncrementalWasDisabled.empty() && "Must be a reason");
-    out << "*** Incremental build disabled because "
-        << WhyIncrementalWasDisabled << ", cannot compare ***\n";
-    return;
-  }
-  unsigned countWithoutRanges = JobsWithoutRanges.size();
-  unsigned countWithRanges = JobsWithRanges.size();
-
-  const int rangeBenefit = countWithoutRanges - countWithRanges;
-  const int rangeStageBenefit =
-      CompileStagesWithoutRanges - CompileStagesWithRanges;
-
-  out << "*** "
-      << "Range benefit: " << rangeBenefit << " compilations, "
-      << rangeStageBenefit << " stages, "
-      << "without ranges: " << countWithoutRanges << ", "
-      << "with ranges: " << countWithRanges << ", "
-      << (EnableSourceRangeDependencies ? "used" : "did not use") << " ranges, "
-      << "total: " << SwiftInputCount << " ***\n";
-}
-
 unsigned Compilation::countSwiftInputs() const {
   unsigned inputCount = 0;
   for (const auto &p : InputFilesWithTypes)