refactored the pass to PassManagerBuilder, updated a test

Author: GlassBeaver

include/llvm/Transforms/IPO/PassManagerBuilder.h

@@ -140,6 +140,7 @@ class PassManagerBuilder {
   bool HLSLEnableDebugNops = false; // HLSL Change
   bool HLSLEarlyInlining = true; // HLSL Change
   bool HLSLNoSink = false; // HLSL Change
+  bool StripDebug = false;
   void addHLSLPasses(legacy::PassManagerBase &MPM); // HLSL Change
 
 private:

lib/Transforms/IPO/PassManagerBuilder.cpp

@@ -132,6 +132,7 @@ PassManagerBuilder::PassManagerBuilder() {
     VerifyOutput = false;
     MergeFunctions = false;
     PrepareForLTO = false;
+    StripDebug = false;
 }
 
 PassManagerBuilder::~PassManagerBuilder() {
@@ -393,6 +394,8 @@ void PassManagerBuilder::populateModulePassManager(
       MPM.add(createDxilDeleteRedundantDebugValuesPass());
       MPM.add(createNoPausePassesPass());
       MPM.add(createDxilEmitMetadataPass());
+      if (StripDebug)
+        MPM.add(createDxilStripDebugSensitiveInfoPass());
     }
     // HLSL Change Ends.
     return;
@@ -712,6 +715,8 @@ void PassManagerBuilder::populateModulePassManager(
     MPM.add(createNoPausePassesPass());
     MPM.add(createDxilValidateWaveSensitivityPass());
     MPM.add(createDxilEmitMetadataPass());
+    if (StripDebug)
+      MPM.add(createDxilStripDebugSensitiveInfoPass());
   }
   // HLSL Change Ends.
   addExtensionsToPM(EP_OptimizerLast, MPM);

tools/clang/include/clang/Frontend/CodeGenOptions.h

@@ -170,6 +170,8 @@ class CodeGenOptions : public CodeGenOptionsBase {
   /// Name of the profile file to use as input for -fprofile-instr-use
   std::string InstrProfileInput;
 
+  bool StripDebug = false;
+
   /// A list of file names passed with -fcuda-include-gpubinary options to
   /// forward to CUDA runtime back-end for incorporating them into host-side
   /// object file.

tools/clang/lib/CodeGen/BackendUtil.cpp

@@ -361,6 +361,7 @@ void EmitAssemblyHelper::CreatePasses() {
       OptToggles.IsEnabled(hlsl::options::TOGGLE_PARTIAL_LIFETIME_MARKERS);
   PMBuilder.HLSLEnableAggressiveReassociation = OptToggles.IsEnabled(
       hlsl::options::TOGGLE_ENABLE_AGGRESSIVE_REASSOCIATION);
+  PMBuilder.StripDebug = CodeGenOpts.StripDebug;
   // HLSL Change - end
 
   PMBuilder.DisableUnitAtATime = !CodeGenOpts.UnitAtATime;

tools/clang/tools/dxcompiler/dxcompilerobj.cpp

@@ -25,7 +25,6 @@
 #include "clang/Sema/SemaHLSL.h"
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Support/TimeProfiler.h"
 #include "llvm/Support/Timer.h"
 #include "llvm/Transforms/Utils/Cloning.h"
@@ -35,7 +34,6 @@
 #include "dxc/DxcBindingTable/DxcBindingTable.h"
 #include "dxc/DxilContainer/DxilContainerAssembler.h"
 #include "dxc/DxilRootSignature/DxilRootSignature.h"
-#include "dxc/HLSL/DxilGenerationPass.h"
 #include "dxc/HLSL/HLSLExtensionsCodegenHelper.h"
 #include "dxc/Support/Path.h"
 #include "dxc/Support/WinIncludes.h"
@@ -1050,12 +1048,6 @@ class DxcCompiler : public IDxcCompiler3,
 
           inputs.pVersionInfo = static_cast<IDxcVersionInfo *>(this);
 
-          if (opts.StripDebug) {
-            legacy::PassManager PM;
-            PM.add(createDxilStripDebugSensitiveInfoPass());
-            PM.run(*inputs.pM);
-          }
-
           if (needsValidation) {
             valHR = dxcutil::ValidateAndAssembleToContainer(inputs);
           } else {
@@ -1616,6 +1608,7 @@ class DxcCompiler : public IDxcCompiler3,
         Opts.EnableLifetimeMarkers;
     compiler.getCodeGenOpts().HLSLEnablePayloadAccessQualifiers =
         Opts.EnablePayloadQualifiers;
+    compiler.getCodeGenOpts().StripDebug = Opts.StripDebug;
 
     // Translate signature packing options
     if (Opts.PackPrefixStable)

tools/clang/unittests/HLSL/DxilContainerTest.cpp

@@ -3092,15 +3092,11 @@ TEST_F(DxilContainerTest, StripReflectionRemovesStructNames) {
       float4 color;
     };
 
-    cbuffer MyCBuffer : register(b0) {
-      float4 data;
-    };
-
-    float4 main() : SV_Target {
+    MyCustomStruct main() : SV_Target {
       MyCustomStruct s;
       s.position = float4(0, 0, 0, 1);
       s.color = float4(1, 1, 1, 1);
-      return s.color;
+      return s;
     }
   )";