[clang] [HLSL] Make casting functions constexpr (PR #108902)
Chris B via cfe-commits
cfe-commits at lists.llvm.org
Tue Sep 17 07:47:41 PDT 2024
https://github.com/llvm-beanz updated https://github.com/llvm/llvm-project/pull/108902
>From 9deebd707410a6ad8474f615a97c943937ceeb34 Mon Sep 17 00:00:00 2001
From: Chris Bieneman <chris.bieneman at me.com>
Date: Mon, 16 Sep 2024 18:21:38 -0500
Subject: [PATCH 1/3] [HLSL] Make casting functions constexpr
This marks the `bit_cast` helper as `constexpr` and allows the casts
implemented with it to also be `constexpr`. This is largely not a
functional change, but it enables using the casts in expressions that
need to be resolved at compile time as demonstrated with the static
asserts in the new tests.
---
clang/lib/Headers/hlsl/hlsl_detail.h | 10 +++++-----
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 8 ++++----
clang/test/CodeGenHLSL/builtins/asuint.hlsl | 12 ++++++------
clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl | 10 ++++++++++
clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl | 10 ++++++++++
5 files changed, 35 insertions(+), 15 deletions(-)
create mode 100644 clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
create mode 100644 clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl
diff --git a/clang/lib/Headers/hlsl/hlsl_detail.h b/clang/lib/Headers/hlsl/hlsl_detail.h
index 9801d86208159f..40849dcdf187e4 100644
--- a/clang/lib/Headers/hlsl/hlsl_detail.h
+++ b/clang/lib/Headers/hlsl/hlsl_detail.h
@@ -13,23 +13,23 @@ namespace hlsl {
namespace __detail {
-#define _HLSL_INLINE \
- __attribute__((__always_inline__, __nodebug__)) static inline
-
template <bool B, typename T> struct enable_if {};
template <typename T> struct enable_if<true, T> {
using Type = T;
};
+template <bool B, class T = void>
+using enable_if_t = typename enable_if<B, T>::Type;
+
template <typename U, typename T, int N>
-_HLSL_INLINE typename enable_if<sizeof(U) == sizeof(T), vector<U, N> >::Type
+constexpr enable_if_t<sizeof(U) == sizeof(T), vector<U, N> >
bit_cast(vector<T, N> V) {
return __builtin_bit_cast(vector<U, N>, V);
}
template <typename U, typename T>
-_HLSL_INLINE typename enable_if<sizeof(U) == sizeof(T), U>::Type bit_cast(T F) {
+constexpr enable_if_t<sizeof(U) == sizeof(T), U> bit_cast(T F) {
return __builtin_bit_cast(U, F);
}
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index 6a50d50ebd3479..12f58ef0718695 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -370,11 +370,11 @@ bool any(double4);
/// \param Val The input value.
template <typename T, int N>
-_HLSL_INLINE vector<float, N> asfloat(vector<T, N> V) {
+constexpr vector<float, N> asfloat(vector<T, N> V) {
return __detail::bit_cast<float, T, N>(V);
}
-template <typename T> _HLSL_INLINE float asfloat(T F) {
+template <typename T> constexpr float asfloat(T F) {
return __detail::bit_cast<float, T>(F);
}
@@ -415,11 +415,11 @@ float4 asin(float4);
/// \param Val The input value.
template <typename T, int N>
-_HLSL_INLINE vector<uint, N> asuint(vector<T, N> V) {
+constexpr vector<uint, N> asuint(vector<T, N> V) {
return __detail::bit_cast<uint, T, N>(V);
}
-template <typename T> _HLSL_INLINE uint asuint(T F) {
+template <typename T> constexpr uint asuint(T F) {
return __detail::bit_cast<uint, T>(F);
}
diff --git a/clang/test/CodeGenHLSL/builtins/asuint.hlsl b/clang/test/CodeGenHLSL/builtins/asuint.hlsl
index ac3dae26d6caed..252a434ccce0dc 100644
--- a/clang/test/CodeGenHLSL/builtins/asuint.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asuint.hlsl
@@ -1,40 +1,40 @@
// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -emit-llvm -O1 -o - | FileCheck %s
-// CHECK: define {{.*}}test_uint{{.*}}(i32 {{.*}} [[VAL:%.*]]){{.*}}
+// CHECK: define {{.*}}test_uint{{.*}}(i32 {{.*}} [[VAL:%.*]]){{.*}}
// CHECK-NOT: bitcast
// CHECK: ret i32 [[VAL]]
uint test_uint(uint p0) {
return asuint(p0);
}
-// CHECK: define {{.*}}test_int{{.*}}(i32 {{.*}} [[VAL:%.*]]){{.*}}
+// CHECK: define {{.*}}test_int{{.*}}(i32 {{.*}} [[VAL:%.*]]){{.*}}
// CHECK-NOT: bitcast
// CHECK: ret i32 [[VAL]]
uint test_int(int p0) {
return asuint(p0);
}
-// CHECK: define {{.*}}test_float{{.*}}(float {{.*}} [[VAL:%.*]]){{.*}}
+// CHECK: define {{.*}}test_float{{.*}}(float {{.*}} [[VAL:%.*]]){{.*}}
// CHECK: bitcast float [[VAL]] to i32
uint test_float(float p0) {
return asuint(p0);
}
-// CHECK: define {{.*}}test_vector_uint{{.*}}(<4 x i32> {{.*}} [[VAL:%.*]]){{.*}}
+// CHECK: define {{.*}}test_vector_uint{{.*}}(<4 x i32> {{.*}} [[VAL:%.*]]){{.*}}
// CHECK-NOT: bitcast
// CHECK: ret <4 x i32> [[VAL]]
uint4 test_vector_uint(uint4 p0) {
return asuint(p0);
}
-// CHECK: define {{.*}}test_vector_int{{.*}}(<4 x i32> {{.*}} [[VAL:%.*]]){{.*}}
+// CHECK: define {{.*}}test_vector_int{{.*}}(<4 x i32> {{.*}} [[VAL:%.*]]){{.*}}
// CHECK-NOT: bitcast
// CHECK: ret <4 x i32> [[VAL]]
uint4 test_vector_int(int4 p0) {
return asuint(p0);
}
-// CHECK: define {{.*}}test_vector_float{{.*}}(<4 x float> {{.*}} [[VAL:%.*]]){{.*}}
+// CHECK: define {{.*}}test_vector_float{{.*}}(<4 x float> {{.*}} [[VAL:%.*]]){{.*}}
// CHECK: bitcast <4 x float> [[VAL]] to <4 x i32>
uint4 test_vector_float(float4 p0) {
return asuint(p0);
diff --git a/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl b/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
new file mode 100644
index 00000000000000..b2a54d23173e57
--- /dev/null
+++ b/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify
+
+// expected-no-diagnostics
+
+// Because asuint should be constant evaluated, all the static asserts below
+// should work!
+void ConstExprTest() {
+ static_assert(asfloat(0x3f800000) == 1.0f, "One");
+ static_assert(asfloat(0x40000000.xxx).y == 2.0f, "Two");
+}
diff --git a/clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl b/clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl
new file mode 100644
index 00000000000000..be6afda3be6636
--- /dev/null
+++ b/clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl
@@ -0,0 +1,10 @@
+// RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify
+
+// expected-no-diagnostics
+
+// Because asuint should be constant evaluated, all the static asserts below
+// should work!
+void ConstExprTest() {
+ static_assert(asuint(1) == 1u, "One");
+ static_assert(asuint(2.xxx).y == 2u, "Two");
+}
>From 77f97b2afce85b2ddbf78e737cf6fafda67cdf3e Mon Sep 17 00:00:00 2001
From: Chris Bieneman <chris.bieneman at me.com>
Date: Mon, 16 Sep 2024 19:34:32 -0500
Subject: [PATCH 2/3] clang-format
---
clang/lib/Headers/hlsl/hlsl_detail.h | 2 +-
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/clang/lib/Headers/hlsl/hlsl_detail.h b/clang/lib/Headers/hlsl/hlsl_detail.h
index 40849dcdf187e4..8d5fd941331531 100644
--- a/clang/lib/Headers/hlsl/hlsl_detail.h
+++ b/clang/lib/Headers/hlsl/hlsl_detail.h
@@ -23,7 +23,7 @@ template <bool B, class T = void>
using enable_if_t = typename enable_if<B, T>::Type;
template <typename U, typename T, int N>
-constexpr enable_if_t<sizeof(U) == sizeof(T), vector<U, N> >
+constexpr enable_if_t<sizeof(U) == sizeof(T), vector<U, N>>
bit_cast(vector<T, N> V) {
return __builtin_bit_cast(vector<U, N>, V);
}
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index 12f58ef0718695..771356ecc54f91 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -414,8 +414,7 @@ float4 asin(float4);
/// \brief Interprets the bit pattern of x as an unsigned integer.
/// \param Val The input value.
-template <typename T, int N>
-constexpr vector<uint, N> asuint(vector<T, N> V) {
+template <typename T, int N> constexpr vector<uint, N> asuint(vector<T, N> V) {
return __detail::bit_cast<uint, T, N>(V);
}
>From c8894d149537249c6859ec3d2579e0c128302e95 Mon Sep 17 00:00:00 2001
From: Chris B <cbieneman at microsoft.com>
Date: Tue, 17 Sep 2024 09:47:32 -0500
Subject: [PATCH 3/3] Update
clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
Co-authored-by: joaosaffran <126493771+joaosaffran at users.noreply.github.com>
---
clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl b/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
index b2a54d23173e57..fb90d927a9a437 100644
--- a/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
@@ -2,7 +2,7 @@
// expected-no-diagnostics
-// Because asuint should be constant evaluated, all the static asserts below
+// Because asfloat should be constant evaluated, all the static asserts below
// should work!
void ConstExprTest() {
static_assert(asfloat(0x3f800000) == 1.0f, "One");
More information about the cfe-commits
mailing list