Author: Chris Bieneman Date: 2022-09-16T16:04:27-05:00 New Revision: 10378c45055fabe291138a93d79f287586948e91
URL: https://github.com/llvm/llvm-project/commit/10378c45055fabe291138a93d79f287586948e91 DIFF: https://github.com/llvm/llvm-project/commit/10378c45055fabe291138a93d79f287586948e91.diff LOG: [HLSL] Enable availability attribute Some HLSL functionality is gated on the target shader model version. Enabling the use of availability markup allows us to diagnose availability issues easily in the frontend. Reviewed By: erichkeane Differential Revision: https://reviews.llvm.org/D134067 Added: clang/test/SemaHLSL/AvailabilityMarkup.hlsl clang/test/SemaHLSL/WaveBuiltinAvailability.hlsl Modified: clang/include/clang/Basic/Attr.td clang/lib/Basic/Targets/DirectX.h clang/lib/Headers/hlsl/hlsl_intrinsics.h clang/lib/Sema/SemaAvailability.cpp Removed: ################################################################################ diff --git a/clang/include/clang/Basic/Attr.td b/clang/include/clang/Basic/Attr.td index b68f3e6217694..155b87f47194c 100644 --- a/clang/include/clang/Basic/Attr.td +++ b/clang/include/clang/Basic/Attr.td @@ -908,6 +908,7 @@ def Availability : InheritableAttr { .Case("maccatalyst", "macCatalyst") .Case("maccatalyst_app_extension", "macCatalyst (App Extension)") .Case("swift", "Swift") + .Case("shadermodel", "HLSL ShaderModel") .Default(llvm::StringRef()); } static llvm::StringRef getPlatformNameSourceSpelling(llvm::StringRef Platform) { @@ -923,6 +924,7 @@ static llvm::StringRef getPlatformNameSourceSpelling(llvm::StringRef Platform) { .Case("maccatalyst", "macCatalyst") .Case("maccatalyst_app_extension", "macCatalystApplicationExtension") .Case("zos", "z/OS") + .Case("shadermodel", "ShaderModel") .Default(Platform); } static llvm::StringRef canonicalizePlatformName(llvm::StringRef Platform) { @@ -937,6 +939,7 @@ static llvm::StringRef canonicalizePlatformName(llvm::StringRef Platform) { .Case("watchOSApplicationExtension", "watchos_app_extension") .Case("macCatalyst", "maccatalyst") .Case("macCatalystApplicationExtension", "maccatalyst_app_extension") + .Case("ShaderModel", "shadermodel") .Default(Platform); } }]; let HasCustomParsing = 1; diff --git a/clang/lib/Basic/Targets/DirectX.h b/clang/lib/Basic/Targets/DirectX.h index a773090b413f7..785104373e0ad 100644 --- a/clang/lib/Basic/Targets/DirectX.h +++ b/clang/lib/Basic/Targets/DirectX.h @@ -55,6 +55,8 @@ class LLVM_LIBRARY_VISIBILITY DirectXTargetInfo : public TargetInfo { HasLegalHalfType = true; HasFloat16 = true; NoAsmVariants = true; + PlatformMinVersion = Triple.getOSVersion(); + PlatformName = llvm::Triple::getOSTypeName(Triple.getOS()); resetDataLayout("e-m:e-p:32:32-i1:32-i8:8-i16:16-i32:32-i64:64-f16:16-f32:" "32-f64:64-n8:16:32:64"); TheCXXABI.set(TargetCXXABI::Microsoft); diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h b/clang/lib/Headers/hlsl/hlsl_intrinsics.h index f43a6ad4779a9..ab1aa74a4c5de 100644 --- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h +++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h @@ -9,6 +9,7 @@ #ifndef _HLSL_HLSL_INTRINSICS_H_ #define _HLSL_HLSL_INTRINSICS_H_ +__attribute__((availability(shadermodel, introduced = 6.0))) __attribute__((clang_builtin_alias(__builtin_hlsl_wave_active_count_bits))) uint WaveActiveCountBits(bool bBit); diff --git a/clang/lib/Sema/SemaAvailability.cpp b/clang/lib/Sema/SemaAvailability.cpp index bf4a226668f73..9ba434945e96f 100644 --- a/clang/lib/Sema/SemaAvailability.cpp +++ b/clang/lib/Sema/SemaAvailability.cpp @@ -192,6 +192,9 @@ shouldDiagnoseAvailabilityByDefault(const ASTContext &Context, case llvm::Triple::MacOSX: ForceAvailabilityFromVersion = VersionTuple(/*Major=*/10, /*Minor=*/13); break; + case llvm::Triple::ShaderModel: + // Always enable availability diagnostics for shader models. + return true; default: // New targets should always warn about availability. return Triple.getVendor() == llvm::Triple::Apple; diff --git a/clang/test/SemaHLSL/AvailabilityMarkup.hlsl b/clang/test/SemaHLSL/AvailabilityMarkup.hlsl new file mode 100644 index 0000000000000..b883957af0871 --- /dev/null +++ b/clang/test/SemaHLSL/AvailabilityMarkup.hlsl @@ -0,0 +1,25 @@ +// RUN: %clang_cc1 -triple dxil-pc-shadermodel5.0-library -verify %s + +__attribute__((availability(shadermodel, introduced = 6.0))) +unsigned fn6_0(); // #fn6_0 + +__attribute__((availability(shadermodel, introduced = 5.1))) +unsigned fn5_1(); // #fn5_1 + +__attribute__((availability(shadermodel, introduced = 5.0))) +unsigned fn5_0(); + +void fn() { + // expected-warning@#fn6_0_site {{'fn6_0' is only available on HLSL ShaderModel 6.0 or newer}} + // expected-note@#fn6_0 {{'fn6_0' has been marked as being introduced in HLSL ShaderModel 6.0 here, but the deployment target is HLSL ShaderModel 5.0}} + // expected-note@#fn6_0_site {{enclose 'fn6_0' in a __builtin_available check to silence this warning}} + unsigned A = fn6_0(); // #fn6_0_site + + // expected-warning@#fn5_1_site {{'fn5_1' is only available on HLSL ShaderModel 5.1 or newer}} + // expected-note@#fn5_1 {{'fn5_1' has been marked as being introduced in HLSL ShaderModel 5.1 here, but the deployment target is HLSL ShaderModel 5.0}} + // expected-note@#fn5_1_site {{enclose 'fn5_1' in a __builtin_available check to silence this warning}} + unsigned B = fn5_1(); // #fn5_1_site + + unsigned C = fn5_0(); +} + diff --git a/clang/test/SemaHLSL/WaveBuiltinAvailability.hlsl b/clang/test/SemaHLSL/WaveBuiltinAvailability.hlsl new file mode 100644 index 0000000000000..0851b90eb9765 --- /dev/null +++ b/clang/test/SemaHLSL/WaveBuiltinAvailability.hlsl @@ -0,0 +1,9 @@ +// RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel5.0-library -verify %s +// WaveActiveCountBits is unavailable before ShaderModel 6.0. + +unsigned foo(bool b) { + // expected-warning@#site {{'WaveActiveCountBits' is only available on HLSL ShaderModel 6.0 or newer}} + // expected-note@hlsl/hlsl_intrinsics.h:* {{'WaveActiveCountBits' has been marked as being introduced in HLSL ShaderModel 6.0 here, but the deployment target is HLSL ShaderModel 5.0}} + // expected-note@#site {{enclose 'WaveActiveCountBits' in a __builtin_available check to silence this warning}} + return WaveActiveCountBits(b); // #site +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
