Skip to content

[HLSL] Add HLSL 202y language mode #108437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 13, 2024
Merged

[HLSL] Add HLSL 202y language mode #108437

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34cc492
[HLSL] Add HLSL 202y language mode
llvm-beanz Sep 10, 2024
6be47f9
Update diagnostics to share string
llvm-beanz Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion clang/include/clang/Basic/DiagnosticGroups.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,8 +1535,10 @@ def PedanticMacros : DiagGroup<"pedantic-macros",
def BranchProtection : DiagGroup<"branch-protection">;

// HLSL diagnostic groups
def HLSL202y : DiagGroup<"hlsl-202y-extensions">;

// Warnings for HLSL Clang extensions
def HLSLExtension : DiagGroup<"hlsl-extensions">;
def HLSLExtension : DiagGroup<"hlsl-extensions", [HLSL202y]>;

// Warning for mix packoffset and non-packoffset.
def HLSLMixPackOffset : DiagGroup<"mix-packoffset">;
Expand Down
2 changes: 2 additions & 0 deletions clang/include/clang/Basic/DiagnosticParseKinds.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,5 +1790,7 @@ def ext_hlsl_access_specifiers : ExtWarn<
InGroup<HLSLExtension>;
def err_hlsl_unsupported_component : Error<"invalid component '%0' used; expected 'x', 'y', 'z', or 'w'">;
def err_hlsl_packoffset_invalid_reg : Error<"invalid resource class specifier '%0' for packoffset, expected 'c'">;
def ext_hlsl_lambda : ExtWarn<"lambdas are a clang HLSL extension">,
InGroup<HLSLExtension>;

} // end of Parser diagnostics
3 changes: 3 additions & 0 deletions clang/include/clang/Basic/DiagnosticSemaKinds.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12397,6 +12397,9 @@ def warn_attr_min_eq_max: Warning<
def err_hlsl_attribute_number_arguments_insufficient_shader_model: Error<
"attribute %0 with %1 arguments requires shader model %2 or greater">;

def ext_hlsl_auto_type_specifier : ExtWarn<
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this warning default to error?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I think we should just allow and warn on using extensions, that matches generally how Clang handles them unless you pass -pedantic-errors which switches all the extension warnings to errors.

"'auto' type specifier is a HLSL 202y extension">, InGroup<HLSL202y>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can't do it because of the different warning groups, but it'd be nice if this could reuse ext_auto_type_specifier since it's basically the same warning. Is that possible?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could share the string, but since we want different warning groups they do need to be different warnings.


// Layout randomization diagnostics.
def err_non_designated_init_used : Error<
"a randomized struct can only be initialized with a designated initializer">;
Expand Down
3 changes: 2 additions & 1 deletion clang/include/clang/Basic/LangOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ class LangOptionsBase {
HLSL_2017 = 2017,
HLSL_2018 = 2018,
HLSL_2021 = 2021,
HLSL_202x = 2029,
HLSL_202x = 2028,
HLSL_202y = 2029,
};

/// Clang versions with different platform ABI conformance.
Expand Down
4 changes: 4 additions & 0 deletions clang/include/clang/Basic/LangStandards.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,10 @@ LANGSTANDARD(hlsl202x, "hlsl202x",
HLSL, "High Level Shader Language 202x",
LineComment | HLSL | CPlusPlus | CPlusPlus11)

LANGSTANDARD(hlsl202y, "hlsl202y",
HLSL, "High Level Shader Language 202y",
LineComment | HLSL | CPlusPlus | CPlusPlus11)


#undef LANGSTANDARD
#undef LANGSTANDARD_ALIAS
Expand Down
2 changes: 1 addition & 1 deletion clang/include/clang/Driver/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8914,7 +8914,7 @@ def dxc_hlsl_version : Option<["/", "-"], "HV", KIND_JOINED_OR_SEPARATE>,
Group<dxc_Group>,
Visibility<[DXCOption]>,
HelpText<"HLSL Version">,
Values<"2016, 2017, 2018, 2021, 202x">;
Values<"2016, 2017, 2018, 2021, 202x, 202y">;
def dxc_validator_path_EQ : Joined<["--"], "dxv-path=">, Group<dxc_Group>,
HelpText<"DXIL validator installation path">;
def dxc_disable_validation : DXCFlag<"Vd">,
Expand Down
2 changes: 2 additions & 0 deletions clang/lib/Basic/LangOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ void LangOptions::setLangDefaults(LangOptions &Opts, Language Lang,
Opts.HLSLVersion = (unsigned)LangOptions::HLSL_2021;
else if (LangStd == LangStandard::lang_hlsl202x)
Opts.HLSLVersion = (unsigned)LangOptions::HLSL_202x;
else if (LangStd == LangStandard::lang_hlsl202y)
Opts.HLSLVersion = (unsigned)LangOptions::HLSL_202y;

// OpenCL has some additional defaults.
if (Opts.OpenCL) {
Expand Down
1 change: 1 addition & 0 deletions clang/lib/Basic/LangStandards.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ LangStandard::Kind LangStandard::getHLSLLangKind(StringRef Name) {
.Case("2018", LangStandard::lang_hlsl2018)
.Case("2021", LangStandard::lang_hlsl2021)
.Case("202x", LangStandard::lang_hlsl202x)
.Case("202y", LangStandard::lang_hlsl202y)
.Default(LangStandard::lang_unspecified);
}

Expand Down
2 changes: 2 additions & 0 deletions clang/lib/Parse/ParseExprCXX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,8 @@ ExprResult Parser::ParseLambdaExpressionAfterIntroducer(
Diag(LambdaBeginLoc, getLangOpts().CPlusPlus11
? diag::warn_cxx98_compat_lambda
: diag::ext_lambda);
if (getLangOpts().HLSL)
Diag(LambdaBeginLoc, diag::ext_hlsl_lambda);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will issue two warnings if someone specifies -Wcxx98-compat (for some reason...). Probably better to check the langopts for both c++11 and HLSL to figure out the right ID and then only call Diag once.


PrettyStackTraceLoc CrashInfo(PP.getSourceManager(), LambdaBeginLoc,
"lambda expression parsing");
Expand Down
4 changes: 4 additions & 0 deletions clang/lib/Sema/DeclSpec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,6 +1419,10 @@ void DeclSpec::Finish(Sema &S, const PrintingPolicy &Policy) {
if (!S.getLangOpts().CPlusPlus11 && !S.getLangOpts().C23 &&
TypeSpecType == TST_auto)
S.Diag(TSTLoc, diag::ext_auto_type_specifier);
if (S.getLangOpts().HLSL &&
S.getLangOpts().getHLSLVersion() < LangOptions::HLSL_202y &&
TypeSpecType == TST_auto)
S.Diag(TSTLoc, diag::ext_hlsl_auto_type_specifier);
if (S.getLangOpts().CPlusPlus && !S.getLangOpts().CPlusPlus11 &&
StorageClassSpec == SCS_auto)
S.Diag(StorageClassSpecLoc, diag::warn_auto_storage_class)
Expand Down
10 changes: 5 additions & 5 deletions clang/test/ParserHLSL/group_shared.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only %s -verify
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -std=hlsl202x -o - -fsyntax-only %s -verify
extern groupshared float f;
extern float groupshared f; // Ok, redeclaration?


// expected-warning@+3 {{lambdas are a C++11 extension}}
// expected-error@+2 {{expected body of lambda expression}}
// expected-warning@+1 {{'auto' type specifier is a C++11 extension}}
auto l = []() groupshared {};
// expected-warning@#gs_lambda {{lambdas are a clang HLSL extension}}
// expected-error@#gs_lambda {{expected body of lambda expression}}
// expected-warning@#gs_lambda {{'auto' type specifier is a HLSL 202y extension}}
auto l = []() groupshared {}; // #gs_lambda

float groupshared [[]] i = 12;

Expand Down
28 changes: 19 additions & 9 deletions clang/test/ParserHLSL/group_shared_202x.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@
extern groupshared float f;
extern float groupshared f; // Ok, redeclaration?

// expected-error@+1 {{return type cannot be qualified with address space}}
auto l = []() -> groupshared void {};
// expected-error@+1 {{expected a type}}
auto l2 = []() -> groupshared {};
// expected-error@#l {{return type cannot be qualified with address space}}
// expected-warning@#l {{lambdas are a clang HLSL extension}}
// expected-warning@#l{{'auto' type specifier is a HLSL 202y extension}}
auto l = []() -> groupshared void {}; // #l
// expected-error@#l2 {{expected a type}}
// expected-warning@#l2 {{lambdas are a clang HLSL extension}}
// expected-warning@#l2{{'auto' type specifier is a HLSL 202y extension}}
auto l2 = []() -> groupshared {}; // #l2

float groupshared [[]] i = 12;

Expand All @@ -17,13 +21,19 @@ void foo() {

extern groupshared float f;
const float cf = f;
// expected-error@+1 {{'auto' return without trailing return type; deduced return types are a C++14 extension}}
auto func() {
// expected-error@#func{{'auto' return without trailing return type; deduced return types are a C++14 extension}}
// expected-warning@#func{{'auto' type specifier is a HLSL 202y extension}}
auto func() { // #func
return f;
}

void other() {
// NOTE: groupshared and const are stripped off thanks to lvalue to rvalue conversions and we deduce float for the return type.
auto l = [&]() { return f; };
auto l2 = [&]() { return cf; };
// NOTE: groupshared and const are stripped off thanks to lvalue to rvalue
// conversions and we deduce float for the return type.
// expected-warning@#local{{lambdas are a clang HLSL extension}}
// expected-warning@#local{{'auto' type specifier is a HLSL 202y extension}}
auto l = [&]() { return f; }; // #local
// expected-warning@#local2{{lambdas are a clang HLSL extension}}
// expected-warning@#local2{{'auto' type specifier is a HLSL 202y extension}}
auto l2 = [&]() { return cf; }; // #local2
}
5 changes: 2 additions & 3 deletions clang/test/ParserHLSL/invalid_inside_cb.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only %s -verify
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -std=hlsl202x -o - -fsyntax-only %s -verify

// template not allowed inside cbuffer.
cbuffer A {
Expand All @@ -15,7 +15,6 @@ cbuffer A {

// typealias not allowed inside cbuffer.
cbuffer A {
// expected-error@+2 {{invalid declaration inside cbuffer}}
// expected-warning@+1 {{alias declarations are a C++11 extension}}
// expected-error@+1 {{invalid declaration inside cbuffer}}
using F32 = float;
}
5 changes: 4 additions & 1 deletion clang/test/Preprocessor/predefined-macros-hlsl.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,7 @@
// STD2021: #define __HLSL_VERSION 2021

// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library %s -E -dM -o - -x hlsl -std=hlsl202x | FileCheck -match-full-lines %s --check-prefixes=STD202x
// STD202x: #define __HLSL_VERSION 2029
// STD202x: #define __HLSL_VERSION 2028

// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library %s -E -dM -o - -x hlsl -std=hlsl202y | FileCheck -match-full-lines %s --check-prefixes=STD202y
// STD202y: #define __HLSL_VERSION 2029
7 changes: 4 additions & 3 deletions clang/test/SemaHLSL/group_shared.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@ groupshared void (*fp)();
// expected-error@+1 {{parameter may not be qualified with an address space}}
void (*fp2)(groupshared float);
// NOTE: HLSL not support trailing return types.
// expected-warning@+2 {{'auto' type specifier is a C++11 extension}}
// expected-error@+1 {{expected function body after function declarator}}
auto func() -> groupshared void;
// expected-warning@#func{{'auto' type specifier is a HLSL 202y extension}}
// expected-warning@#func {{'auto' type specifier is a C++11 extension}}
// expected-error@#func {{expected function body after function declarator}}
auto func() -> groupshared void; // #func
// expected-warning@+2 {{'groupshared' attribute only applies to variables}}
// expected-error@+1 {{return type cannot be qualified with address space}}
void groupshared f();
Expand Down
27 changes: 19 additions & 8 deletions clang/test/SemaHLSL/group_shared_202x.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -std=hlsl202x -o - -fsyntax-only %s -verify
// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -std=hlsl202y -o - -fsyntax-only %s -verify

// expected-error@+1 {{return type cannot be qualified with address space}}
auto func() -> groupshared void;
#if __HLSL_VERSION < 2029
// expected-warning@#func{{'auto' type specifier is a HLSL 202y extension}}
// expected-warning@#func_gs{{'auto' type specifier is a HLSL 202y extension}}
// expected-warning@#l{{'auto' type specifier is a HLSL 202y extension}}
// expected-warning@#l2{{'auto' type specifier is a HLSL 202y extension}}
#endif

// expected-error@+1 {{parameter may not be qualified with an address space}}
auto func(float groupshared) -> void;
// expected-error@#func {{return type cannot be qualified with address space}}
auto func() -> groupshared void; // #func

// expected-error@+1 {{parameter may not be qualified with an address space}}
auto l = [](groupshared float ) {};
// expected-error@#func_gs {{parameter may not be qualified with an address space}}
auto func(float groupshared) -> void; // #func_gs

// expected-error@+1 {{return type cannot be qualified with address space}}
auto l2 = []() -> groupshared void {};

// expected-error@#l {{parameter may not be qualified with an address space}}
// expected-warning@#l {{lambdas are a clang HLSL extension}}
auto l = [](groupshared float ) {}; // #l

// expected-error@#l2 {{return type cannot be qualified with address space}}
// expected-warning@#l2 {{lambdas are a clang HLSL extension}}
auto l2 = []() -> groupshared void {}; // #l2

struct S {
// expected-error@+1 {{return type cannot be qualified with address space}}
Expand Down
Loading