design review: rename to fdx-rootsig-version

Author: inbelic

clang/include/clang/Driver/Options.td

@@ -9288,8 +9288,8 @@ def fcgl : DXCFlag<"fcgl">, Alias<emit_pristine_llvm>;
 def enable_16bit_types : DXCFlag<"enable-16bit-types">, Alias<fnative_half_type>,
   HelpText<"Enable 16-bit types and disable min precision types."
            "Available in HLSL 2018 and shader model 6.2.">;
-def fdx_rootsig_ver :
-  Joined<["-"], "fdx-rootsig-ver=">,
+def fdx_rootsig_version :
+  Joined<["-"], "fdx-rootsig-version=">,
   Group<dxc_Group>,
   Visibility<[ClangOption, CC1Option]>,
   HelpText<"Root Signature Version">,
@@ -9299,7 +9299,7 @@ def fdx_rootsig_ver :
   MarshallingInfoEnum<LangOpts<"HLSLRootSigVer">, "V1_1">;
 def dxc_rootsig_ver :
   Separate<["/", "-"], "force-rootsig-ver">,
-  Alias<fdx_rootsig_ver>,
+  Alias<fdx_rootsig_version>,
   Group<dxc_Group>,
   Visibility<[DXCOption]>;
 def hlsl_entrypoint : Option<["-"], "hlsl-entry", KIND_SEPARATE>,

clang/lib/Driver/ToolChains/Clang.cpp

@@ -3835,7 +3835,7 @@ static void RenderHLSLOptions(const ArgList &Args, ArgStringList &CmdArgs,
                                          options::OPT_disable_llvm_passes,
                                          options::OPT_fnative_half_type,
                                          options::OPT_hlsl_entrypoint,
-                                         options::OPT_fdx_rootsig_ver};
+                                         options::OPT_fdx_rootsig_version};
   if (!types::isHLSL(InputType))
     return;
   for (const auto &Arg : ForwardedArguments)

clang/lib/Driver/ToolChains/HLSL.cpp

@@ -296,7 +296,8 @@ HLSLToolChain::TranslateArgs(const DerivedArgList &Args, StringRef BoundArch,
       continue;
     }
     if (A->getOption().getID() == options::OPT_dxc_rootsig_ver) {
-      DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_fdx_rootsig_ver),
+      DAL->AddJoinedArg(nullptr,
+                        Opts.getOption(options::OPT_fdx_rootsig_version),
                         A->getValue());
       A->claim();
       continue;

clang/lib/Frontend/CompilerInvocation.cpp

@@ -636,9 +636,9 @@ static bool FixupInvocation(CompilerInvocation &Invocation,
     Diags.Report(diag::err_drv_argument_not_allowed_with)
         << "-hlsl-entry" << GetInputKindName(IK);
 
-  if (Args.hasArg(OPT_fdx_rootsig_ver) && !LangOpts.HLSL)
+  if (Args.hasArg(OPT_fdx_rootsig_version) && !LangOpts.HLSL)
     Diags.Report(diag::err_drv_argument_not_allowed_with)
-        << "-fdx-rootsig-ver" << GetInputKindName(IK);
+        << "-fdx-rootsig-version" << GetInputKindName(IK);
 
   if (Args.hasArg(OPT_fgpu_allow_device_init) && !LangOpts.HIP)
     Diags.Report(diag::warn_ignored_hip_only_option)

clang/test/AST/HLSL/RootSignatures-AST.hlsl

@@ -1,10 +1,10 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -ast-dump \
 // RUN:  -disable-llvm-passes -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -ast-dump \
-// RUN:  -fdx-rootsig-ver=rootsig_1_0 \
+// RUN:  -fdx-rootsig-version=rootsig_1_0 \
 // RUN:  -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-V1_0
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -ast-dump \
-// RUN:  -fdx-rootsig-ver=rootsig_1_1 \
+// RUN:  -fdx-rootsig-version=rootsig_1_1 \
 // RUN:  -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-V1_1
 
 // This test ensures that the sample root signature is parsed without error and