Skip to content

[HLSL][RootSignature] Make Root Signature lexer keywords case-insensitive #132967

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

Merged
merged 2 commits into from
Mar 28, 2025
Merged

[HLSL][RootSignature] Make Root Signature lexer keywords case-insensitive #132967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d41aefd
[NFC] add missing liscence to file
Mar 25, 2025
cfe69b1
[HLSL][RootSignature] Make keywords case-insensitive
Mar 25, 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
10 changes: 9 additions & 1 deletion clang/lib/Lex/LexHLSLRootSignature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
//=== LexHLSLRootSignature.cpp - Lex Root Signature -----------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#include "clang/Lex/LexHLSLRootSignature.h"

namespace clang {
Expand Down Expand Up @@ -87,7 +95,7 @@ RootSignatureToken RootSignatureLexer::LexToken() {

// Define a large string switch statement for all the keywords and enums
auto Switch = llvm::StringSwitch<TokenKind>(TokSpelling);
#define KEYWORD(NAME) Switch.Case(#NAME, TokenKind::kw_##NAME);
#define KEYWORD(NAME) Switch.CaseLower(#NAME, TokenKind::kw_##NAME);
#define ENUM(NAME, LIT) Switch.CaseLower(LIT, TokenKind::en_##NAME);
#include "clang/Lex/HLSLRootSignatureTokenKinds.def"

Expand Down
30 changes: 30 additions & 0 deletions clang/unittests/Lex/LexHLSLRootSignatureTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,36 @@ TEST_F(LexHLSLRootSignatureTest, ValidLexAllTokensTest) {
CheckTokens(Lexer, Tokens, Expected);
}

TEST_F(LexHLSLRootSignatureTest, ValidCaseInsensitiveKeywordsTest) {
// This test will check that we can lex keywords in an case-insensitive
// manner
const llvm::StringLiteral Source = R"cc(
DeScRiPtOrTaBlE

CBV srv UAV sampler
SPACE visibility FLAGS
numDescriptors OFFSET
)cc";
auto TokLoc = SourceLocation();
hlsl::RootSignatureLexer Lexer(Source, TokLoc);

SmallVector<hlsl::RootSignatureToken> Tokens;
SmallVector<hlsl::TokenKind> Expected = {
hlsl::TokenKind::kw_DescriptorTable,
hlsl::TokenKind::kw_CBV,
hlsl::TokenKind::kw_SRV,
hlsl::TokenKind::kw_UAV,
hlsl::TokenKind::kw_Sampler,
hlsl::TokenKind::kw_space,
hlsl::TokenKind::kw_visibility,
hlsl::TokenKind::kw_flags,
hlsl::TokenKind::kw_numDescriptors,
hlsl::TokenKind::kw_offset,
};

CheckTokens(Lexer, Tokens, Expected);
}

TEST_F(LexHLSLRootSignatureTest, ValidLexPeekTest) {
// This test will check that we the peek api is correctly used
const llvm::StringLiteral Source = R"cc(
Expand Down