revert changes to LegalizerPass, instead do cleanup in DXILFinalizeLinkage.cpp where intrinsics are getting orphaned

Author: farzonl

llvm/lib/Target/DirectX/DXILFinalizeLinkage.cpp

@@ -18,15 +18,15 @@
 using namespace llvm;
 
 static bool finalizeLinkage(Module &M) {
-  SmallPtrSet<Function *, 8> Funcs;
+  SmallVector<Function *> Funcs;
 
   // Collect non-entry and non-exported functions to set to internal linkage.
   for (Function &EF : M.functions()) {
     if (EF.isIntrinsic())
       continue;
     if (EF.hasFnAttribute("hlsl.shader") || EF.hasFnAttribute("hlsl.export"))
       continue;
-    Funcs.insert(&EF);
+    Funcs.push_back(&EF);
   }
 
   for (Function *F : Funcs) {
@@ -36,6 +36,14 @@ static bool finalizeLinkage(Module &M) {
       M.getFunctionList().erase(F);
   }
 
+  // Do a pass over intrinsics that are no longer used and remove them.
+  Funcs.clear();
+  for (Function &F : M.functions())
+    if (F.isIntrinsic() && F.use_empty())
+      Funcs.push_back(&F);
+  for (Function *F : Funcs)
+    F->eraseFromParent();
+
   return false;
 }
 

llvm/lib/Target/DirectX/DXILLegalizePass.cpp

@@ -12,7 +12,6 @@
 #include "llvm/IR/IRBuilder.h"
 #include "llvm/IR/InstIterator.h"
 #include "llvm/IR/Instruction.h"
-#include "llvm/IR/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include <functional>
@@ -21,12 +20,6 @@
 
 using namespace llvm;
 
-static void removeDeadIntrinsics(Function &F,
-                                 SmallVectorImpl<Function *> &ToRemove) {
-  if (F.isIntrinsic() && F.use_empty())
-    ToRemove.push_back(&F);
-}
-
 static void fixI8TruncUseChain(Instruction &I,
                                SmallVectorImpl<Instruction *> &ToRemove,
                                DenseMap<Value *, Value *> &ReplacedValues) {
@@ -153,26 +146,11 @@ class DXILLegalizationPipeline {
 public:
   DXILLegalizationPipeline() { initializeLegalizationPipeline(); }
 
-  bool runLegalizationPipeline(Module &M) {
-    bool Changes = false;
-    SmallVector<Function *> ToRemove;
-    for (auto &F : make_early_inc_range(M.functions())) {
-      Changes |= runFunctionLegalizationPipeline(F);
-      for (auto &LegalizationFn : ModuleLegalizationPipeline)
-        LegalizationFn(F, ToRemove);
-    }
-
-    for (Function *F : ToRemove)
-      F->eraseFromParent();
-
-    return Changes && !ToRemove.empty();
-  }
-
-  bool runFunctionLegalizationPipeline(Function &F) {
+  bool runLegalizationPipeline(Function &F) {
     SmallVector<Instruction *> ToRemove;
     DenseMap<Value *, Value *> ReplacedValues;
     for (auto &I : instructions(F)) {
-      for (auto &LegalizationFn : FunctionLegalizationPipeline)
+      for (auto &LegalizationFn : LegalizationPipeline)
         LegalizationFn(I, ToRemove, ReplacedValues);
     }
 
@@ -186,40 +164,37 @@ class DXILLegalizationPipeline {
   SmallVector<
       std::function<void(Instruction &, SmallVectorImpl<Instruction *> &,
                          DenseMap<Value *, Value *> &)>>
-      FunctionLegalizationPipeline;
-  SmallVector<std::function<void(Function &, SmallVectorImpl<Function *> &)>>
-      ModuleLegalizationPipeline;
+      LegalizationPipeline;
 
   void initializeLegalizationPipeline() {
-    FunctionLegalizationPipeline.push_back(fixI8TruncUseChain);
-    FunctionLegalizationPipeline.push_back(
-        downcastI64toI32InsertExtractElements);
-    ModuleLegalizationPipeline.push_back(removeDeadIntrinsics);
+    LegalizationPipeline.push_back(fixI8TruncUseChain);
+    LegalizationPipeline.push_back(downcastI64toI32InsertExtractElements);
   }
 };
 
-class DXILLegalizeLegacy : public ModulePass {
+class DXILLegalizeLegacy : public FunctionPass {
 
 public:
-  bool runOnModule(Module &M) override;
-  DXILLegalizeLegacy() : ModulePass(ID) {}
+  bool runOnFunction(Function &F) override;
+  DXILLegalizeLegacy() : FunctionPass(ID) {}
 
   static char ID; // Pass identification.
 };
 } // namespace
 
-PreservedAnalyses DXILLegalizePass::run(Module &M, ModuleAnalysisManager &MAM) {
+PreservedAnalyses DXILLegalizePass::run(Function &F,
+                                        FunctionAnalysisManager &FAM) {
   DXILLegalizationPipeline DXLegalize;
-  bool MadeChanges = DXLegalize.runLegalizationPipeline(M);
+  bool MadeChanges = DXLegalize.runLegalizationPipeline(F);
   if (!MadeChanges)
     return PreservedAnalyses::all();
   PreservedAnalyses PA;
   return PA;
 }
 
-bool DXILLegalizeLegacy::runOnModule(Module &M) {
+bool DXILLegalizeLegacy::runOnFunction(Function &F) {
   DXILLegalizationPipeline DXLegalize;
-  return DXLegalize.runLegalizationPipeline(M);
+  return DXLegalize.runLegalizationPipeline(F);
 }
 
 char DXILLegalizeLegacy::ID = 0;
@@ -229,6 +204,6 @@ INITIALIZE_PASS_BEGIN(DXILLegalizeLegacy, DEBUG_TYPE, "DXIL Legalizer", false,
 INITIALIZE_PASS_END(DXILLegalizeLegacy, DEBUG_TYPE, "DXIL Legalizer", false,
                     false)
 
-ModulePass *llvm::createDXILLegalizeLegacyPass() {
+FunctionPass *llvm::createDXILLegalizeLegacyPass() {
   return new DXILLegalizeLegacy();
 }

llvm/lib/Target/DirectX/DXILLegalizePass.h

@@ -15,7 +15,7 @@ namespace llvm {
 
 class DXILLegalizePass : public PassInfoMixin<DXILLegalizePass> {
 public:
-  PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
+  PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
 };
 } // namespace llvm
 

llvm/lib/Target/DirectX/DirectX.h

@@ -52,7 +52,7 @@ void initializeDXILLegalizeLegacyPass(PassRegistry &);
 
 /// Pass to Legalize DXIL by remove i8 truncations and i64 insert/extract
 /// elements
-ModulePass *createDXILLegalizeLegacyPass();
+FunctionPass *createDXILLegalizeLegacyPass();
 
 /// Initializer for DXILOpLowering
 void initializeDXILOpLoweringLegacyPass(PassRegistry &);

llvm/lib/Target/DirectX/DirectXPassRegistry.def

@@ -26,7 +26,6 @@ MODULE_ANALYSIS("dxil-root-signature-analysis", dxil::RootSignatureAnalysis())
 MODULE_PASS("dxil-data-scalarization", DXILDataScalarization())
 MODULE_PASS("dxil-flatten-arrays", DXILFlattenArrays())
 MODULE_PASS("dxil-intrinsic-expansion", DXILIntrinsicExpansion())
-MODULE_PASS("dxil-legalize", DXILLegalizePass())
 MODULE_PASS("dxil-op-lower", DXILOpLowering())
 MODULE_PASS("dxil-pretty-printer", DXILPrettyPrinterPass(dbgs()))
 MODULE_PASS("dxil-translate-metadata", DXILTranslateMetadata())
@@ -39,4 +38,5 @@ MODULE_PASS("print<dxil-root-signature>", dxil::RootSignatureAnalysisPrinter(dbg
 #define FUNCTION_PASS(NAME, CREATE_PASS)
 #endif
 FUNCTION_PASS("dxil-resource-access", DXILResourceAccess())
+FUNCTION_PASS("dxil-legalize", DXILLegalizePass())
 #undef FUNCTION_PASS