Add cs4 test and updated logic to handle legacy pass manager

Author: Cooper Partin

llvm/lib/Target/DirectX/DXILShaderFlags.cpp

@@ -40,12 +40,15 @@ static void updateFlags(ComputedShaderFlags &Flags, const Instruction &I) {
 }
 
 static void updateResourceFlags(ComputedShaderFlags &Flags, Module &M,
-                                ModuleAnalysisManager &AM) {
-  const DXILResourceMap &DRM = AM.getResult<DXILResourceAnalysis>(M);
+                                ModuleAnalysisManager *AM) {
+  if (!AM)
+    return;
+
+  const DXILResourceMap &DRM = AM->getResult<DXILResourceAnalysis>(M);
   if (DRM.empty())
     return;
 
-  const dxil::ModuleMetadataInfo &MMDI = AM.getResult<DXILMetadataAnalysis>(M);
+  const dxil::ModuleMetadataInfo &MMDI = AM->getResult<DXILMetadataAnalysis>(M);
   VersionTuple SM = MMDI.ShaderModelVersion;
   Triple::EnvironmentType SP = MMDI.ShaderProfile;
 
@@ -71,7 +74,7 @@ static void updateResourceFlags(ComputedShaderFlags &Flags, Module &M,
 }
 
 ComputedShaderFlags
-ComputedShaderFlags::computeFlags(Module &M, ModuleAnalysisManager &AM) {
+ComputedShaderFlags::computeFlags(Module &M, ModuleAnalysisManager *AM) {
   ComputedShaderFlags Flags;
   updateResourceFlags(Flags, M, AM);
 
@@ -104,7 +107,7 @@ AnalysisKey ShaderFlagsAnalysis::Key;
 
 ComputedShaderFlags ShaderFlagsAnalysis::run(Module &M,
                                              ModuleAnalysisManager &AM) {
-  return ComputedShaderFlags::computeFlags(M, AM);
+  return ComputedShaderFlags::computeFlags(M, &AM);
 }
 
 PreservedAnalyses ShaderFlagsAnalysisPrinter::run(Module &M,

llvm/lib/Target/DirectX/DXILShaderFlags.h

@@ -60,7 +60,7 @@ struct ComputedShaderFlags {
     return FeatureFlags;
   }
 
-  static ComputedShaderFlags computeFlags(Module &M, ModuleAnalysisManager &AM);
+  static ComputedShaderFlags computeFlags(Module &M, ModuleAnalysisManager *AM);
   void print(raw_ostream &OS = dbgs()) const;
   LLVM_DUMP_METHOD void dump() const { print(); }
 };
@@ -102,8 +102,7 @@ class ShaderFlagsAnalysisWrapper : public ModulePass {
   const ComputedShaderFlags &getShaderFlags() { return Flags; }
 
   bool runOnModule(Module &M) override {
-    auto AM = ModuleAnalysisManager();
-    Flags = ComputedShaderFlags::computeFlags(M, AM);
+    Flags = ComputedShaderFlags::computeFlags(M, nullptr);
     return false;
   }
 

llvm/test/CodeGen/DirectX/ShaderFlags/buffers.ll

@@ -1,6 +1,6 @@
 ; RUN: opt -S --passes="print-dx-shader-flags" 2>&1 %s | FileCheck %s
 
-target triple = "dxil-pc-shadermodel6.7-library"
+target triple = "dxil-pc-shadermodel6.3-compute"
 
 @G = external constant <4 x float>, align 4
 
@@ -11,9 +11,8 @@ define void @test_bufferflags() {
       @llvm.dx.handle.fromBinding.tdx.TypedBuffer_i32_1_0t(
           i32 2, i32 7, i32 1, i32 0, i1 false)
 
-; CHECK: ; Shader Flags Value: 0x00020010
+; CHECK: ; Shader Flags Value: 0x00000010
 ; CHECK: ; Note: shader requires additional functionality:
-; CHECK-NEXT: ;       Raw and Structured buffers
 ; CHECK-NEXT: ; Note: extra DXIL module flags:
 ; CHECK-NEXT: ; D3D11_SB_GLOBAL_FLAG_ENABLE_RAW_AND_STRUCTURED_BUFFERS
 ; CHECK-NEXT: {{^;$}}

llvm/test/CodeGen/DirectX/ShaderFlags/buffers_cs4.ll

@@ -0,0 +1,24 @@
+; RUN: opt -S --passes="print-dx-shader-flags" 2>&1 %s | FileCheck %s
+
+target triple = "dxil-pc-shadermodel4.0-compute"
+
+@G = external constant <4 x float>, align 4
+
+define void @test_bufferflags() {
+
+  ; RWBuffer<int> Buf : register(u7, space2)
+  %uav0 = call target("dx.TypedBuffer", i32, 1, 0, 1)
+      @llvm.dx.handle.fromBinding.tdx.TypedBuffer_i32_1_0t(
+          i32 2, i32 7, i32 1, i32 0, i1 false)
+
+; CHECK: ; Shader Flags Value: 0x00020010
+; CHECK: ; Note: shader requires additional functionality:
+; CHECK-NEXT: ;       Raw and Structured buffers
+; CHECK-NEXT: ; Note: extra DXIL module flags:
+; CHECK-NEXT: ; D3D11_SB_GLOBAL_FLAG_ENABLE_RAW_AND_STRUCTURED_BUFFERS
+; CHECK-NEXT: {{^;$}}
+
+  ret void
+}
+
+attributes #0 = { nocallback nofree nosync nounwind willreturn memory(none) }