Skip to content

[HLSL][RootSignature] Audit RootSignatureParser diagnostic production #147800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: users/inbelic/pr-147115
Choose a base branch
from
Open

[HLSL][RootSignature] Audit RootSignatureParser diagnostic production #147800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
95166f5
remove confusing hlsl_unexpected_end_of_params diagnostic
inbelic Jul 9, 2025
24a2bea
add invalid_param diagnostic to differentiate between missing comma v…
inbelic Jul 9, 2025
4edb7fa
keep test of missing comma
inbelic Jul 9, 2025
b17b40c
audit use of err_expected_after
inbelic Jul 9, 2025
bbd8921
nfc: prepare to extend diagnostic to values as well
inbelic Jul 9, 2025
c3a4642
extend invalid_token diagnostic to enum parsing
inbelic Jul 9, 2025
b323430
extend invalid_token diagnostic to flag parsing
inbelic Jul 9, 2025
8187a65
extend invalid_token diagnostic to RootFlags enum
inbelic Jul 9, 2025
6d48044
improve err_expected to err_expected_either at end of params
inbelic Jul 9, 2025
522b084
improve unit test coverge of invalid values
inbelic Jul 9, 2025
70448a3
improve unit test coverage of invalid parameters
inbelic Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions clang/include/clang/Basic/DiagnosticParseKinds.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,8 +1860,7 @@ def err_hlsl_virtual_inheritance
: Error<"virtual inheritance is unsupported in HLSL">;

// HLSL Root Signature Parser Diagnostics
def err_hlsl_unexpected_end_of_params
: Error<"expected %0 to denote end of parameters, or, another valid parameter of %1">;
def err_hlsl_invalid_token : Error<"invalid %select{parameter|value}0 of %1">;
def err_hlsl_rootsig_repeat_param : Error<"specified the same parameter '%0' multiple times">;
def err_hlsl_rootsig_missing_param : Error<"did not specify mandatory parameter '%0'">;
def err_hlsl_number_literal_overflow : Error<
Expand Down
27 changes: 18 additions & 9 deletions clang/include/clang/Parse/ParseHLSLRootSignature.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ class RootSignatureParser {
std::optional<llvm::dxbc::RootDescriptorFlags> Flags;
};
std::optional<ParsedRootDescriptorParams>
parseRootDescriptorParams(RootSignatureToken::Kind RegType);
parseRootDescriptorParams(RootSignatureToken::Kind DescKind,
RootSignatureToken::Kind RegType);

struct ParsedClauseParams {
std::optional<llvm::hlsl::rootsig::Register> Reg;
Expand All @@ -110,7 +111,8 @@ class RootSignatureParser {
std::optional<llvm::dxbc::DescriptorRangeFlags> Flags;
};
std::optional<ParsedClauseParams>
parseDescriptorTableClauseParams(RootSignatureToken::Kind RegType);
parseDescriptorTableClauseParams(RootSignatureToken::Kind ClauseKind,
RootSignatureToken::Kind RegType);

struct ParsedStaticSamplerParams {
std::optional<llvm::hlsl::rootsig::Register> Reg;
Expand All @@ -135,13 +137,20 @@ class RootSignatureParser {
std::optional<float> parseFloatParam();

/// Parsing methods of various enums
std::optional<llvm::dxbc::ShaderVisibility> parseShaderVisibility();
std::optional<llvm::dxbc::SamplerFilter> parseSamplerFilter();
std::optional<llvm::dxbc::TextureAddressMode> parseTextureAddressMode();
std::optional<llvm::dxbc::ComparisonFunc> parseComparisonFunc();
std::optional<llvm::dxbc::StaticBorderColor> parseStaticBorderColor();
std::optional<llvm::dxbc::RootDescriptorFlags> parseRootDescriptorFlags();
std::optional<llvm::dxbc::DescriptorRangeFlags> parseDescriptorRangeFlags();
std::optional<llvm::dxbc::ShaderVisibility>
parseShaderVisibility(RootSignatureToken::Kind Context);
std::optional<llvm::dxbc::SamplerFilter>
parseSamplerFilter(RootSignatureToken::Kind Context);
std::optional<llvm::dxbc::TextureAddressMode>
parseTextureAddressMode(RootSignatureToken::Kind Context);
std::optional<llvm::dxbc::ComparisonFunc>
parseComparisonFunc(RootSignatureToken::Kind Context);
std::optional<llvm::dxbc::StaticBorderColor>
parseStaticBorderColor(RootSignatureToken::Kind Context);
std::optional<llvm::dxbc::RootDescriptorFlags>
parseRootDescriptorFlags(RootSignatureToken::Kind Context);
std::optional<llvm::dxbc::DescriptorRangeFlags>
parseDescriptorRangeFlags(RootSignatureToken::Kind Context);

/// Use NumericLiteralParser to convert CurToken.NumSpelling into a unsigned
/// 32-bit integer
Expand Down
Loading
Loading