beanz updated this revision to Diff 460869.
beanz added a comment.
Updating based on feedback from @erichkeane. Thank you for the fast feedback!
- Moved ShaderModel check into a switch case.
- Added additional self-contained test case with more variations.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D134067/new/
https://reviews.llvm.org/D134067
Files:
clang/include/clang/Basic/Attr.td
clang/lib/Basic/Targets/DirectX.h
clang/lib/Headers/hlsl/hlsl_intrinsics.h
clang/lib/Sema/SemaAvailability.cpp
clang/test/SemaHLSL/AvailabilityMarkup.hlsl
clang/test/SemaHLSL/WaveBuiltinAvailability.hlsl
Index: clang/test/SemaHLSL/WaveBuiltinAvailability.hlsl
===================================================================
--- /dev/null
+++ clang/test/SemaHLSL/WaveBuiltinAvailability.hlsl
@@ -0,0 +1,10 @@
+// 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@+2 {{'WaveActiveCountBits' is only available on HLSL ShaderModel 6.0 or newer}}
+ // expected-note@+1 {{enclose 'WaveActiveCountBits' in a __builtin_available check to silence this warning}}
+ return WaveActiveCountBits(b);
+}
+
+// expected-note@* {{'WaveActiveCountBits' has been marked as being introduced in HLSL ShaderModel 6.0 here, but the deployment target is HLSL ShaderModel 5.0}}
Index: clang/test/SemaHLSL/AvailabilityMarkup.hlsl
===================================================================
--- /dev/null
+++ clang/test/SemaHLSL/AvailabilityMarkup.hlsl
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel5.0-library -verify %s
+
+// expected-note@+2 {{'fn6_0' has been marked as being introduced in HLSL ShaderModel 6.0 here, but the deployment target is HLSL ShaderModel 5.0}}
+__attribute__((availability(shadermodel, introduced = 6.0)))
+unsigned fn6_0();
+
+// expected-note@+2 {{'fn5_1' has been marked as being introduced in HLSL ShaderModel 5.1 here, but the deployment target is HLSL ShaderModel 5.0}}
+__attribute__((availability(shadermodel, introduced = 5.1)))
+unsigned fn5_1();
+
+__attribute__((availability(shadermodel, introduced = 5.0)))
+unsigned fn5_0();
+
+void fn() {
+ // expected-warning@+2 {{'fn6_0' is only available on HLSL ShaderModel 6.0 or newer}}
+ // expected-note@+1 {{enclose 'fn6_0' in a __builtin_available check to silence this warning}}
+ unsigned A = fn6_0();
+
+ // expected-warning@+2 {{'fn5_1' is only available on HLSL ShaderModel 5.1 or newer}}
+ // expected-note@+1 {{enclose 'fn5_1' in a __builtin_available check to silence this warning}}
+ unsigned B = fn5_1();
+
+ unsigned C = fn5_0();
+}
+
Index: clang/lib/Sema/SemaAvailability.cpp
===================================================================
--- clang/lib/Sema/SemaAvailability.cpp
+++ clang/lib/Sema/SemaAvailability.cpp
@@ -192,6 +192,9 @@
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;
Index: clang/lib/Headers/hlsl/hlsl_intrinsics.h
===================================================================
--- clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ 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);
Index: clang/lib/Basic/Targets/DirectX.h
===================================================================
--- clang/lib/Basic/Targets/DirectX.h
+++ clang/lib/Basic/Targets/DirectX.h
@@ -55,6 +55,8 @@
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);
Index: clang/include/clang/Basic/Attr.td
===================================================================
--- clang/include/clang/Basic/Attr.td
+++ clang/include/clang/Basic/Attr.td
@@ -908,6 +908,7 @@
.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 @@
.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 @@
.Case("watchOSApplicationExtension", "watchos_app_extension")
.Case("macCatalyst", "maccatalyst")
.Case("macCatalystApplicationExtension", "maccatalyst_app_extension")
+ .Case("ShaderModel", "shadermodel")
.Default(Platform);
} }];
let HasCustomParsing = 1;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
