[clang] c20e7b6 - [HLSL] update default validator version to 1.8. (#104040)

[via cfe-commits]

Author: Xiang Li
Date: 2024-08-15T22:44:07-04:00
New Revision: c20e7b6fe105e4dffc8ecff77b03a049d327c567

URL: https://github.com/llvm/llvm-project/commit/c20e7b6fe105e4dffc8ecff77b03a049d327c567
DIFF: https://github.com/llvm/llvm-project/commit/c20e7b6fe105e4dffc8ecff77b03a049d327c567.diff

LOG: [HLSL] update default validator version to 1.8. (#104040)

Change default validator version to 1.8 in Options.td. 
Remove the default value set in HLSL.cpp.

Fixes #102963

This also helps #99910.

Added: 
    clang/test/CodeGenHLSL/default_validator_version.hlsl

Modified: 
    clang/include/clang/Driver/Options.td
    clang/lib/Driver/ToolChains/HLSL.cpp

Removed: 
    


################################################################################
diff  --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index c9ed08c20fc04f..cfd9e595c55178 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -8840,7 +8840,7 @@ def dxil_validator_version : Option<["/", "-"], "validator-version", KIND_SEPARA
   Visibility<[DXCOption, ClangOption, CC1Option]>,
   HelpText<"Override validator version for module. Format: <major.minor>;"
            "Default: DXIL.dll version or current internal version">,
-  MarshallingInfoString<TargetOpts<"DxilValidatorVersion">>;
+  MarshallingInfoString<TargetOpts<"DxilValidatorVersion">, "\"1.8\"">;
 def target_profile : DXCJoinedOrSeparate<"T">, MetaVarName<"<profile>">,
   HelpText<"Set target profile">,
   Values<"ps_6_0, ps_6_1, ps_6_2, ps_6_3, ps_6_4, ps_6_5, ps_6_6, ps_6_7,"

diff  --git a/clang/lib/Driver/ToolChains/HLSL.cpp b/clang/lib/Driver/ToolChains/HLSL.cpp
index 8286e3be21803f..ad44c2cfcd8115 100644
--- a/clang/lib/Driver/ToolChains/HLSL.cpp
+++ b/clang/lib/Driver/ToolChains/HLSL.cpp
@@ -283,14 +283,6 @@ HLSLToolChain::TranslateArgs(const DerivedArgList &Args, StringRef BoundArch,
     DAL->append(A);
   }
 
-  // Add default validator version if not set.
-  // TODO: remove this once read validator version from validator.
-  if (!DAL->hasArg(options::OPT_dxil_validator_version)) {
-    const StringRef DefaultValidatorVer = "1.7";
-    DAL->AddSeparateArg(nullptr,
-                        Opts.getOption(options::OPT_dxil_validator_version),
-                        DefaultValidatorVer);
-  }
   if (!DAL->hasArg(options::OPT_O_Group)) {
     DAL->AddJoinedArg(nullptr, Opts.getOption(options::OPT_O), "3");
   }

diff  --git a/clang/test/CodeGenHLSL/default_validator_version.hlsl b/clang/test/CodeGenHLSL/default_validator_version.hlsl
new file mode 100644
index 00000000000000..907526dd685a96
--- /dev/null
+++ b/clang/test/CodeGenHLSL/default_validator_version.hlsl
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -xhlsl -o - %s | FileCheck %s
+
+// CHECK:!dx.valver = !{![[valver:[0-9]+]]}
+// CHECK:![[valver]] = !{i32 1, i32 8}
+
+float bar(float a, float b);
+
+float foo(float a, float b) {
+  return bar(a, b);
+}