Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-26 13:26:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[HLSL] Support -E option for HLSL.

Browse Source 
-E option will set entry function for hlsl.
The format is -E entry_name.

To avoid conflict with existing option with name 'E', add an extra prefix '--'.

A new field HLSLEntry is added to TargetOption.
To share code with HLSLShaderAttr, entry function will be add HLSLShaderAttr attribute too.

Reviewed By: beanz

Differential Revision: https://reviews.llvm.org/D124751
This commit is contained in:
Xiang Li 2022-04-22 22:56:15 -07:00
parent 4982d8ac76
commit 8a27a2f89f
15 changed files with 116 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
clang/include/clang/Basic/Attr.td
View File

@ -4016,16 +4016,25 @@ def HLSLShader : InheritableAttr {
let Spellings = [Microsoft<"shader">];
let Subjects = SubjectList<[HLSLEntry]>;
let LangOpts = [HLSL];
let Args = [EnumArgument<"Type", "ShaderType",
["pixel", "vertex", "geometry", "hull", "domain",
"compute", "raygeneration", "intersection",
"anyhit", "closesthit", "miss", "callable", "mesh",
"amplification"],
["Pixel", "Vertex", "Geometry", "Hull", "Domain",
"Compute", "RayGeneration", "Intersection",
"AnyHit", "ClosestHit", "Miss", "Callable", "Mesh",
"Amplification"]
>];
// NOTE:
// order for the enum should match order in llvm::Triple::EnvironmentType.
// ShaderType will be converted to llvm::Triple::EnvironmentType like
// (llvm::Triple::EnvironmentType)((uint32_t)ShaderType +
// (uint32_t)llvm::Triple::EnvironmentType::Pixel).
// This will avoid update code for convert when new shader type is added.
let Args = [
EnumArgument<"Type", "ShaderType",
[
"pixel", "vertex", "geometry", "hull", "domain", "compute",
"library", "raygeneration", "intersection", "anyHit",
"closestHit", "miss", "callable", "mesh", "amplification"
],
[
"Pixel", "Vertex", "Geometry", "Hull", "Domain", "Compute",
"Library", "RayGeneration", "Intersection", "AnyHit",
"ClosestHit", "Miss", "Callable", "Mesh", "Amplification"
]>
];
let Documentation = [HLSLSV_ShaderTypeAttrDocs];
}

1
clang/include/clang/Basic/DiagnosticSemaKinds.td
View File

@ -11645,6 +11645,7 @@ def err_hlsl_attr_unsupported_in_stage : Error<"attribute %0 is unsupported in %
def err_hlsl_numthreads_argument_oor : Error<"argument '%select{X|Y|Z}0' to numthreads attribute cannot exceed %1">;
def err_hlsl_numthreads_invalid : Error<"total number of threads cannot exceed %0">;
def err_hlsl_missing_numthreads : Error<"missing numthreads attribute for %0 shader entry">;
def err_hlsl_attribute_param_mismatch : Error<"%0 attribute parameters do not match the previous declaration">;
def err_hlsl_pointers_unsupported : Error<

3
clang/include/clang/Basic/TargetOptions.h
View File

@ -113,6 +113,9 @@ public:
/// The validator version for dxil.
std::string DxilValidatorVersion;
/// The entry point name for HLSL shader being compiled as specified by -E.
std::string HLSLEntry;
};
} // end namespace clang

9
clang/include/clang/Driver/Options.td
View File

@ -6909,3 +6909,12 @@ 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 hlsl_entrypoint : Option<["-"], "hlsl-entry", KIND_SEPARATE>,
Group<dxc_Group>,
Flags<[CC1Option]>,
MarshallingInfoString<TargetOpts<"HLSLEntry">>,
HelpText<"Entry point name for hlsl">;
def dxc_entrypoint : Option<["--", "/", "-"], "E", KIND_JOINED_OR_SEPARATE>,
Group<dxc_Group>,
Flags<[DXCOption, NoXarchOption]>,
HelpText<"Entry point name">;

1
clang/include/clang/Sema/Sema.h
View File

@ -2898,6 +2898,7 @@ public:
QualType NewT, QualType OldT);
void CheckMain(FunctionDecl *FD, const DeclSpec &D);
void CheckMSVCRTEntryPoint(FunctionDecl *FD);
void CheckHLSLEntryPoint(FunctionDecl *FD);
Attr *getImplicitCodeSegOrSectionAttrForFunction(const FunctionDecl *FD,
bool IsDefinition);
void CheckFunctionOrTemplateParamDeclarator(Scope *S, Declarator &D);

3
clang/lib/Driver/ToolChains/Clang.cpp
View File

@ -3514,7 +3514,8 @@ static void RenderHLSLOptions(const ArgList &Args, ArgStringList &CmdArgs,
options::OPT_S,
options::OPT_emit_llvm,
options::OPT_disable_llvm_passes,
options::OPT_fnative_half_type};
options::OPT_fnative_half_type,
options::OPT_hlsl_entrypoint};
for (const auto &Arg : ForwardedArguments)
if (const auto *A = Args.getLastArg(Arg))

6
clang/lib/Driver/ToolChains/HLSL.cpp
View File

@ -158,6 +158,12 @@ HLSLToolChain::TranslateArgs(const DerivedArgList &Args, StringRef BoundArch,
if (!isLegalValidatorVersion(ValVerStr, getDriver()))
continue;
}
if (A->getOption().getID() == options::OPT_dxc_entrypoint) {
DAL->AddSeparateArg(nullptr, Opts.getOption(options::OPT_hlsl_entrypoint),
A->getValue());
A->claim();
continue;
}
if (A->getOption().getID() == options::OPT_emit_pristine_llvm) {
// Translate fcgl into -S -emit-llvm and -disable-llvm-passes.
DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_S));

4
clang/lib/Frontend/CompilerInvocation.cpp
View File

@ -510,6 +510,10 @@ static bool FixupInvocation(CompilerInvocation &Invocation,
Diags.Report(diag::err_drv_argument_not_allowed_with)
<< "-fgnu89-inline" << GetInputKindName(IK);
if (Args.hasArg(OPT_hlsl_entrypoint) && !LangOpts.HLSL)
Diags.Report(diag::err_drv_argument_not_allowed_with)
<< "-hlsl-entry" << GetInputKindName(IK);
if (Args.hasArg(OPT_fgpu_allow_device_init) && !LangOpts.HIP)
Diags.Report(diag::warn_ignored_hip_only_option)
<< Args.getLastArg(OPT_fgpu_allow_device_init)->getAsString(Args);

38
clang/lib/Sema/SemaDecl.cpp
View File

@ -10005,6 +10005,27 @@ Sema::ActOnFunctionDeclarator(Scope *S, Declarator &D, DeclContext *DC,
}
}
if (getLangOpts().HLSL) {
auto &TargetInfo = getASTContext().getTargetInfo();
// Skip operator overload which not identifier.
// Also make sure NewFD is in translation-unit scope.
if (!NewFD->isInvalidDecl() && Name.isIdentifier() &&
NewFD->getName() == TargetInfo.getTargetOpts().HLSLEntry &&
S->getDepth() == 0) {
CheckHLSLEntryPoint(NewFD);
if (!NewFD->isInvalidDecl()) {
auto TripleShaderType = TargetInfo.getTriple().getEnvironment();
AttributeCommonInfo AL(NewFD->getBeginLoc());
HLSLShaderAttr::ShaderType ShaderType = (HLSLShaderAttr::ShaderType)(
TripleShaderType - (uint32_t)llvm::Triple::Pixel);
// To share code with HLSLShaderAttr, add HLSLShaderAttr to entry
// function.
if (HLSLShaderAttr *Attr = mergeHLSLShaderAttr(NewFD, AL, ShaderType))
NewFD->addAttr(Attr);
}
}
}
if (!getLangOpts().CPlusPlus) {
// Perform semantic checking on the function declaration.
if (!NewFD->isInvalidDecl() && NewFD->isMain())
@ -11833,6 +11854,23 @@ void Sema::CheckMSVCRTEntryPoint(FunctionDecl *FD) {
}
}
void Sema::CheckHLSLEntryPoint(FunctionDecl *FD) {
auto &TargetInfo = getASTContext().getTargetInfo();
auto const Triple = TargetInfo.getTriple();
switch (Triple.getEnvironment()) {
default:
// FIXME: check all shader profiles.
break;
case llvm::Triple::EnvironmentType::Compute:
if (!FD->hasAttr<HLSLNumThreadsAttr>()) {
Diag(FD->getLocation(), diag::err_hlsl_missing_numthreads)
<< Triple.getEnvironmentName();
FD->setInvalidDecl();
}
break;
}
}
bool Sema::CheckForConstantInitializer(Expr *Init, QualType DclT) {
// FIXME: Need strict checking. In C89, we need to check for
// any assignment, increment, decrement, function-calls, or

6
clang/lib/Sema/SemaDeclAttr.cpp
View File

@ -6904,7 +6904,11 @@ static void handleHLSLShaderAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
return;
HLSLShaderAttr::ShaderType ShaderType;
if (!HLSLShaderAttr::ConvertStrToShaderType(Str, ShaderType)) {
if (!HLSLShaderAttr::ConvertStrToShaderType(Str, ShaderType) ||
// Library is added to help convert HLSLShaderAttr::ShaderType to
// llvm::Triple::EnviromentType. It is not a legal
// HLSLShaderAttr::ShaderType.
ShaderType == HLSLShaderAttr::Library) {
S.Diag(AL.getLoc(), diag::warn_attribute_type_not_supported)
<< AL << Str << ArgLoc;
return;

4
clang/test/Driver/dxc_E.hlsl Normal file
View File

@ -0,0 +1,4 @@
// RUN: %clang_dxc -Efoo -Tlib_6_7 foo.hlsl -### %s 2>&1 | FileCheck %s
// Make sure E option flag which translated into "-hlsl-entry".
// CHECK:"-hlsl-entry" "foo"

3
clang/test/Driver/hlsl-entry.cpp Normal file
View File

@ -0,0 +1,3 @@
// RUN:not %clang -cc1 -triple dxil-pc-shadermodel6.3-compute -x c++ -hlsl-entry foo %s 2>&1 | FileCheck %s --check-prefix=NOTHLSL
// NOTHLSL:invalid argument '-hlsl-entry' not allowed with 'C++'

15
clang/test/SemaHLSL/entry.hlsl Normal file
View File

@ -0,0 +1,15 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -hlsl-entry foo -DWITH_NUM_THREADS -ast-dump -o - %s | FileCheck %s
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -hlsl-entry foo -o - %s -verify
// Make sure add HLSLShaderAttr along with HLSLNumThreadsAttr.
// CHECK:HLSLNumThreadsAttr 0x{{.*}} <line:10:2, col:18> 1 1 1
// CHECK:HLSLShaderAttr 0x{{.*}} <line:13:1> Compute
#ifdef WITH_NUM_THREADS
[numthreads(1,1,1)]
#endif
// expected-error@+1 {{missing numthreads attribute for compute shader entry}}
void foo() {
}

2
clang/test/SemaHLSL/prohibit_pointer.hlsl
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -o - -fsyntax-only %s -verify
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -o - -fsyntax-only %s -verify
// expected-error@+1 {{pointers are unsupported in HLSL}}
typedef int (*fn_int)(int);

9
clang/test/SemaHLSL/shader_type_attr.hlsl
View File

@ -53,10 +53,11 @@ int forwardDecl() {
[shader(1)]
// expected-warning@+1 {{'shader' attribute argument not supported: cs}}
[shader("cs")]
// expected-warning@+1 {{'shader' attribute argument not supported: library}}
[shader("library")]
#endif // END of FAIL
// CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:60:2, col:18> Compute
// CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:61:2, col:18> Compute
[shader("compute")]
int entry() {
return 1;
@ -64,11 +65,11 @@ int entry() {
// Because these two attributes match, they should both appear in the AST
[shader("compute")]
// CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:66:2, col:18> Compute
// CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:67:2, col:18> Compute
int secondFn();
[shader("compute")]
// CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:70:2, col:18> Compute
// CHECK:HLSLShaderAttr 0x{{[0-9a-fA-F]+}} <line:71:2, col:18> Compute
int secondFn() {
return 1;
}