creating toDescriptorRange and change verifyDescriptorRangeFlag signature

Author: joaosaffran

clang/lib/Sema/SemaHLSL.cpp

@@ -1241,6 +1241,21 @@ bool SemaHLSL::handleRootSignatureElements(
         << /*version minor*/ VersionEnum;
   };
 
+  auto toDescriptorRangeType = [](llvm::dxil::ResourceClass Type) {
+    switch (Type) {
+    case llvm::dxil::ResourceClass::SRV:
+      return llvm::dxbc::DescriptorRangeType::SRV;
+    case llvm::dxil::ResourceClass::UAV:
+      return llvm::dxbc::DescriptorRangeType::UAV;
+    case llvm::dxil::ResourceClass::CBuffer:
+      return llvm::dxbc::DescriptorRangeType::CBV;
+    case llvm::dxil::ResourceClass::Sampler:
+      return llvm::dxbc::DescriptorRangeType::Sampler;
+    }
+
+    llvm_unreachable("Unhandled Resource Class");
+  };
+
   // Iterate through the elements and do basic validations
   for (const hlsl::RootSignatureElement &RootSigElem : Elements) {
     SourceLocation Loc = RootSigElem.getLocation();
@@ -1282,34 +1297,9 @@ bool SemaHLSL::handleRootSignatureElements(
         // value
         ReportError(Loc, 1, 0xfffffffe);
       }
-      switch (Clause->Type) {
-
-      case llvm::dxil::ResourceClass::SRV:
-        if (!llvm::hlsl::rootsig::verifyDescriptorRangeFlag(
-                Version, llvm::dxbc::DescriptorRangeType::SRV,
-                llvm::to_underlying(Clause->Flags)))
-          ReportFlagError(Loc);
-        break;
-      case llvm::dxil::ResourceClass::UAV:
-        if (!llvm::hlsl::rootsig::verifyDescriptorRangeFlag(
-                Version, llvm::dxbc::DescriptorRangeType::UAV,
-                llvm::to_underlying(Clause->Flags)))
-          ReportFlagError(Loc);
-        break;
-      case llvm::dxil::ResourceClass::CBuffer:
-        if (!llvm::hlsl::rootsig::verifyDescriptorRangeFlag(
-                Version, llvm::dxbc::DescriptorRangeType::CBV,
-                llvm::to_underlying(Clause->Flags)))
-          ReportFlagError(Loc);
-        break;
-      case llvm::dxil::ResourceClass::Sampler:
-        if (!llvm::hlsl::rootsig::verifyDescriptorRangeFlag(
-                Version, llvm::dxbc::DescriptorRangeType::Sampler,
-                llvm::to_underlying(Clause->Flags)))
-          ReportFlagError(Loc);
-        break;
-        break;
-      }
+      if (!llvm::hlsl::rootsig::verifyDescriptorRangeFlag(
+              Version, toDescriptorRangeType(Clause->Type), Clause->Flags))
+        ReportFlagError(Loc);
     }
   }
 

llvm/include/llvm/Frontend/HLSL/RootSignatureValidations.h

@@ -30,6 +30,9 @@ LLVM_ABI bool verifyRegisterValue(uint32_t RegisterValue);
 LLVM_ABI bool verifyRegisterSpace(uint32_t RegisterSpace);
 LLVM_ABI bool verifyRootDescriptorFlag(uint32_t Version, uint32_t FlagsVal);
 LLVM_ABI bool verifyRangeType(uint32_t Type);
+LLVM_ABI bool verifyDescriptorRangeFlag(uint32_t Version,
+                                        dxbc::DescriptorRangeType Type,
+                                        dxbc::DescriptorRangeFlags FlagsVal);
 LLVM_ABI bool verifyDescriptorRangeFlag(uint32_t Version,
                                         dxbc::DescriptorRangeType Type,
                                         uint32_t FlagsVal);

llvm/lib/Frontend/HLSL/RootSignatureValidations.cpp

@@ -64,9 +64,8 @@ bool verifyRangeType(uint32_t Type) {
 }
 
 bool verifyDescriptorRangeFlag(uint32_t Version, dxbc::DescriptorRangeType Type,
-                               uint32_t FlagsVal) {
+                               dxbc::DescriptorRangeFlags Flags) {
   using FlagT = dxbc::DescriptorRangeFlags;
-  FlagT Flags = FlagT(FlagsVal);
 
   const bool IsSampler = (Type == dxbc::DescriptorRangeType::Sampler);
 
@@ -124,6 +123,14 @@ bool verifyDescriptorRangeFlag(uint32_t Version, dxbc::DescriptorRangeType Type,
   return (Flags & ~Mask) == FlagT::None;
 }
 
+// This is included to avoid including BinaryFormat/DXContainer to make the
+// flags conversion, since this might cause compilation times to increase.
+bool verifyDescriptorRangeFlag(uint32_t Version, dxbc::DescriptorRangeType Type,
+                               uint32_t Flags) {
+  return verifyDescriptorRangeFlag(Version, Type,
+                                   dxbc::DescriptorRangeFlags(Flags));
+}
+
 bool verifyNumDescriptors(uint32_t NumDescriptors) {
   return NumDescriptors > 0;
 }