https://github.com/metkarpoonam updated
https://github.com/llvm/llvm-project/pull/131900
>From 1e34c5428964733f4ae0e924d373b9fda780f370 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Tue, 18 Mar 2025 11:30:15 -0700
Subject: [PATCH 01/18] Add codegen tests, Sema tests, SPIR-V backend test
case, and apply clang formatting
---
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 18 ++++++
clang/test/CodeGenHLSL/builtins/asint16.hlsl | 48 ++++++++++++++++
.../SemaHLSL/BuiltIns/asint16-errors.hlsl | 29 ++++++++++
.../CodeGen/SPIRV/hlsl-intrinsics/asint16.ll | 55 +++++++++++++++++++
4 files changed, 150 insertions(+)
create mode 100644 clang/test/CodeGenHLSL/builtins/asint16.hlsl
create mode 100644 clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
create mode 100644 llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index a48a8e998a015..e0366693deae0 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -80,6 +80,24 @@ void asuint(double3, out uint3, out uint3);
_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_splitdouble)
void asuint(double4, out uint4, out uint4);
+//===----------------------------------------------------------------------===//
+// asint16 builtins
+//===----------------------------------------------------------------------===//
+
+/// \fn int16_t asint16(T Val)
+/// \brief Interprets the bit pattern of x as an 16-bit integer.
+/// \param Val The input value.
+#ifdef __HLSL_ENABLE_16_BIT
+
+template <typename T, int N> constexpr vector<int16_t, N> asint16(vector<T, N>
V) {
+ return __detail::bit_cast<int16_t, T, N>(V);
+}
+
+template <typename T> constexpr int16_t asint16(T F) {
+ return __detail::bit_cast<int16_t, T>(F);
+}
+#endif
+
//===----------------------------------------------------------------------===//
// distance builtins
//===----------------------------------------------------------------------===//
diff --git a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
new file mode 100644
index 0000000000000..0cd6ee63fa078
--- /dev/null
+++ b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
@@ -0,0 +1,48 @@
+// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple
dxil-pc-shadermodel6.2-library %s -fnative-half-type -emit-llvm -O1 -o - |
FileCheck %s
+// CHECK: define {{.*}}test_ints{{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
+// CHECK-NOT: bitcast
+// CHECK: ret i16 [[VAL]]
+int16_t test_int(int16_t p0)
+{
+ return asint16(p0);
+}
+
+//CHECK: define {{.*}}test_uint{{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK-NOT: bitcast
+//CHECK: ret i16 [[VAL]]
+int16_t test_uint(uint16_t p0)
+{
+ return asint16(p0);
+}
+
+//CHECK: define {{.*}}test_half{{.*}}(half {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK: [[RES:%.*]] = bitcast half [[VAL]] to i16
+//CHECK : ret i16 [[RES]]
+int16_t test_half(half p0)
+{
+ return asint16(p0);
+}
+
+//CHECK: define {{.*}}test_vector_int{{.*}}(<4 x i16> {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK-NOT: bitcast
+//CHECK: ret <4 x i16> [[VAL]]
+int16_t4 test_vector_int(int16_t4 p0)
+{
+ return asint16(p0);
+}
+
+//CHECK: define {{.*}}test_vector_uint{{.*}}(<4 x i16> {{.*}}
[[VAL:%.*]]){{.*}}
+//CHECK-NOT: bitcast
+//CHECK: ret <4 x i16> [[VAL]]
+int16_t4 test_vector_uint(uint16_t4 p0)
+{
+ return asint16(p0);
+}
+
+//CHECK: define {{.*}}fn{{.*}}(<4 x half> {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK: [[RES:%.*]] = bitcast <4 x half> [[VAL]] to <4 x i16>
+//CHECK: ret <4 x i16> [[RES]]
+int16_t4 fn(half4 p1)
+{
+ return asint16(p1);
+}
\ No newline at end of file
diff --git a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
new file mode 100644
index 0000000000000..03a3e46bd1d46
--- /dev/null
+++ b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
@@ -0,0 +1,29 @@
+// RUN: %clang_cc1 -finclude-default-header -triple
dxil-pc-shadermodel6.2-library %s -fnative-half-type -verify
+
+
+int16_t4 test_asint_too_many_arg(uint16_t p0, uint16_t p1)
+{
+ return asint16(p0, p1);
+ // expected-error@-1 {{no matching function for call to 'asint16'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not
viable: requires single argument 'V', but 2 arguments were provided}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not
viable: requires single argument 'F', but 2 arguments were provided}}
+}
+
+
+int16_t test_asint_int(int p1)
+{
+ return asint16(p1);
+ // expected-error@hlsl/hlsl_intrinsics.h:* {{no matching function for call
to 'bit_cast'}}
+ // expected-note@-2 {{in instantiation of function template specialization
'hlsl::asint16<int>'}}
+ // expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored: could
not match 'vector<int, N>' against 'int'}}
+ // expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored:
substitution failure [with U = int16_t, T = int]: no type named 'Type'}}
+}
+
+int16_t test_asint_float(float p1)
+{
+ return asint16(p1);
+ // expected-error@hlsl/hlsl_intrinsics.h:* {{no matching function for call
to 'bit_cast'}}
+ // expected-note@-2 {{in instantiation of function template specialization
'hlsl::asint16<float>'}}
+ // expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored: could
not match 'vector<float, N>' against 'float'}}
+ // expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored:
substitution failure [with U = int16_t, T = float]: no type named 'Type'}}
+}
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
b/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
new file mode 100644
index 0000000000000..4c3c4337bc62a
--- /dev/null
+++ b/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
@@ -0,0 +1,55 @@
+; RUN: llc -O0 -verify-machineinstrs -mtriple=spirv-unknown-unknown %s -o - |
FileCheck %s
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o -
-filetype=obj | spirv-val %}
+
+; CHECK: OpCapability Int16
+; CHECK: OpCapability Float16
+; CHECK-DAG: %[[#int_16:]] = OpTypeInt 16 0
+; CHECK-DAG: %[[#float_16:]] = OpTypeFloat 16
+; CHECK-DAG: %[[#vec4_int_16:]] = OpTypeVector %[[#int_16]] 4
+; CHECK-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#float_16]] 4
+
+
+define i16 @test_int16(i16 returned %p0) {
+entry:
+ ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#int_16]]
+ ; CHECK: OpReturnValue %[[#arg0]]
+ ret i16 %p0
+}
+
+define i16 @test_half(half nofpclass(nan inf) %p0) {
+entry:
+ ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#float_16:]]
+ ; CHECK: %[[#]] = OpBitcast %[[#int_16]] %[[#arg0]]
+ %0 = bitcast half %p0 to i16
+ ;CHECK: OpReturnValue %[[#]]
+ ret i16 %0
+
+}
+
+; Function Attrs: alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none)
+define <4 x i16> @test_vector_int4(<4 x i16> returned %p0) {
+entry:
+ ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_int_16]]
+ ; CHECK: OpReturnValue %[[#arg0]]
+ ret <4 x i16> %p0
+}
+
+; Function Attrs: alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none)
+define <4 x i16> @test_vector_half4(<4 x half> nofpclass(nan inf) %p1) {
+entry:
+ ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_float_16]]
+ ; CHECK: %[[#]] = OpBitcast %[[#vec4_int_16]] %[[#arg0]]
+ %0 = bitcast <4 x half> %p1 to <4 x i16>
+ ;CHECK: OpReturnValue %[[#]]
+ ret <4 x i16> %0
+}
+
+attributes #0 = { alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none) "approx-func-fp-math"="true" "no-infs-fp-math"="true"
"no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true"
"no-trapping-math"="true" "stack-protector-buffer-size"="8" }
+
+!llvm.module.flags = !{!0}
+!dx.valver = !{!1}
+!llvm.ident = !{!2}
+
+!0 = !{i32 1, !"wchar_size", i32 4}
+!1 = !{i32 1, i32 8}
+!2 = !{!"clang version 21.0.0git (https://github.com/llvm/llvm-project.git
5929de8c7731748bf58ad9b1fedfed75e7aae455)"}
\ No newline at end of file
>From 08342e96dda4c1fa15ea08911483556e8f0bbdda Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Tue, 18 Mar 2025 13:09:17 -0700
Subject: [PATCH 02/18] Apply clang formatting and address review comments
---
clang/test/CodeGenHLSL/builtins/asint16.hlsl | 2 +-
clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl | 2 +-
llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
index 0cd6ee63fa078..7c06451eb3ea8 100644
--- a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
@@ -45,4 +45,4 @@ int16_t4 test_vector_uint(uint16_t4 p0)
int16_t4 fn(half4 p1)
{
return asint16(p1);
-}
\ No newline at end of file
+}
diff --git a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
index 03a3e46bd1d46..044c48274b7d9 100644
--- a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
@@ -26,4 +26,4 @@ int16_t test_asint_float(float p1)
// expected-note@-2 {{in instantiation of function template specialization
'hlsl::asint16<float>'}}
// expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored: could
not match 'vector<float, N>' against 'float'}}
// expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored:
substitution failure [with U = int16_t, T = float]: no type named 'Type'}}
-}
\ No newline at end of file
+}
diff --git a/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
b/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
index 4c3c4337bc62a..c64507cba82ca 100644
--- a/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
+++ b/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
@@ -52,4 +52,4 @@ attributes #0 = { alwaysinline mustprogress nofree norecurse
nosync nounwind wil
!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{i32 1, i32 8}
-!2 = !{!"clang version 21.0.0git (https://github.com/llvm/llvm-project.git
5929de8c7731748bf58ad9b1fedfed75e7aae455)"}
\ No newline at end of file
+!2 = !{!"clang version 21.0.0git (https://github.com/llvm/llvm-project.git
5929de8c7731748bf58ad9b1fedfed75e7aae455)"}
>From 2d38c1e88baa6dc6f8ee9cfc817a8d191f3a1a90 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Tue, 18 Mar 2025 13:18:35 -0700
Subject: [PATCH 03/18] Apply clang format to hlsl_intrinsics.h
---
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index e0366693deae0..e1074eebd465c 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -89,7 +89,8 @@ void asuint(double4, out uint4, out uint4);
/// \param Val The input value.
#ifdef __HLSL_ENABLE_16_BIT
-template <typename T, int N> constexpr vector<int16_t, N> asint16(vector<T, N>
V) {
+template <typename T, int N>
+constexpr vector<int16_t, N> asint16(vector<T, N> V) {
return __detail::bit_cast<int16_t, T, N>(V);
}
>From 6d40ffc3274cae936f6d2400f550f9f192613b38 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Wed, 19 Mar 2025 17:21:38 -0700
Subject: [PATCH 04/18] Apply clang-format on hlsl_intrinsic.h
---
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index e1074eebd465c..d4321aa4e0d30 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -90,11 +90,20 @@ void asuint(double4, out uint4, out uint4);
#ifdef __HLSL_ENABLE_16_BIT
template <typename T, int N>
-constexpr vector<int16_t, N> asint16(vector<T, N> V) {
+constexpr __detail::enable_if_t<__detail::is_same<int16_t, T>::value ||
+ __detail::is_same<uint16_t, T>::value ||
+ __detail::is_same<half, T>::value,
+ vector<int16_t, N>>
+asint16(vector < T, N > V) {
return __detail::bit_cast<int16_t, T, N>(V);
}
-template <typename T> constexpr int16_t asint16(T F) {
+template <typename T>
+constexpr __detail::enable_if_t<__detail::is_same<int16_t, T>::value ||
+ __detail::is_same<uint16_t, T>::value ||
+ __detail::is_same<half, T>::value,
+ int16_t>
+asint16(T F) {
return __detail::bit_cast<int16_t, T>(F);
}
#endif
>From 7efe2f0c7ce9d10ed93e05f34e9ba699cbbff311 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Wed, 19 Mar 2025 17:40:53 -0700
Subject: [PATCH 05/18] Modify asint16-error and added vector test cases to
bitcast.ll
---
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 2 +-
clang/test/CodeGenHLSL/builtins/asint16.hlsl | 1 +
.../SemaHLSL/BuiltIns/asint16-errors.hlsl | 35 +++++++++++++------
llvm/test/CodeGen/SPIRV/bitcast.ll | 19 ++++++++++
4 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index d4321aa4e0d30..07371358ec7a3 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -94,7 +94,7 @@ constexpr __detail::enable_if_t<__detail::is_same<int16_t,
T>::value ||
__detail::is_same<uint16_t, T>::value ||
__detail::is_same<half, T>::value,
vector<int16_t, N>>
-asint16(vector < T, N > V) {
+asint16(vector<T, N> V) {
return __detail::bit_cast<int16_t, T, N>(V);
}
diff --git a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
index 7c06451eb3ea8..c52c4f56e2353 100644
--- a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
@@ -1,4 +1,5 @@
// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple
dxil-pc-shadermodel6.2-library %s -fnative-half-type -emit-llvm -O1 -o - |
FileCheck %s
+
// CHECK: define {{.*}}test_ints{{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
// CHECK-NOT: bitcast
// CHECK: ret i16 [[VAL]]
diff --git a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
index 044c48274b7d9..a33168457de16 100644
--- a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
@@ -1,7 +1,7 @@
// RUN: %clang_cc1 -finclude-default-header -triple
dxil-pc-shadermodel6.2-library %s -fnative-half-type -verify
-int16_t4 test_asint_too_many_arg(uint16_t p0, uint16_t p1)
+int16_t4 test_asint16_too_many_arg(uint16_t p0, uint16_t p1)
{
return asint16(p0, p1);
// expected-error@-1 {{no matching function for call to 'asint16'}}
@@ -9,21 +9,34 @@ int16_t4 test_asint_too_many_arg(uint16_t p0, uint16_t p1)
// expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not
viable: requires single argument 'F', but 2 arguments were provided}}
}
+int16_t test_asint16_int(int p1)
+{
+ return asint16(p1);
+ // expected-error@-1 {{no matching function for call to 'asint16'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
could not match 'vector<T, N>' against 'int'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = int]: no type named 'Type'}}
+}
-int16_t test_asint_int(int p1)
+int16_t test_asint16_float(float p1)
{
return asint16(p1);
- // expected-error@hlsl/hlsl_intrinsics.h:* {{no matching function for call
to 'bit_cast'}}
- // expected-note@-2 {{in instantiation of function template specialization
'hlsl::asint16<int>'}}
- // expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored: could
not match 'vector<int, N>' against 'int'}}
- // expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored:
substitution failure [with U = int16_t, T = int]: no type named 'Type'}}
+ // expected-error@-1 {{no matching function for call to 'asint16'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
could not match 'vector<T, N>' against 'float'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = float]: no type named 'Type'}}
}
-int16_t test_asint_float(float p1)
+int16_t4 test_asint16_vector_int(int4 p1)
{
return asint16(p1);
- // expected-error@hlsl/hlsl_intrinsics.h:* {{no matching function for call
to 'bit_cast'}}
- // expected-note@-2 {{in instantiation of function template specialization
'hlsl::asint16<float>'}}
- // expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored: could
not match 'vector<float, N>' against 'float'}}
- // expected-note@hlsl/hlsl_detail.h:* {{candidate template ignored:
substitution failure [with U = int16_t, T = float]: no type named 'Type'}}
+ // expected-error@-1 {{no matching function for call to 'asint16'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = int, N = 4]: no type named 'Type'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = int4]: no type named 'Type'}}
}
+
+int16_t4 test_asint16_vector_float(float4 p1)
+{
+ return asint16(p1);
+ // expected-error@-1 {{no matching function for call to 'asint16'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = float, N = 4]: no type named 'Type'}}
+ // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = float4]: no type named 'Type'}}
+}
\ No newline at end of file
diff --git a/llvm/test/CodeGen/SPIRV/bitcast.ll
b/llvm/test/CodeGen/SPIRV/bitcast.ll
index d6c985dbadcc4..c4f7f2ad8ec37 100644
--- a/llvm/test/CodeGen/SPIRV/bitcast.ll
+++ b/llvm/test/CodeGen/SPIRV/bitcast.ll
@@ -4,6 +4,8 @@
; CHECK-SPIRV-DAG: %[[#TyInt32:]] = OpTypeInt 32 0
; CHECK-SPIRV-DAG: %[[#TyInt16:]] = OpTypeInt 16 0
; CHECK-SPIRV-DAG: %[[#TyHalf:]] = OpTypeFloat 16
+; CHECK-SPIRV-DAG: %[[#vec4_int_16:]] = OpTypeVector %[[#int_16]] 4
+; CHECK-SPIRV-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#float_16]] 4
; CHECK-SPIRV-DAG: %[[#Arg32:]] = OpFunctionParameter %[[#TyInt32]]
; CHECK-SPIRV-DAG: %[[#Arg16:]] = OpUConvert %[[#TyInt16]] %[[#Arg32]]
; CHECK-SPIRV-DAG: %[[#ValHalf:]] = OpBitcast %[[#TyHalf]] %[[#Arg16:]]
@@ -19,3 +21,20 @@ entry:
%res = bitcast half %val2 to i16
ret i16 %res
}
+
+define <4 x i16> @test_vector_int4(<4 x i16> returned %p0) {
+entry:
+ ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_int_16]]
+ ; CHECK: OpReturnValue %[[#arg0]]
+ ret <4 x i16> %p0
+}
+
+; Function Attrs: alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none)
+define <4 x i16> @test_vector_half4(<4 x half> nofpclass(nan inf) %p1) {
+entry:
+ ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_float_16]]
+ ; CHECK: %[[#]] = OpBitcast %[[#vec4_int_16]] %[[#arg0]]
+ %0 = bitcast <4 x half> %p1 to <4 x i16>
+ ;CHECK: OpReturnValue %[[#]]
+ ret <4 x i16> %0
+}
>From 9501cd1eff918c1f5a23aa5cc0bc17366b62829f Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Wed, 19 Mar 2025 17:52:32 -0700
Subject: [PATCH 06/18] Remove asint16.ll
---
.../CodeGen/SPIRV/hlsl-intrinsics/asint16.ll | 55 -------------------
1 file changed, 55 deletions(-)
delete mode 100644 llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
diff --git a/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
b/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
deleted file mode 100644
index c64507cba82ca..0000000000000
--- a/llvm/test/CodeGen/SPIRV/hlsl-intrinsics/asint16.ll
+++ /dev/null
@@ -1,55 +0,0 @@
-; RUN: llc -O0 -verify-machineinstrs -mtriple=spirv-unknown-unknown %s -o - |
FileCheck %s
-; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o -
-filetype=obj | spirv-val %}
-
-; CHECK: OpCapability Int16
-; CHECK: OpCapability Float16
-; CHECK-DAG: %[[#int_16:]] = OpTypeInt 16 0
-; CHECK-DAG: %[[#float_16:]] = OpTypeFloat 16
-; CHECK-DAG: %[[#vec4_int_16:]] = OpTypeVector %[[#int_16]] 4
-; CHECK-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#float_16]] 4
-
-
-define i16 @test_int16(i16 returned %p0) {
-entry:
- ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#int_16]]
- ; CHECK: OpReturnValue %[[#arg0]]
- ret i16 %p0
-}
-
-define i16 @test_half(half nofpclass(nan inf) %p0) {
-entry:
- ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#float_16:]]
- ; CHECK: %[[#]] = OpBitcast %[[#int_16]] %[[#arg0]]
- %0 = bitcast half %p0 to i16
- ;CHECK: OpReturnValue %[[#]]
- ret i16 %0
-
-}
-
-; Function Attrs: alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none)
-define <4 x i16> @test_vector_int4(<4 x i16> returned %p0) {
-entry:
- ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_int_16]]
- ; CHECK: OpReturnValue %[[#arg0]]
- ret <4 x i16> %p0
-}
-
-; Function Attrs: alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none)
-define <4 x i16> @test_vector_half4(<4 x half> nofpclass(nan inf) %p1) {
-entry:
- ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_float_16]]
- ; CHECK: %[[#]] = OpBitcast %[[#vec4_int_16]] %[[#arg0]]
- %0 = bitcast <4 x half> %p1 to <4 x i16>
- ;CHECK: OpReturnValue %[[#]]
- ret <4 x i16> %0
-}
-
-attributes #0 = { alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none) "approx-func-fp-math"="true" "no-infs-fp-math"="true"
"no-nans-fp-math"="true" "no-signed-zeros-fp-math"="true"
"no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-
-!llvm.module.flags = !{!0}
-!dx.valver = !{!1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 1, i32 8}
-!2 = !{!"clang version 21.0.0git (https://github.com/llvm/llvm-project.git
5929de8c7731748bf58ad9b1fedfed75e7aae455)"}
>From 17e6db73b238b3c33ede8a32025d56121d9f6bcc Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Wed, 19 Mar 2025 17:59:10 -0700
Subject: [PATCH 07/18] Remove vector int16 test case
---
llvm/test/CodeGen/SPIRV/bitcast.ll | 8 --------
1 file changed, 8 deletions(-)
diff --git a/llvm/test/CodeGen/SPIRV/bitcast.ll
b/llvm/test/CodeGen/SPIRV/bitcast.ll
index c4f7f2ad8ec37..439ec8fdd1cd0 100644
--- a/llvm/test/CodeGen/SPIRV/bitcast.ll
+++ b/llvm/test/CodeGen/SPIRV/bitcast.ll
@@ -4,7 +4,6 @@
; CHECK-SPIRV-DAG: %[[#TyInt32:]] = OpTypeInt 32 0
; CHECK-SPIRV-DAG: %[[#TyInt16:]] = OpTypeInt 16 0
; CHECK-SPIRV-DAG: %[[#TyHalf:]] = OpTypeFloat 16
-; CHECK-SPIRV-DAG: %[[#vec4_int_16:]] = OpTypeVector %[[#int_16]] 4
; CHECK-SPIRV-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#float_16]] 4
; CHECK-SPIRV-DAG: %[[#Arg32:]] = OpFunctionParameter %[[#TyInt32]]
; CHECK-SPIRV-DAG: %[[#Arg16:]] = OpUConvert %[[#TyInt16]] %[[#Arg32]]
@@ -22,13 +21,6 @@ entry:
ret i16 %res
}
-define <4 x i16> @test_vector_int4(<4 x i16> returned %p0) {
-entry:
- ; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_int_16]]
- ; CHECK: OpReturnValue %[[#arg0]]
- ret <4 x i16> %p0
-}
-
; Function Attrs: alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none)
define <4 x i16> @test_vector_half4(<4 x half> nofpclass(nan inf) %p1) {
entry:
>From 999943ed1a716239e73ad7031b73bd5218fa75c9 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Wed, 19 Mar 2025 18:42:25 -0700
Subject: [PATCH 08/18] Address review comment and fixed bitcast.ll test cases
failure
---
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 6 +++---
llvm/test/CodeGen/SPIRV/bitcast.ll | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index 07371358ec7a3..4bdfa242c970f 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -84,9 +84,9 @@ void asuint(double4, out uint4, out uint4);
// asint16 builtins
//===----------------------------------------------------------------------===//
-/// \fn int16_t asint16(T Val)
-/// \brief Interprets the bit pattern of x as an 16-bit integer.
-/// \param Val The input value.
+/// \fn int16_t asint16(T X)
+/// \brief Interprets the bit pattern of \a X as an 16-bit integer.
+/// \param X The input value.
#ifdef __HLSL_ENABLE_16_BIT
template <typename T, int N>
diff --git a/llvm/test/CodeGen/SPIRV/bitcast.ll
b/llvm/test/CodeGen/SPIRV/bitcast.ll
index 439ec8fdd1cd0..f7318919df779 100644
--- a/llvm/test/CodeGen/SPIRV/bitcast.ll
+++ b/llvm/test/CodeGen/SPIRV/bitcast.ll
@@ -4,7 +4,7 @@
; CHECK-SPIRV-DAG: %[[#TyInt32:]] = OpTypeInt 32 0
; CHECK-SPIRV-DAG: %[[#TyInt16:]] = OpTypeInt 16 0
; CHECK-SPIRV-DAG: %[[#TyHalf:]] = OpTypeFloat 16
-; CHECK-SPIRV-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#float_16]] 4
+; CHECK-SPIRV-DAG: %[[#vec4_float_16:]] = OpTypeVector %[[#TyHalf]] 4
; CHECK-SPIRV-DAG: %[[#Arg32:]] = OpFunctionParameter %[[#TyInt32]]
; CHECK-SPIRV-DAG: %[[#Arg16:]] = OpUConvert %[[#TyInt16]] %[[#Arg32]]
; CHECK-SPIRV-DAG: %[[#ValHalf:]] = OpBitcast %[[#TyHalf]] %[[#Arg16:]]
>From 16e48c119251a8758bb23e4264aad81d29551409 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Wed, 19 Mar 2025 18:58:32 -0700
Subject: [PATCH 09/18] Address review comment
---
llvm/test/CodeGen/SPIRV/bitcast.ll | 1 -
1 file changed, 1 deletion(-)
diff --git a/llvm/test/CodeGen/SPIRV/bitcast.ll
b/llvm/test/CodeGen/SPIRV/bitcast.ll
index f7318919df779..6b20974b02b7d 100644
--- a/llvm/test/CodeGen/SPIRV/bitcast.ll
+++ b/llvm/test/CodeGen/SPIRV/bitcast.ll
@@ -21,7 +21,6 @@ entry:
ret i16 %res
}
-; Function Attrs: alwaysinline mustprogress nofree norecurse nosync nounwind
willreturn memory(none)
define <4 x i16> @test_vector_half4(<4 x half> nofpclass(nan inf) %p1) {
entry:
; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_float_16]]
>From a908b64f7e939417218e8576632c7c0226c68b02 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Wed, 19 Mar 2025 19:04:25 -0700
Subject: [PATCH 10/18] Add missing result name of opBitcast
---
llvm/test/CodeGen/SPIRV/bitcast.ll | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/llvm/test/CodeGen/SPIRV/bitcast.ll
b/llvm/test/CodeGen/SPIRV/bitcast.ll
index 6b20974b02b7d..e50cad61ef5ad 100644
--- a/llvm/test/CodeGen/SPIRV/bitcast.ll
+++ b/llvm/test/CodeGen/SPIRV/bitcast.ll
@@ -24,8 +24,8 @@ entry:
define <4 x i16> @test_vector_half4(<4 x half> nofpclass(nan inf) %p1) {
entry:
; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_float_16]]
- ; CHECK: %[[#]] = OpBitcast %[[#vec4_int_16]] %[[#arg0]]
+ ; CHECK: %[[#Res1:]] = OpBitcast %[[#vec4_int_16]] %[[#arg0]]
%0 = bitcast <4 x half> %p1 to <4 x i16>
- ;CHECK: OpReturnValue %[[#]]
+ ;CHECK: OpReturnValue %[[#Res1]]
ret <4 x i16> %0
}
>From 9352d4b9e03eaee89b2721ccd4778929b6e5c986 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Thu, 20 Mar 2025 10:06:46 -0700
Subject: [PATCH 11/18] Add new line to asint16-errors.hlsl
---
clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
index a33168457de16..75096720bc39a 100644
--- a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
@@ -39,4 +39,4 @@ int16_t4 test_asint16_vector_float(float4 p1)
// expected-error@-1 {{no matching function for call to 'asint16'}}
// expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = float, N = 4]: no type named 'Type'}}
// expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = float4]: no type named 'Type'}}
-}
\ No newline at end of file
+}
>From c52c19a5e9afea8d66a8a9f19ba88d08630c7b29 Mon Sep 17 00:00:00 2001
From: metkarpoonam <poonammet...@microsoft.com>
Date: Thu, 20 Mar 2025 10:57:44 -0700
Subject: [PATCH 12/18] Update llvm/test/CodeGen/SPIRV/bitcast.ll
Co-authored-by: Ashley Coleman <ascole...@microsoft.com>
---
llvm/test/CodeGen/SPIRV/bitcast.ll | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/test/CodeGen/SPIRV/bitcast.ll
b/llvm/test/CodeGen/SPIRV/bitcast.ll
index e50cad61ef5ad..2688bdfe562a8 100644
--- a/llvm/test/CodeGen/SPIRV/bitcast.ll
+++ b/llvm/test/CodeGen/SPIRV/bitcast.ll
@@ -26,6 +26,6 @@ entry:
; CHECK: %[[#arg0:]] = OpFunctionParameter %[[#vec4_float_16]]
; CHECK: %[[#Res1:]] = OpBitcast %[[#vec4_int_16]] %[[#arg0]]
%0 = bitcast <4 x half> %p1 to <4 x i16>
- ;CHECK: OpReturnValue %[[#Res1]]
+ ; CHECK: OpReturnValue %[[#Res1]]
ret <4 x i16> %0
}
>From fdb40eac5e8059e5b7d1b85afa4d8c3641a58c0e Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Thu, 20 Mar 2025 14:52:23 -0700
Subject: [PATCH 13/18] Address review comments
---
clang/test/CodeGenHLSL/builtins/asint16.hlsl | 27 ++++++++++++--------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
index c52c4f56e2353..aa07f98caa93f 100644
--- a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple
dxil-pc-shadermodel6.2-library %s -fnative-half-type -emit-llvm -O1 -o - |
FileCheck %s
-// CHECK: define {{.*}}test_ints{{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
+// CHECK-LABEL: define {{.*}}test_ints{{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
// CHECK-NOT: bitcast
// CHECK: ret i16 [[VAL]]
int16_t test_int(int16_t p0)
@@ -8,41 +8,46 @@ int16_t test_int(int16_t p0)
return asint16(p0);
}
-//CHECK: define {{.*}}test_uint{{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK-LABEL: define {{.*}}test_uint
+//CHECK-SAME: {{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
//CHECK-NOT: bitcast
-//CHECK: ret i16 [[VAL]]
+//CHECK-NEXT: ret i16 [[VAL]]
int16_t test_uint(uint16_t p0)
{
return asint16(p0);
}
-//CHECK: define {{.*}}test_half{{.*}}(half {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK-LABEL: define {{.*}}test_half
+//CHECK-SAME: {{.*}}(half {{.*}} [[VAL:%.*]]){{.*}}
//CHECK: [[RES:%.*]] = bitcast half [[VAL]] to i16
-//CHECK : ret i16 [[RES]]
+//CHECK-NEXT : ret i16 [[RES]]
int16_t test_half(half p0)
{
return asint16(p0);
}
-//CHECK: define {{.*}}test_vector_int{{.*}}(<4 x i16> {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK-LABEL: define {{.*}}test_vector_int
+//CHECK-SAME: {{.*}}(<4 x i16> {{.*}} [[VAL:%.*]]){{.*}}
//CHECK-NOT: bitcast
-//CHECK: ret <4 x i16> [[VAL]]
+//CHECK-NEXT: ret <4 x i16> [[VAL]]
int16_t4 test_vector_int(int16_t4 p0)
{
return asint16(p0);
}
-//CHECK: define {{.*}}test_vector_uint{{.*}}(<4 x i16> {{.*}}
[[VAL:%.*]]){{.*}}
+//CHECK-LABEL: define {{.*}}test_vector_uint
+//CHECK-SAME: {{.*}}(<4 x i16> {{.*}} [[VAL:%.*]]){{.*}}
//CHECK-NOT: bitcast
-//CHECK: ret <4 x i16> [[VAL]]
+//CHECK-NEXT: ret <4 x i16> [[VAL]]
int16_t4 test_vector_uint(uint16_t4 p0)
{
return asint16(p0);
}
-//CHECK: define {{.*}}fn{{.*}}(<4 x half> {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK-LABEL: define {{.*}}fn
+//CHECK-SAME: {{.*}}(<4 x half> {{.*}} [[VAL:%.*]]){{.*}}
//CHECK: [[RES:%.*]] = bitcast <4 x half> [[VAL]] to <4 x i16>
-//CHECK: ret <4 x i16> [[RES]]
+//CHECK-NEXT: ret <4 x i16> [[RES]]
int16_t4 fn(half4 p1)
{
return asint16(p1);
>From e49c5fbc584cce0660fbe0dccc88e5d6bd8f9301 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Thu, 20 Mar 2025 14:58:50 -0700
Subject: [PATCH 14/18] Small change
---
clang/test/CodeGenHLSL/builtins/asint16.hlsl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
index aa07f98caa93f..6e96cae12bc32 100644
--- a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
@@ -2,7 +2,7 @@
// CHECK-LABEL: define {{.*}}test_ints{{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
// CHECK-NOT: bitcast
-// CHECK: ret i16 [[VAL]]
+// CHECK-NEXT: ret i16 [[VAL]]
int16_t test_int(int16_t p0)
{
return asint16(p0);
>From f8f20b8994524e9ba823fa5750e41e1fd80e531a Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Thu, 20 Mar 2025 17:10:28 -0700
Subject: [PATCH 15/18] Fix codegen test failure
---
clang/test/CodeGenHLSL/builtins/asint16.hlsl | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
index 6e96cae12bc32..e716fb5314fa3 100644
--- a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
@@ -1,8 +1,10 @@
// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple
dxil-pc-shadermodel6.2-library %s -fnative-half-type -emit-llvm -O1 -o - |
FileCheck %s
-// CHECK-LABEL: define {{.*}}test_ints{{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
-// CHECK-NOT: bitcast
-// CHECK-NEXT: ret i16 [[VAL]]
+//CHECK-LABEL: define {{.*}}test_ints
+//CHECK-SAME: {{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
+//CHECK-NOT: bitcast
+//CHECK: entry:
+//CHECK-NEXT: ret i16 [[VAL]]
int16_t test_int(int16_t p0)
{
return asint16(p0);
@@ -10,7 +12,8 @@ int16_t test_int(int16_t p0)
//CHECK-LABEL: define {{.*}}test_uint
//CHECK-SAME: {{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
-//CHECK-NOT: bitcast
+//CHECK-NOT:bitcast
+//CHECK: entry:
//CHECK-NEXT: ret i16 [[VAL]]
int16_t test_uint(uint16_t p0)
{
@@ -29,6 +32,7 @@ int16_t test_half(half p0)
//CHECK-LABEL: define {{.*}}test_vector_int
//CHECK-SAME: {{.*}}(<4 x i16> {{.*}} [[VAL:%.*]]){{.*}}
//CHECK-NOT: bitcast
+//CHECK: entry:
//CHECK-NEXT: ret <4 x i16> [[VAL]]
int16_t4 test_vector_int(int16_t4 p0)
{
@@ -38,6 +42,7 @@ int16_t4 test_vector_int(int16_t4 p0)
//CHECK-LABEL: define {{.*}}test_vector_uint
//CHECK-SAME: {{.*}}(<4 x i16> {{.*}} [[VAL:%.*]]){{.*}}
//CHECK-NOT: bitcast
+//CHECK-NEXT: entry:
//CHECK-NEXT: ret <4 x i16> [[VAL]]
int16_t4 test_vector_uint(uint16_t4 p0)
{
>From d0dfbe16d2091efbce5275181c9c83ccedfe78bf Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Thu, 20 Mar 2025 21:38:37 -0700
Subject: [PATCH 16/18] Add Shadermodel 6.2 macro to hlsl_intrinsics.h
---
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 8 ++++----
clang/test/CodeGenHLSL/builtins/asint16.hlsl | 1 +
clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index 4bdfa242c970f..dcd386a27f1c6 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -90,20 +90,20 @@ void asuint(double4, out uint4, out uint4);
#ifdef __HLSL_ENABLE_16_BIT
template <typename T, int N>
+_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2)
constexpr __detail::enable_if_t<__detail::is_same<int16_t, T>::value ||
__detail::is_same<uint16_t, T>::value ||
__detail::is_same<half, T>::value,
- vector<int16_t, N>>
-asint16(vector<T, N> V) {
+ vector<int16_t, N>> asint16(vector<T, N> V) {
return __detail::bit_cast<int16_t, T, N>(V);
}
template <typename T>
+_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2)
constexpr __detail::enable_if_t<__detail::is_same<int16_t, T>::value ||
__detail::is_same<uint16_t, T>::value ||
__detail::is_same<half, T>::value,
- int16_t>
-asint16(T F) {
+ int16_t> asint16(T F) {
return __detail::bit_cast<int16_t, T>(F);
}
#endif
diff --git a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
index e716fb5314fa3..1d35125bfb8cc 100644
--- a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
@@ -57,3 +57,4 @@ int16_t4 fn(half4 p1)
{
return asint16(p1);
}
+
diff --git a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
index 75096720bc39a..e78560cf09083 100644
--- a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
@@ -40,3 +40,4 @@ int16_t4 test_asint16_vector_float(float4 p1)
// expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = float, N = 4]: no type named 'Type'}}
// expected-note@hlsl/hlsl_intrinsics.h:* {{candidate template ignored:
substitution failure [with T = float4]: no type named 'Type'}}
}
+
>From b578c42e1a830a01825d8fed5e72049877e40f15 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Fri, 21 Mar 2025 12:27:46 -0700
Subject: [PATCH 17/18] Apply clang format on hlsl_intrinsics.h
---
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index 65107804bddd3..106c963279e92 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -87,7 +87,7 @@ void asuint(double4, out uint4, out uint4);
/// \fn int16_t asint16(T X)
/// \brief Interprets the bit pattern of \a X as an 16-bit integer.
/// \param X The input value.
-
+
#ifdef __HLSL_ENABLE_16_BIT
template <typename T, int N>
@@ -108,6 +108,7 @@ constexpr __detail::enable_if_t<__detail::is_same<int16_t,
T>::value ||
return __detail::bit_cast<int16_t, T>(F);
}
#endif
+
//===----------------------------------------------------------------------===//
// asuint16 builtins
//===----------------------------------------------------------------------===//
@@ -115,6 +116,7 @@ constexpr __detail::enable_if_t<__detail::is_same<int16_t,
T>::value ||
/// \fn uint16_t asuint16(T X)
/// \brief Interprets the bit pattern of \a X as an 16-bit unsigned integer.
/// \param X The input value.
+
#ifdef __HLSL_ENABLE_16_BIT
template <typename T, int N>
>From 9aefe01cbf3c26c592fd3d2720c0cb1fcc299587 Mon Sep 17 00:00:00 2001
From: Poonam Vilas Metkar <poonammet...@microsoft.com>
Date: Fri, 21 Mar 2025 12:39:23 -0700
Subject: [PATCH 18/18] Rearrange asint16 function in hlsl_intrinsics.h to
maintain alphabetical order
---
clang/lib/Headers/hlsl/hlsl_intrinsics.h | 58 ++++++++++++------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
index 106c963279e92..2a9cf554b7420 100644
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -46,6 +46,35 @@ template <typename T> constexpr int asint(T F) {
return __detail::bit_cast<int, T>(F);
}
+//===----------------------------------------------------------------------===//
+// asint16 builtins
+//===----------------------------------------------------------------------===//
+
+/// \fn int16_t asint16(T X)
+/// \brief Interprets the bit pattern of \a X as an 16-bit integer.
+/// \param X The input value.
+
+#ifdef __HLSL_ENABLE_16_BIT
+
+template <typename T, int N>
+_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2)
+constexpr __detail::enable_if_t<__detail::is_same<int16_t, T>::value ||
+ __detail::is_same<uint16_t, T>::value ||
+ __detail::is_same<half, T>::value,
+ vector<int16_t, N>> asint16(vector<T, N> V) {
+ return __detail::bit_cast<int16_t, T, N>(V);
+}
+
+template <typename T>
+_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2)
+constexpr __detail::enable_if_t<__detail::is_same<int16_t, T>::value ||
+ __detail::is_same<uint16_t, T>::value ||
+ __detail::is_same<half, T>::value,
+ int16_t> asint16(T F) {
+ return __detail::bit_cast<int16_t, T>(F);
+}
+#endif
+
//===----------------------------------------------------------------------===//
// asuint builtins
//===----------------------------------------------------------------------===//
@@ -80,35 +109,6 @@ void asuint(double3, out uint3, out uint3);
_HLSL_BUILTIN_ALIAS(__builtin_hlsl_elementwise_splitdouble)
void asuint(double4, out uint4, out uint4);
-//===----------------------------------------------------------------------===//
-// asint16 builtins
-//===----------------------------------------------------------------------===//
-
-/// \fn int16_t asint16(T X)
-/// \brief Interprets the bit pattern of \a X as an 16-bit integer.
-/// \param X The input value.
-
-#ifdef __HLSL_ENABLE_16_BIT
-
-template <typename T, int N>
-_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2)
-constexpr __detail::enable_if_t<__detail::is_same<int16_t, T>::value ||
- __detail::is_same<uint16_t, T>::value ||
- __detail::is_same<half, T>::value,
- vector<int16_t, N>> asint16(vector<T, N> V) {
- return __detail::bit_cast<int16_t, T, N>(V);
-}
-
-template <typename T>
-_HLSL_16BIT_AVAILABILITY(shadermodel, 6.2)
-constexpr __detail::enable_if_t<__detail::is_same<int16_t, T>::value ||
- __detail::is_same<uint16_t, T>::value ||
- __detail::is_same<half, T>::value,
- int16_t> asint16(T F) {
- return __detail::bit_cast<int16_t, T>(F);
-}
-#endif
-
//===----------------------------------------------------------------------===//
// asuint16 builtins
//===----------------------------------------------------------------------===//
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
