Commit 6014c46c authored by Teresa Johnson's avatar Teresa Johnson
Browse files

Restore "[WPD/LowerTypeTests] Delay lowering/removal of type tests until after ICP" 

This restores commit 80d0a137, and the
follow on fix in 873c0d07, with a new
fix for test failures after a 2-stage clang bootstrap, and a more robust
fix for the Chromium build failure that an earlier version partially
fixed. See also discussion on D75201.

Reviewers: evgeny777

Subscribers: mehdi_amini, Prazek, hiraditya, steven_wu, dexonsmith, arphaman, davidxl, cfe-commits, llvm-commits

Tags: #clang, #llvm

Differential Revision: https://reviews.llvm.org/D73242
parent 02c3f70b

llvm/include/llvm/IR/ModuleSummaryIndex.h

+3 −2
Original line number Diff line number Diff line
@@ -894,7 +894,8 @@ struct TypeTestResolution { 
    Single,    ///< Single element (last example in "Short Inline Bit Vectors")

    AllOnes,   ///< All-ones bit vector ("Eliminating Bit Vector Checks for

               ///  All-Ones Bit Vectors")

  } TheKind = Unsat;

    Unknown,   ///< Unknown (analysis not performed, don't lower)

  } TheKind = Unknown;



  /// Range of size-1 expressed as a bit width. For example, if the size is in

  /// range [1,256], this number will be 8. This helps generate the most compact
@@ -1092,7 +1093,7 @@ public: 
  // in the way some record are interpreted, like flags for instance.

  // Note that incrementing this may require changes in both BitcodeReader.cpp

  // and BitcodeWriter.cpp.

  static constexpr uint64_t BitcodeSummaryVersion = 8;

  static constexpr uint64_t BitcodeSummaryVersion = 9;



  // Regular LTO module name for ASM writer

  static constexpr const char *getRegularLTOModuleName() {

llvm/include/llvm/IR/ModuleSummaryIndexYAML.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ namespace yaml { 


template <> struct ScalarEnumerationTraits<TypeTestResolution::Kind> {

  static void enumeration(IO &io, TypeTestResolution::Kind &value) {

    io.enumCase(value, "Unknown", TypeTestResolution::Unknown);

    io.enumCase(value, "Unsat", TypeTestResolution::Unsat);

    io.enumCase(value, "ByteArray", TypeTestResolution::ByteArray);

    io.enumCase(value, "Inline", TypeTestResolution::Inline);

llvm/lib/AsmParser/LLParser.cpp

+3 −0
Original line number Diff line number Diff line
@@ -7799,6 +7799,9 @@ bool LLParser::ParseTypeTestResolution(TypeTestResolution &TTRes) { 
    return true;



  switch (Lex.getKind()) {

  case lltok::kw_unknown:

    TTRes.TheKind = TypeTestResolution::Unknown;

    break;

  case lltok::kw_unsat:

    TTRes.TheKind = TypeTestResolution::Unsat;

    break;

llvm/lib/IR/AsmWriter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2861,6 +2861,8 @@ static const char *getWholeProgDevirtResByArgKindName( 


static const char *getTTResKindName(TypeTestResolution::Kind K) {

  switch (K) {

  case TypeTestResolution::Unknown:

    return "unknown";

  case TypeTestResolution::Unsat:

    return "unsat";

  case TypeTestResolution::ByteArray:

llvm/lib/Passes/PassBuilder.cpp

+16 −0
Original line number Diff line number Diff line
@@ -971,6 +971,12 @@ ModulePassManager PassBuilder::buildModuleSimplificationPipeline( 
  if (AttributorRun & AttributorRunOption::MODULE)

    MPM.addPass(AttributorPass());



  // Lower type metadata and the type.test intrinsic in the ThinLTO

  // post link pipeline after ICP. This is to enable usage of the type

  // tests in ICP sequences.

  if (Phase == ThinLTOPhase::PostLink)

    MPM.addPass(LowerTypeTestsPass(nullptr, nullptr, true));



  // Interprocedural constant propagation now that basic cleanup has occurred

  // and prior to optimizing globals.

  // FIXME: This position in the pipeline hasn't been carefully considered in
@@ -1355,6 +1361,9 @@ PassBuilder::buildLTODefaultPipeline(OptimizationLevel Level, bool DebugLogging, 
    // metadata and intrinsics.

    MPM.addPass(WholeProgramDevirtPass(ExportSummary, nullptr));

    MPM.addPass(LowerTypeTestsPass(ExportSummary, nullptr));

    // Run a second time to clean up any type tests left behind by WPD for use

    // in ICP.

    MPM.addPass(LowerTypeTestsPass(nullptr, nullptr, true));

    return MPM;

  }
@@ -1421,6 +1430,10 @@ PassBuilder::buildLTODefaultPipeline(OptimizationLevel Level, bool DebugLogging, 
    // The LowerTypeTestsPass needs to run to lower type metadata and the

    // type.test intrinsics. The pass does nothing if CFI is disabled.

    MPM.addPass(LowerTypeTestsPass(ExportSummary, nullptr));

    // Run a second time to clean up any type tests left behind by WPD for use

    // in ICP (which is performed earlier than this in the regular LTO

    // pipeline).

    MPM.addPass(LowerTypeTestsPass(nullptr, nullptr, true));

    return MPM;

  }
@@ -1548,6 +1561,9 @@ PassBuilder::buildLTODefaultPipeline(OptimizationLevel Level, bool DebugLogging, 
  // to be run at link time if CFI is enabled. This pass does nothing if

  // CFI is disabled.

  MPM.addPass(LowerTypeTestsPass(ExportSummary, nullptr));

  // Run a second time to clean up any type tests left behind by WPD for use

  // in ICP (which is performed earlier than this in the regular LTO pipeline).

  MPM.addPass(LowerTypeTestsPass(nullptr, nullptr, true));



  // Enable splitting late in the FullLTO post-link pipeline. This is done in

  // the same stage in the old pass manager (\ref addLateLTOOptimizationPasses).