Include DXC and Core options.

Added Fo and map hlsl to -xhlsl to make test work without CC1 options.

Author: Xiang Li

clang/include/clang/Driver/Options.td

@@ -6660,5 +6660,9 @@ def dxc_help : Option<["/", "-", "--"], "help", KIND_JOINED>,
   Group<dxc_Group>, Flags<[DXCOption, NoXarchOption]>, Alias<help>,
   HelpText<"Display available options">;
 
+
+def Fo : DXCJoinedOrSeparate<"Fo">, Alias<o>,
+  HelpText<"Output object file.">;
+
 def target_profile : DXCJoinedOrSeparate<"T">, MetaVarName<"<profile>">,
   HelpText<"Set target profile. \n\t<profile>: ps_6_0, ps_6_1, ps_6_2, ps_6_3, ps_6_4, ps_6_5, ps_6_6, ps_6_7, \n\t\t vs_6_0, vs_6_1, vs_6_2, vs_6_3, vs_6_4, vs_6_5, vs_6_6, vs_6_7, \n\t\t gs_6_0, gs_6_1, gs_6_2, gs_6_3, gs_6_4, gs_6_5, gs_6_6, gs_6_7, \n\t\t hs_6_0, hs_6_1, hs_6_2, hs_6_3, hs_6_4, hs_6_5, hs_6_6, hs_6_7, \n\t\t ds_6_0, ds_6_1, ds_6_2, ds_6_3, ds_6_4, ds_6_5, ds_6_6, ds_6_7, \n\t\t cs_6_0, cs_6_1, cs_6_2, cs_6_3, cs_6_4, cs_6_5, cs_6_6, cs_6_7, \n\t\t lib_6_1, lib_6_2, lib_6_3, lib_6_4, lib_6_5, lib_6_6, lib_6_7, \n\t\t ms_6_5, ms_6_6, ms_6_7, \n\t\t as_6_5, as_6_6, as_6_7, \n\t\t ">;

clang/lib/Driver/CMakeLists.txt

@@ -48,8 +48,8 @@ add_clang_library(clangDriver
   ToolChains/CrossWindows.cpp
   ToolChains/Cuda.cpp
   ToolChains/Darwin.cpp
-  ToolChains/DragonFly.cpp
   ToolChains/DirectX.cpp
+  ToolChains/DragonFly.cpp
   ToolChains/Flang.cpp
   ToolChains/FreeBSD.cpp
   ToolChains/Fuchsia.cpp

clang/lib/Driver/Driver.cpp

@@ -19,8 +19,8 @@
 #include "ToolChains/CrossWindows.h"
 #include "ToolChains/Cuda.h"
 #include "ToolChains/Darwin.h"
-#include "ToolChains/DragonFly.h"
 #include "ToolChains/DirectX.h"
+#include "ToolChains/DragonFly.h"
 #include "ToolChains/FreeBSD.h"
 #include "ToolChains/Fuchsia.h"
 #include "ToolChains/Gnu.h"
@@ -5901,7 +5901,9 @@ Driver::getIncludeExcludeOptionFlagMasks(bool IsClCompatMode) const {
     ExcludedFlagsBitmask |= options::CLOption;
   }
   if (IsDXCMode()) {
-    // TODO: Include DXC and Core options.
+    // Include DXC and Core options.
+    IncludedFlagsBitmask |= options::DXCOption;
+    IncludedFlagsBitmask |= options::CoreOption;
   } else {
     ExcludedFlagsBitmask |= options::DXCOption;
   }

clang/lib/Driver/ToolChains/DirectX.cpp

@@ -163,30 +163,9 @@ DirectXToolChain::ComputeEffectiveClangTriple(const ArgList &Args,
       getDriver().Diag(diag::err_drv_invalid_directx_shader_module) << profile;
       triple = ToolChain::ComputeEffectiveClangTriple(Args, InputType);
     }
+    A->claim();
     return triple;
   } else {
     return ToolChain::ComputeEffectiveClangTriple(Args, InputType);
   }
 }
-
-llvm::opt::DerivedArgList *
-DirectXToolChain::TranslateArgs(const llvm::opt::DerivedArgList &Args,
-                                StringRef BoundArch,
-                                Action::OffloadKind OFK) const {
-  DerivedArgList *DAL = new DerivedArgList(Args.getBaseArgs());
-  const OptTable &Opts = getDriver().getOpts();
-
-  for (Arg *A : Args) {
-    if (A->getOption().matches(options::OPT_T)) {
-      // Convert OPT_T to OPT_target_profile for dxc.
-      StringRef ProfileStr = A->getValue();
-      DAL->AddJoinedArg(A, Opts.getOption(options::OPT_target_profile),
-                        ProfileStr);
-    } else {
-      // HIP Toolchain translates input args by itself.
-      DAL->append(A);
-    }
-  }
-
-  return DAL;
-}

clang/lib/Driver/ToolChains/DirectX.h

@@ -24,9 +24,7 @@ class LLVM_LIBRARY_VISIBILITY DirectXToolChain : public ToolChain {
     return false;
   }
   bool isPICDefaultForced() const override { return false; }
-  llvm::opt::DerivedArgList *
-  TranslateArgs(const llvm::opt::DerivedArgList &Args, StringRef BoundArch,
-                Action::OffloadKind DeviceOffloadKind) const override;
+
   std::string ComputeEffectiveClangTriple(const llvm::opt::ArgList &Args,
                                           types::ID InputType) const override;
 };

clang/lib/Driver/Types.cpp

@@ -332,6 +332,7 @@ types::ID types::lookupTypeForExtension(llvm::StringRef Ext) {
            .Case("c++m", TY_CXXModule)
            .Case("cppm", TY_CXXModule)
            .Case("cxxm", TY_CXXModule)
+           .Case("hlsl", TY_HLSL)
            .Default(TY_INVALID);
 }
 

clang/test/Driver/dxil_target_profile.hlsl

@@ -1,12 +1,14 @@
-// RUN: %clang_dxc -Tvs_6_0 -xhlsl --target=dxil -o - %s 2>&1 | FileCheck %s --check-prefix=VS60
+// RUN: %clang_dxc -Tvs_6_0 --target=dxil -Fo - %s 2>&1 | FileCheck %s --check-prefix=VS60
 // VS60:target triple = "dxil-unknown-shadermodel6.0-vertex"
-// RUN: %clang_dxc -Ths_6_1 -xhlsl --target=dxil -o - %s 2>&1 | FileCheck %s --check-prefix=HS61
+
+// RUN: %clang_dxc -Ths_6_1  --target=dxil -Fo - %s 2>&1 | FileCheck %s --check-prefix=HS61
 // HS61:target triple = "dxil-unknown-shadermodel6.1-hull"
 
-// RUN: %clang_dxc -Tps_6_1 -xhlsl --target=dxil -o - %s 2>&1 | FileCheck %s --check-prefix=PS61
+// RUN: %clang_dxc -Tps_6_1 --target=dxil -Fo - %s 2>&1 | FileCheck %s --check-prefix=PS61
 // PS61:target triple = "dxil-unknown-shadermodel6.1-pixel"
-// RUN: %clang_dxc -Tlib_6_3 -xhlsl --target=dxil -o - %s 2>&1 | FileCheck %s --check-prefix=LIB63
-// LIB63:target triple = "dxil-unknown-shadermodel6.3-library"
 
-// RUN: %clang_dxc -###  -Tps_3_1 -xhlsl --target=dxil -o - %s 2>&1 | FileCheck %s --check-prefix=INVALID
+// RUN: %clang_dxc -Tlib_6_x  --target=dxil -Fo - %s 2>&1 | FileCheck %s --check-prefix=LIB63
+// LIB63:target triple = "dxil-unknown-shadermodel6.15-library"
+
+// RUN: %clang_dxc -###  -Tps_3_1  --target=dxil -Fo - %s 2>&1 | FileCheck %s --check-prefix=INVALID
 // INVALID:invalid profile : ps_3_1