hook up flag validations

Author: inbelic

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -13078,6 +13078,8 @@ def err_hlsl_spirv_only: Error<"%0 is only available for the SPIR-V target">;
 def err_hlsl_vk_literal_must_contain_constant: Error<"the argument to vk::Literal must be a vk::integral_constant">;
 
 def err_hlsl_invalid_rootsig_value : Error<"value must be in the range [%0, %1]">;
+def err_hlsl_invalid_rootsig_flag : Error<
+  "invalid flags for version %select{1.0|1.1}0">;
 
 def subst_hlsl_format_ranges: TextSubstitution<
   "%select{t|u|b|s}0[%1;%select{%3]|unbounded)}2">;

clang/lib/Sema/SemaHLSL.cpp

@@ -1111,6 +1111,14 @@ bool SemaHLSL::handleRootSignatureElements(
       ReportError(Loc, 0, 0xffffffef);
   };
 
+  const uint32_t Version =
+      llvm::to_underlying(SemaRef.getLangOpts().HLSLRootSigVer);
+  const uint32_t VersionEnum = Version - 1;
+  auto ReportFlagError = [this, &HadError, VersionEnum](SourceLocation Loc) {
+    HadError = true;
+    this->Diag(Loc, diag::err_hlsl_invalid_rootsig_flag) << VersionEnum;
+  };
+
   // Iterate through the elements and do basic validations
   for (const hlsl::RootSignatureElement &RootSigElem : Elements) {
     SourceLocation Loc = RootSigElem.getLocation();
@@ -1119,6 +1127,10 @@ bool SemaHLSL::handleRootSignatureElements(
             std::get_if<llvm::hlsl::rootsig::RootDescriptor>(&Elem)) {
       VerifyRegister(Loc, Descriptor->Reg.Number);
       VerifySpace(Loc, Descriptor->Space);
+
+      if (!llvm::hlsl::rootsig::verifyRootDescriptorFlag(
+              Version, llvm::to_underlying(Descriptor->Flags)))
+        ReportFlagError(Loc);
     } else if (const auto *Constants =
                    std::get_if<llvm::hlsl::rootsig::RootConstants>(&Elem)) {
       VerifyRegister(Loc, Constants->Reg.Number);
@@ -1148,6 +1160,11 @@ bool SemaHLSL::handleRootSignatureElements(
         // value
         ReportError(Loc, 1, 0xfffffffe);
       }
+
+      if (!llvm::hlsl::rootsig::verifyDescriptorRangeFlag(
+              Version, llvm::to_underlying(Clause->Type),
+              llvm::to_underlying(Clause->Flags)))
+        ReportFlagError(Loc);
     }
   }
 

clang/test/SemaHLSL/RootSignature-flags-err.hlsl

@@ -0,0 +1,57 @@
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -fsyntax-only \
+// RUN:   -fdx-rootsignature-version=rootsig_1_0 %s -verify=v10
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -fsyntax-only \
+// RUN:   -fdx-rootsignature-version=rootsig_1_1 %s -verify=v11
+
+// Root Descriptor Flags:
+
+// v10-error@+1 {{invalid flags for version 1.0}}
+[RootSignature("CBV(b0, flags = DATA_STATIC)")]
+void bad_root_descriptor_flags_0() {}
+
+// v10-error@+1 {{invalid flags for version 1.0}}
+[RootSignature("CBV(b0, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)")]
+void bad_root_descriptor_flags_1() {}
+
+// v10-error@+2 {{invalid flags for version 1.0}}
+// v11-error@+1 {{invalid flags for version 1.1}}
+[RootSignature("CBV(b0, flags = DATA_STATIC | DATA_VOLATILE)")]
+void bad_root_descriptor_flags_2() {}
+
+// Descriptor Range Flags:
+
+// v10-error@+1 {{invalid flags for version 1.0}}
+[RootSignature("DescriptorTable(CBV(b0, flags = DATA_VOLATILE))")]
+void bad_descriptor_range_flags_0() {}
+
+// v10-error@+1 {{invalid flags for version 1.0}}
+[RootSignature("DescriptorTable(CBV(b0, flags = DATA_STATIC))")]
+void bad_descriptor_range_flags_1() {}
+
+// v10-error@+1 {{invalid flags for version 1.0}}
+[RootSignature("DescriptorTable(CBV(b0, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE | DESCRIPTORS_VOLATILE))")]
+void bad_descriptor_range_flags_2() {}
+
+// v10-error@+1 {{invalid flags for version 1.0}}
+[RootSignature("DescriptorTable(CBV(b0, flags = DESCRIPTORS_VOLATILE))")]
+void bad_descriptor_range_flags_3() {}
+
+// v10-error@+1 {{invalid flags for version 1.0}}
+[RootSignature("DescriptorTable(CBV(b0, flags = DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS))")]
+void bad_descriptor_range_flags_4() {}
+
+// v10-error@+2 {{invalid flags for version 1.0}}
+// v11-error@+1 {{invalid flags for version 1.1}}
+[RootSignature("DescriptorTable(CBV(b0, flags = DATA_STATIC | DATA_STATIC_WHILE_SET_AT_EXECUTE))")]
+void bad_descriptor_range_flags_5() {}
+
+// v10-error@+2 {{invalid flags for version 1.0}}
+// v11-error@+1 {{invalid flags for version 1.1}}
+[RootSignature("DescriptorTable(CBV(b0, flags = DESCRIPTORS_VOLATILE | DESCRIPTORS_STATIC_KEEPING_BUFFER_BOUNDS_CHECKS))")]
+void bad_descriptor_range_flags_6() {}
+
+// v10-error@+2 {{invalid flags for version 1.0}}
+// v11-error@+1 {{invalid flags for version 1.1}}
+[RootSignature("DescriptorTable(CBV(b0, flags = DESCRIPTORS_VOLATILE | DATA_STATIC))")]
+void bad_descriptor_range_flags_7() {}
+