address comments

Author: Joao Saffran

llvm/include/llvm/Support/DXILABI.h

@@ -101,7 +101,7 @@ enum class SamplerFeedbackType : uint32_t {
 const unsigned MinWaveSize = 4;
 const unsigned MaxWaveSize = 128;
 
-LLVM_ABI ArrayRef<EnumEntry<llvm::dxil::ResourceClass>> getResourceClasses();
+LLVM_ABI ArrayRef<EnumEntry<ResourceClass>> getResourceClasses();
 
 LLVM_ABI StringRef getResourceClassName(ResourceClass RC);
 

llvm/lib/Support/DXILABI.cpp

@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/BinaryFormat/DXContainer.h"
+#include "llvm/Support/DXILABI.h"
 #include "llvm/Support/ScopedPrinter.h"
 using namespace llvm;
 

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-cbuffer-range.ll

@@ -6,8 +6,8 @@ entry:
   ret void
 }
 
-; RootConstants(num32BitConstants=4, b2), DescriptorTable(CBV(b0, numDescriptors=3))
 !dx.rootsignatures = !{!0}
+
 !0 = !{ptr @CSMain, !1, i32 2}
 !1 = !{!2, !3}
 !2 = !{!"RootConstants", i32 0, i32 2, i32 0, i32 4}

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-descriptor-table-range.ll

@@ -1,12 +1,13 @@
 ; RUN: not opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 2>&1 | FileCheck %s
 ; CHECK: error: resource UAV (space=10, registers=[4294967295, 4294967295]) overlaps with resource UAV (space=10, registers=[4294967295, 4294967295])
+
 define void @CSMain() "hlsl.shader"="compute" {
 entry:
   ret void
 }
 
-; DescriptorTable(UAV(u0, numDescriptors=unbounded)), DescriptorTable(UAV(u2, numDescriptors=4))
 !dx.rootsignatures = !{!0}
+
 !0 = !{ptr @CSMain, !1, i32 2}
 !1 = !{!2, !4}
 !2 = !{!"DescriptorTable", i32 0, !3}

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-root-descriptor-range.ll

@@ -7,6 +7,7 @@ entry:
 }
 
 !dx.rootsignatures = !{!0}
+
 !0 = !{ptr @CSMain, !1, i32 2}
 !1 = !{!2, !4}
 !2 = !{!"RootUAV", i32 0, i32 3, i32 1, i32 4}

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-sampler.ll

@@ -7,6 +7,7 @@ entry:
 }
 
 !dx.rootsignatures = !{!0}
+
 !0 = !{ptr @CSMain, !1, i32 2}
 !1 = !{!2, !3}
 !2 = !{ !"StaticSampler", i32 5, i32 4, i32 5, i32 3, float 0x3FF7CCCCC0000000, i32 10, i32 2, i32 1, float -1.270000e+02, float 1.220000e+02, i32 42, i32 0, i32 0 }

llvm/test/CodeGen/DirectX/rootsignature-validation-fail-static-sampler-range.ll

@@ -7,6 +7,7 @@ entry:
 }
 
 !dx.rootsignatures = !{!0}
+
 !0 = !{ptr @CSMain, !1, i32 2}
 !1 = !{!2, !3}
 !2 = !{ !"StaticSampler", i32 5, i32 4, i32 5, i32 3, float 0x3FF7CCCCC0000000, i32 10, i32 2, i32 1, float -1.270000e+02, float 1.220000e+02, i32 42, i32 0, i32 0 }

llvm/test/CodeGen/DirectX/rootsignature-validation.ll

@@ -1,13 +1,5 @@
 ; RUN: opt -S -passes='dxil-post-optimization-validation' -mtriple=dxil-pc-shadermodel6.6-compute %s 
-; expected-no-diagnostics
-
-
-; Root Signature(
-;   CBV(b3, space=1, visibility=SHADER_VISIBILITY_ALL)
-;   DescriptorTable(SRV(t0, space=0, numDescriptors=1), visibility=SHADER_VISIBILITY_ALL)
-;   DescriptorTable(Sampler(s0, numDescriptors=2), visibility=SHADER_VISIBILITY_VERTEX)
-;   DescriptorTable(UAV(u0, numDescriptors=unbounded), visibility=SHADER_VISIBILITY_ALL)
-
+; We have a valid root signature, this should compile successfully
 
 define void @CSMain() "hlsl.shader"="compute" {
 entry: