Add -T for hlsl compiler.

Author: Xiang Li

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -654,4 +654,7 @@ def warn_drv_fjmc_for_elf_only : Warning<
 def err_drv_target_variant_invalid : Error<
   "unsupported '%0' value '%1'; use 'ios-macabi' instead">;
 
+def err_drv_invalid_directx_shader_module : Error<
+  "invalid profile : %0">;
+
 }

clang/include/clang/Driver/Driver.h

@@ -68,7 +68,8 @@ class Driver {
     GXXMode,
     CPPMode,
     CLMode,
-    FlangMode
+    FlangMode,
+    DXCMode
   } Mode;
 
   enum SaveTempsMode {
@@ -195,6 +196,9 @@ class Driver {
   /// Other modes fall back to calling gcc which in turn calls gfortran.
   bool IsFlangMode() const { return Mode == FlangMode; }
 
+  /// Whether the driver should follow dxc.exe like behavior.
+  bool IsDXCMode() const { return Mode == DXCMode; }
+
   /// Only print tool bindings, don't build any jobs.
   unsigned CCCPrintBindings : 1;
 

clang/include/clang/Driver/Options.h

@@ -36,6 +36,7 @@ enum ClangFlags {
   FC1Option = (1 << 15),
   FlangOnlyOption = (1 << 16),
   Ignored = (1 << 17),
+  DXCOption = (1 << 18),
 };
 
 enum ID {

clang/include/clang/Driver/Options.td

@@ -49,6 +49,10 @@ def CC1Option : OptionFlag;
 // CC1AsOption - This option should be accepted by clang -cc1as.
 def CC1AsOption : OptionFlag;
 
+// DXCOption - This is a dxc.exe compatibility option. Options with this flag
+// are made available when the driver is running in DXC compatibility mode.
+def DXCOption : OptionFlag;
+
 // NoDriverOption - This option should not be accepted by the driver.
 def NoDriverOption : OptionFlag;
 
@@ -6641,3 +6645,20 @@ def _SLASH_Ze : CLFlag<"Ze">;
 def _SLASH_Zg : CLFlag<"Zg">;
 def _SLASH_ZI : CLFlag<"ZI">;
 def _SLASH_ZW : CLJoined<"ZW">;
+
+//===----------------------------------------------------------------------===//
+// clang-dxc Options
+//===----------------------------------------------------------------------===//
+
+def dxc_Group : OptionGroup<"<clang-dxc options>">, Flags<[DXCOption]>,
+  HelpText<"DXC.EXE COMPATIBILITY OPTIONS">;
+
+class DXCJoinedOrSeparate<string name> : Option<["/", "-"], name,
+  KIND_JOINED_OR_SEPARATE>, Group<dxc_Group>, Flags<[DXCOption, NoXarchOption]>;
+
+def dxc_help : Option<["/", "-", "--"], "help", KIND_JOINED>,
+  Group<dxc_Group>, Flags<[DXCOption, NoXarchOption]>, Alias<help>,
+  HelpText<"Display available options">;
+
+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

@@ -49,6 +49,7 @@ add_clang_library(clangDriver
   ToolChains/Cuda.cpp
   ToolChains/Darwin.cpp
   ToolChains/DragonFly.cpp
+  ToolChains/DirectX.cpp
   ToolChains/Flang.cpp
   ToolChains/FreeBSD.cpp
   ToolChains/Fuchsia.cpp

clang/lib/Driver/Driver.cpp

@@ -20,6 +20,7 @@
 #include "ToolChains/Cuda.h"
 #include "ToolChains/Darwin.h"
 #include "ToolChains/DragonFly.h"
+#include "ToolChains/DirectX.h"
 #include "ToolChains/FreeBSD.h"
 #include "ToolChains/Fuchsia.h"
 #include "ToolChains/Gnu.h"
@@ -231,6 +232,7 @@ void Driver::setDriverMode(StringRef Value) {
                    .Case("cpp", CPPMode)
                    .Case("cl", CLMode)
                    .Case("flang", FlangMode)
+                   .Case("dxc", DXCMode)
                    .Default(None))
     Mode = *M;
   else
@@ -5726,6 +5728,9 @@ const ToolChain &Driver::getToolChain(const ArgList &Args,
       case llvm::Triple::spirv64:
         TC = std::make_unique<toolchains::SPIRVToolChain>(*this, Target, Args);
         break;
+      case llvm::Triple::dxil:
+        TC = std::make_unique<toolchains::DirectXToolChain>(*this, Target, Args);
+        break;
       default:
         if (Target.getVendor() == llvm::Triple::Myriad)
           TC = std::make_unique<toolchains::MyriadToolChain>(*this, Target,
@@ -5895,7 +5900,11 @@ Driver::getIncludeExcludeOptionFlagMasks(bool IsClCompatMode) const {
   } else {
     ExcludedFlagsBitmask |= options::CLOption;
   }
-
+  if (IsDXCMode()) {
+    // TODO: Include DXC and Core options.
+  } else {
+    ExcludedFlagsBitmask |= options::DXCOption;
+  }
   return std::make_pair(IncludedFlagsBitmask, ExcludedFlagsBitmask);
 }
 

clang/lib/Driver/ToolChain.cpp

@@ -153,6 +153,7 @@ static const DriverSuffix *FindDriverSuffix(StringRef ProgName, size_t &Pos) {
       {"cl", "--driver-mode=cl"},
       {"++", "--driver-mode=g++"},
       {"flang", "--driver-mode=flang"},
+      {"clang-dxc", "--driver-mode=dxc"},
   };
 
   for (size_t i = 0; i < llvm::array_lengthof(DriverSuffixes); ++i) {

clang/lib/Driver/ToolChains/DirectX.cpp

@@ -0,0 +1,192 @@
+//===--- DirectX.cpp - DirectX ToolChain Implementations ----------*- C++ -*-===//
+//
+// 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 "DirectX.h"
+#include "llvm/ADT/Triple.h"
+#include "CommonArgs.h"
+#include "clang/Driver/DriverDiagnostic.h"
+
+using namespace clang::driver;
+using namespace clang::driver::tools;
+using namespace clang::driver::toolchains;
+using namespace clang;
+using namespace llvm::opt;
+using namespace llvm;
+
+namespace {
+std::string tryParseProfile(StringRef profile) {
+  // [ps|vs|gs|hs|ds|cs|ms|as]_[major]_[minor]
+  Triple::EnvironmentType kind;
+  switch (profile[0]) {
+  case 'p':
+    kind = Triple::EnvironmentType::Pixel;
+    break;
+  case 'v':
+    kind = Triple::EnvironmentType::Vertex;
+    break;
+  case 'g':
+    kind = Triple::EnvironmentType::Geometry;
+    break;
+  case 'h':
+    kind = Triple::EnvironmentType::Hull;
+    break;
+  case 'd':
+    kind = Triple::EnvironmentType::Domain;
+    break;
+  case 'c':
+    kind = Triple::EnvironmentType::Compute;
+    break;
+  case 'l':
+    kind = Triple::EnvironmentType::Library;
+    break;
+  case 'm':
+    kind = Triple::EnvironmentType::Mesh;
+    break;
+  case 'a':
+    kind = Triple::EnvironmentType::Amplification;
+    break;
+  default:
+    return "";
+  }
+  unsigned Idx = 3;
+  if (kind != Triple::EnvironmentType::Library) {
+    if (profile[1] != 's' || profile[2] != '_')
+      return "";
+  } else {
+    if (profile[1] != 'i' || profile[2] != 'b' || profile[3] != '_')
+      return "";
+    Idx = 4;
+  }
+  Triple::OSType::ShaderModel;
+  unsigned Major;
+  switch (profile[Idx++]) {
+  case '4':
+    Major = 4;
+    break;
+  case '5':
+    Major = 5;
+    break;
+  case '6':
+    Major = 6;
+    break;
+  default:
+    return "";
+  }
+  if (profile[Idx++] != '_')
+    return "";
+
+  static const unsigned kOfflineMinor = 0xF;
+  unsigned Minor;
+  switch (profile[Idx++]) {
+  case '0':
+    Minor = 0;
+    break;
+  case '1':
+    Minor = 1;
+    break;
+  case '2':
+    if (Major == 6) {
+      Minor = 2;
+      break;
+    } else
+      return "";
+  case '3':
+    if (Major == 6) {
+      Minor = 3;
+      break;
+    } else
+      return "";
+  case '4':
+    if (Major == 6) {
+      Minor = 4;
+      break;
+    } else
+      return "";
+  case '5':
+    if (Major == 6) {
+      Minor = 5;
+      break;
+    } else
+      "";
+  case '6':
+    if (Major == 6) {
+      Minor = 6;
+      break;
+    } else
+      return "";
+  case '7':
+    if (Major == 6) {
+      Minor = 7;
+      break;
+    } else
+      return "";
+  case 'x':
+    if (kind == Triple::EnvironmentType::Library && Major == 6) {
+      Minor = kOfflineMinor;
+      break;
+    } else
+      return "";
+  default:
+    return "";
+  }
+  if (profile.size() != Idx && profile[Idx++] != 0)
+    return "";
+  // dxil-unknown-shadermodel-hull
+  llvm::Triple T(Twine("dxil"), Twine("unknown"),
+                 Twine("shadermodel")
+                     .concat(Twine(Major))
+                     .concat(".")
+                     .concat(Twine(Minor)),
+                 Triple::getEnvironmentTypeName(kind));
+  return T.getTriple();
+}
+
+} // namespace
+
+/// DirectX Toolchain
+DirectXToolChain::DirectXToolChain(const Driver &D, const llvm::Triple &Triple,
+                                   const ArgList &Args)
+    : ToolChain(D, Triple, Args) {}
+
+std::string
+DirectXToolChain::ComputeEffectiveClangTriple(const ArgList &Args,
+                                              types::ID InputType) const {
+  if (Arg *A = Args.getLastArg(options::OPT_target_profile)) {
+    StringRef profile = A->getValue();
+    std::string triple = tryParseProfile(profile);
+    if (triple == "") {
+      getDriver().Diag(diag::err_drv_invalid_directx_shader_module) << profile;
+      triple = ToolChain::ComputeEffectiveClangTriple(Args, InputType);
+    }
+    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

@@ -0,0 +1,36 @@
+//===--- DirectX.h - DirectX ToolChain Implementations ----------*- C++ -*-===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "clang/Driver/ToolChain.h"
+
+namespace clang {
+namespace driver {
+
+namespace toolchains {
+
+class LLVM_LIBRARY_VISIBILITY DirectXToolChain : public ToolChain {
+public:
+  DirectXToolChain(const Driver &D, const llvm::Triple &Triple,
+                   const llvm::opt::ArgList &Args);
+  bool isPICDefault() const override { return false; }
+  bool isPIEDefault(const llvm::opt::ArgList &Args) const override {
+    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;
+};
+
+} // end namespace toolchains
+} // end namespace driver
+} // end namespace clang

clang/test/Driver/dxil_target_profile.hlsl

@@ -0,0 +1,12 @@
+// RUN: %clang_dxc -Tvs_6_0 -xhlsl --target=dxil -o - %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
+// 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
+// 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
+// INVALID:invalid profile : ps_3_1