review: update namespace

- reduce namespace for brevity
- remove introducing rs namespace and use new namespace instead

Author: inbelic

clang/include/clang/Parse/ParseHLSLRootSignature.h

@@ -28,8 +28,6 @@
 namespace clang {
 namespace hlsl {
 
-namespace rs = llvm::hlsl::root_signature;
-
 struct RootSignatureToken {
   enum Kind {
 #define TOK(X) X,
@@ -87,7 +85,7 @@ class RootSignatureLexer {
 
 class RootSignatureParser {
 public:
-  RootSignatureParser(SmallVector<rs::RootElement> &Elements,
+  RootSignatureParser(SmallVector<llvm::hlsl::rootsig::RootElement> &Elements,
                       const SmallVector<RootSignatureToken> &Tokens,
                       DiagnosticsEngine &Diags);
 
@@ -113,16 +111,17 @@ class RootSignatureParser {
   // It is helpful to have a generalized dispatch method so that when we need
   // to parse multiple optional parameters in any order, we can invoke this
   // method
-  bool ParseParam(rs::ParamType Ref);
+  bool ParseParam(llvm::hlsl::rootsig::ParamType Ref);
 
   // Parse as many optional parameters as possible in any order
-  bool
-  ParseOptionalParams(llvm::SmallDenseMap<TokenKind, rs::ParamType> RefMap);
+  bool ParseOptionalParams(
+      llvm::SmallDenseMap<TokenKind, llvm::hlsl::rootsig::ParamType> RefMap);
 
   // Common parsing helpers
-  bool ParseRegister(rs::Register *Reg);
+  bool ParseRegister(llvm::hlsl::rootsig::Register *Reg);
   bool ParseUInt(uint32_t *X);
-  bool ParseDescriptorRangeOffset(rs::DescriptorRangeOffset *X);
+  bool
+  ParseDescriptorRangeOffset(llvm::hlsl::rootsig::DescriptorRangeOffset *X);
 
   // Various flags/enum parsing helpers
   template <bool AllowZero = false, typename EnumType>
@@ -131,8 +130,9 @@ class RootSignatureParser {
   template <typename FlagType>
   bool ParseFlags(llvm::SmallDenseMap<TokenKind, FlagType> EnumMap,
                   FlagType *Enum);
-  bool ParseDescriptorRangeFlags(rs::DescriptorRangeFlags *Enum);
-  bool ParseShaderVisibility(rs::ShaderVisibility *Enum);
+  bool
+  ParseDescriptorRangeFlags(llvm::hlsl::rootsig::DescriptorRangeFlags *Enum);
+  bool ParseShaderVisibility(llvm::hlsl::rootsig::ShaderVisibility *Enum);
 
   // Increment the token iterator if we have not reached the end.
   // Return value denotes if we were already at the last token.
@@ -171,7 +171,7 @@ class RootSignatureParser {
   bool TryConsumeExpectedToken(ArrayRef<TokenKind> Expected);
 
 private:
-  SmallVector<rs::RootElement> &Elements;
+  SmallVector<llvm::hlsl::rootsig::RootElement> &Elements;
   SmallVector<RootSignatureToken>::const_iterator CurTok;
   SmallVector<RootSignatureToken>::const_iterator LastTok;
 

clang/lib/Parse/ParseHLSLRootSignature.cpp

@@ -2,7 +2,7 @@
 
 #include "llvm/Support/raw_ostream.h"
 
-using namespace llvm::hlsl::root_signature;
+using namespace llvm::hlsl::rootsig;
 
 namespace clang {
 namespace hlsl {
@@ -343,7 +343,7 @@ bool RootSignatureParser::ParseDescriptorTableClause() {
     return true;
 
   // Parse optional paramaters
-  llvm::SmallDenseMap<TokenKind, rs::ParamType> RefMap = {
+  llvm::SmallDenseMap<TokenKind, ParamType> RefMap = {
       {TokenKind::kw_numDescriptors, &Clause.NumDescriptors},
       {TokenKind::kw_space, &Clause.Space},
       {TokenKind::kw_offset, &Clause.Offset},
@@ -387,7 +387,7 @@ bool RootSignatureParser::ParseParam(ParamType Ref) {
 }
 
 bool RootSignatureParser::ParseOptionalParams(
-    llvm::SmallDenseMap<TokenKind, rs::ParamType> RefMap) {
+    llvm::SmallDenseMap<TokenKind, ParamType> RefMap) {
   SmallVector<TokenKind> ParamKeywords;
   for (auto RefPair : RefMap)
     ParamKeywords.push_back(RefPair.first);

clang/unittests/Parse/ParseHLSLRootSignatureTest.cpp

@@ -24,7 +24,7 @@
 #include "gtest/gtest.h"
 
 using namespace clang;
-using namespace llvm::hlsl::root_signature;
+using namespace llvm::hlsl::rootsig;
 
 namespace {
 

llvm/include/llvm/Frontend/HLSL/HLSLRootSignature.h

@@ -19,7 +19,7 @@
 
 namespace llvm {
 namespace hlsl {
-namespace root_signature {
+namespace rootsig {
 
 #define RS_DEFINE_ENUM_CLASS_FLAGS_OPERATORS(Class)                            \
   inline Class operator|(Class a, Class b) {                                   \
@@ -122,7 +122,7 @@ using RootElement = std::variant<DescriptorTable, DescriptorTableClause>;
 using ParamType = std::variant<uint32_t *, DescriptorRangeOffset *,
                                DescriptorRangeFlags *, ShaderVisibility *>;
 
-} // namespace root_signature
+} // namespace rootsig
 } // namespace hlsl
 } // namespace llvm