-
Notifications
You must be signed in to change notification settings - Fork 14.3k
[HLSL] Reapply Move length support out of the DirectX Backend (#121611) #122337
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.
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
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,115 @@ | ||
| // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ | ||
| // RUN: dxil-pc-shadermodel6.3-library %s -fnative-half-type \ | ||
| // RUN: -emit-llvm -disable-llvm-passes -o - | FileCheck %s \ | ||
| // RUN: --check-prefixes=CHECK,NATIVE_HALF | ||
| // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \ | ||
| // RUN: dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \ | ||
| // RUN: -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF | ||
|
|
||
| // NATIVE_HALF: define noundef nofpclass(nan inf) half @ | ||
| // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.fabs.f16(half | ||
| // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.fabs.f32(float | ||
| // NATIVE_HALF: ret half | ||
| // NO_HALF: ret float | ||
| half test_length_half(half p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
| // NATIVE_HALF: define noundef nofpclass(nan inf) half @ | ||
| // NATIVE_HALF: %hlsl.length = call reassoc nnan ninf nsz arcp afn half @llvm.dx.length.v2f16 | ||
| // NO_HALF: %hlsl.length = call reassoc nnan ninf nsz arcp afn float @llvm.dx.length.v2f32( | ||
| // NATIVE_HALF: ret half %hlsl.length | ||
| // NO_HALF: ret float %hlsl.length | ||
| half test_length_half2(half2 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
| // NATIVE_HALF: define noundef nofpclass(nan inf) half @ | ||
| // NATIVE_HALF: %hlsl.length = call reassoc nnan ninf nsz arcp afn half @llvm.dx.length.v3f16 | ||
| // NO_HALF: %hlsl.length = call reassoc nnan ninf nsz arcp afn float @llvm.dx.length.v3f32( | ||
| // NATIVE_HALF: ret half %hlsl.length | ||
| // NO_HALF: ret float %hlsl.length | ||
| half test_length_half3(half3 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
| // NATIVE_HALF: define noundef nofpclass(nan inf) half @ | ||
| // NATIVE_HALF: %hlsl.length = call reassoc nnan ninf nsz arcp afn half @llvm.dx.length.v4f16 | ||
| // NO_HALF: %hlsl.length = call reassoc nnan ninf nsz arcp afn float @llvm.dx.length.v4f32( | ||
| // NATIVE_HALF: ret half %hlsl.length | ||
| // NO_HALF: ret float %hlsl.length | ||
| half test_length_half4(half4 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
|
|
||
| // CHECK: define noundef nofpclass(nan inf) float @ | ||
| // CHECK: call reassoc nnan ninf nsz arcp afn float @llvm.fabs.f32(float | ||
| // CHECK: ret float | ||
| float test_length_float(float p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
| // CHECK: define noundef nofpclass(nan inf) float @ | ||
| // CHECK: %hlsl.length = call reassoc nnan ninf nsz arcp afn float @llvm.dx.length.v2f32( | ||
| // CHECK: ret float %hlsl.length | ||
| float test_length_float2(float2 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
| // CHECK: define noundef nofpclass(nan inf) float @ | ||
| // CHECK: %hlsl.length = call reassoc nnan ninf nsz arcp afn float @llvm.dx.length.v3f32( | ||
| // CHECK: ret float %hlsl.length | ||
| float test_length_float3(float3 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
| // CHECK: define noundef nofpclass(nan inf) float @ | ||
| // CHECK: %hlsl.length = call reassoc nnan ninf nsz arcp afn float @llvm.dx.length.v4f32( | ||
| // CHECK: ret float %hlsl.length | ||
| float test_length_float4(float4 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
| // RUN: %clang_cc1 -finclude-default-header -triple \ | ||
| // RUN: dxil-pc-shadermodel6.3-library %s -fnative-half-type \ | ||
| // RUN: -emit-llvm -O1 -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK \ | ||
| // RUN: -DTARGET=dx | ||
|
|
||
| // RUN: %clang_cc1 -finclude-default-header -triple \ | ||
| // RUN: spirv-unknown-vulkan-compute %s -fnative-half-type \ | ||
| // RUN: -emit-llvm -O1 -o - | FileCheck %s --check-prefixes=CHECK,SPVCHECK \ | ||
| // RUN: -DTARGET=spv | ||
|
|
||
|
|
||
| // SPVCHECK-LABEL: define spir_func noundef nofpclass(nan inf) half @_Z16test_length_halfDh( | ||
| // DXCHECK-LABEL: define noundef nofpclass(nan inf) half @_Z16test_length_halfDh( | ||
| // CHECK-SAME: half noundef nofpclass(nan inf) [[P0:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] { | ||
| // CHECK-NEXT: [[ENTRY:.*:]] | ||
| // CHECK-NEXT: [[ELT_ABS_I:%.*]] = tail call reassoc nnan ninf nsz arcp afn noundef half @llvm.fabs.f16(half [[P0]]) | ||
| // CHECK-NEXT: ret half [[ELT_ABS_I]] | ||
| // | ||
|
|
||
| half test_length_half(half p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
|
|
||
| // SPVCHECK-LABEL: define spir_func noundef nofpclass(nan inf) half @_Z17test_length_half2Dv2_Dh( | ||
| // DXCHECK-LABEL: define noundef nofpclass(nan inf) half @_Z17test_length_half2Dv2_Dh( | ||
| // CHECK-SAME: <2 x half> noundef nofpclass(nan inf) [[P0:%.*]]) local_unnamed_addr #[[ATTR0]] { | ||
| // CHECK-NEXT: [[ENTRY:.*:]] | ||
| // CHECK-NEXT: [[HLSL_DOT_I:%.*]] = tail call reassoc nnan ninf nsz arcp afn half @llvm.[[TARGET]].fdot.v2f16(<2 x half> [[P0]], <2 x half> [[P0]]) | ||
| // CHECK-NEXT: [[TMP0:%.*]] = tail call reassoc nnan ninf nsz arcp afn noundef half @llvm.sqrt.f16(half [[HLSL_DOT_I]]) | ||
| // CHECK-NEXT: ret half [[TMP0]] | ||
| // | ||
|
|
||
|
|
||
| half test_length_half2(half2 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
|
|
||
| // SPVCHECK-LABEL: define spir_func noundef nofpclass(nan inf) half @_Z17test_length_half3Dv3_Dh( | ||
| // DXCHECK-LABEL: define noundef nofpclass(nan inf) half @_Z17test_length_half3Dv3_Dh( | ||
| // CHECK-SAME: <3 x half> noundef nofpclass(nan inf) [[P0:%.*]]) local_unnamed_addr #[[ATTR0]] { | ||
| // CHECK-NEXT: [[ENTRY:.*:]] | ||
| // CHECK-NEXT: [[HLSL_DOT_I:%.*]] = tail call reassoc nnan ninf nsz arcp afn half @llvm.[[TARGET]].fdot.v3f16(<3 x half> [[P0]], <3 x half> [[P0]]) | ||
| // CHECK-NEXT: [[TMP0:%.*]] = tail call reassoc nnan ninf nsz arcp afn noundef half @llvm.sqrt.f16(half [[HLSL_DOT_I]]) | ||
| // CHECK-NEXT: ret half [[TMP0]] | ||
| // | ||
| half test_length_half3(half3 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
|
|
||
| // SPVCHECK-LABEL: define spir_func noundef nofpclass(nan inf) half @_Z17test_length_half4Dv4_Dh( | ||
| // DXCHECK-LABEL: define noundef nofpclass(nan inf) half @_Z17test_length_half4Dv4_Dh( | ||
| // CHECK-SAME: <4 x half> noundef nofpclass(nan inf) [[P0:%.*]]) local_unnamed_addr #[[ATTR0]] { | ||
| // CHECK-NEXT: [[ENTRY:.*:]] | ||
| // CHECK-NEXT: [[HLSL_DOT_I:%.*]] = tail call reassoc nnan ninf nsz arcp afn half @llvm.[[TARGET]].fdot.v4f16(<4 x half> [[P0]], <4 x half> [[P0]]) | ||
| // CHECK-NEXT: [[TMP0:%.*]] = tail call reassoc nnan ninf nsz arcp afn noundef half @llvm.sqrt.f16(half [[HLSL_DOT_I]]) | ||
| // CHECK-NEXT: ret half [[TMP0]] | ||
| // | ||
| half test_length_half4(half4 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
|
|
||
| // SPVCHECK-LABEL: define spir_func noundef nofpclass(nan inf) float @_Z17test_length_floatf( | ||
| // DXCHECK-LABEL: define noundef nofpclass(nan inf) float @_Z17test_length_floatf( | ||
| // CHECK-SAME: float noundef nofpclass(nan inf) [[P0:%.*]]) local_unnamed_addr #[[ATTR0]] { | ||
| // CHECK-NEXT: [[ENTRY:.*:]] | ||
| // CHECK-NEXT: [[ELT_ABS_I:%.*]] = tail call reassoc nnan ninf nsz arcp afn noundef float @llvm.fabs.f32(float [[P0]]) | ||
| // CHECK-NEXT: ret float [[ELT_ABS_I]] | ||
| // | ||
| float test_length_float(float p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
|
|
||
| // SPVCHECK-LABEL: define spir_func noundef nofpclass(nan inf) float @_Z18test_length_float2Dv2_f( | ||
| // DXCHECK-LABEL: define noundef nofpclass(nan inf) float @_Z18test_length_float2Dv2_f( | ||
| // CHECK-SAME: <2 x float> noundef nofpclass(nan inf) [[P0:%.*]]) local_unnamed_addr #[[ATTR0]] { | ||
| // CHECK-NEXT: [[ENTRY:.*:]] | ||
| // CHECK-NEXT: [[HLSL_DOT_I:%.*]] = tail call reassoc nnan ninf nsz arcp afn float @llvm.[[TARGET]].fdot.v2f32(<2 x float> [[P0]], <2 x float> [[P0]]) | ||
| // CHECK-NEXT: [[TMP0:%.*]] = tail call reassoc nnan ninf nsz arcp afn noundef float @llvm.sqrt.f32(float [[HLSL_DOT_I]]) | ||
| // CHECK-NEXT: ret float [[TMP0]] | ||
| // | ||
| float test_length_float2(float2 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
|
|
||
| // SPVCHECK-LABEL: define spir_func noundef nofpclass(nan inf) float @_Z18test_length_float3Dv3_f( | ||
| // DXCHECK-LABEL: define noundef nofpclass(nan inf) float @_Z18test_length_float3Dv3_f( | ||
| // CHECK-SAME: <3 x float> noundef nofpclass(nan inf) [[P0:%.*]]) local_unnamed_addr #[[ATTR0]] { | ||
| // CHECK-NEXT: [[ENTRY:.*:]] | ||
| // CHECK-NEXT: [[HLSL_DOT_I:%.*]] = tail call reassoc nnan ninf nsz arcp afn float @llvm.[[TARGET]].fdot.v3f32(<3 x float> [[P0]], <3 x float> [[P0]]) | ||
| // CHECK-NEXT: [[TMP0:%.*]] = tail call reassoc nnan ninf nsz arcp afn noundef float @llvm.sqrt.f32(float [[HLSL_DOT_I]]) | ||
| // CHECK-NEXT: ret float [[TMP0]] | ||
| // | ||
| float test_length_float3(float3 p0) | ||
| { | ||
| return length(p0); | ||
| } | ||
|
|
||
| // SPVCHECK-LABEL: define spir_func noundef nofpclass(nan inf) float @_Z18test_length_float4Dv4_f( | ||
| // DXCHECK-LABEL: define noundef nofpclass(nan inf) float @_Z18test_length_float4Dv4_f( | ||
| // CHECK-SAME: <4 x float> noundef nofpclass(nan inf) [[P0:%.*]]) local_unnamed_addr #[[ATTR0]] { | ||
| // CHECK-NEXT: [[ENTRY:.*:]] | ||
| // CHECK-NEXT: [[HLSL_DOT_I:%.*]] = tail call reassoc nnan ninf nsz arcp afn float @llvm.[[TARGET]].fdot.v4f32(<4 x float> [[P0]], <4 x float> [[P0]]) | ||
| // CHECK-NEXT: [[TMP0:%.*]] = tail call reassoc nnan ninf nsz arcp afn noundef float @llvm.sqrt.f32(float [[HLSL_DOT_I]]) | ||
| // CHECK-NEXT: ret float [[TMP0]] | ||
| // | ||
| float test_length_float4(float4 p0) | ||
| { | ||
| return length(p0); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,53 @@ | ||
| // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -disable-llvm-passes -verify -verify-ignore-unexpected | ||
|
|
||
| // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -emit-llvm-only -disable-llvm-passes -verify | ||
|
|
||
| void test_too_few_arg() | ||
| { | ||
| return __builtin_hlsl_length(); | ||
| // expected-error@-1 {{too few arguments to function call, expected 1, have 0}} | ||
| return length(); | ||
| // expected-error@-1 {{no matching function for call to 'length'}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function not viable: requires single argument 'X', but no arguments were provided}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function not viable: requires single argument 'X', but no arguments were provided}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires single argument 'X', but no arguments were provided}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires single argument 'X', but no arguments were provided}} | ||
| } | ||
|
|
||
| void test_too_many_arg(float2 p0) | ||
| { | ||
| return __builtin_hlsl_length(p0, p0); | ||
| // expected-error@-1 {{too many arguments to function call, expected 1, have 2}} | ||
| return length(p0, p0); | ||
| // expected-error@-1 {{no matching function for call to 'length'}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function not viable: requires single argument 'X', but 2 arguments were provided}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires single argument 'X', but 2 arguments were provided}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function not viable: requires single argument 'X', but 2 arguments were provided}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function template not viable: requires single argument 'X', but 2 arguments were provided}} | ||
| } | ||
|
|
||
| float double_to_float_type(double p0) { | ||
| return length(p0); | ||
| // expected-error@-1 {{call to 'length' is ambiguous}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function}} | ||
| } | ||
|
|
||
| bool builtin_bool_to_float_type_promotion(bool p1) | ||
|
|
||
| float bool_to_float_type_promotion(bool p1) | ||
| { | ||
| return __builtin_hlsl_length(p1); | ||
| // expected-error@-1 {passing 'bool' to parameter of incompatible type 'float'}} | ||
| return length(p1); | ||
| // expected-error@-1 {{call to 'length' is ambiguous}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function}} | ||
| } | ||
|
|
||
| bool builtin_length_int_to_float_promotion(int p1) | ||
| float length_int_to_float_promotion(int p1) | ||
| { | ||
| return __builtin_hlsl_length(p1); | ||
| // expected-error@-1 {{passing 'int' to parameter of incompatible type 'float'}} | ||
| return length(p1); | ||
| // expected-error@-1 {{call to 'length' is ambiguous}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function}} | ||
| } | ||
|
|
||
| bool2 builtin_length_int2_to_float2_promotion(int2 p1) | ||
| float2 length_int2_to_float2_promotion(int2 p1) | ||
| { | ||
| return __builtin_hlsl_length(p1); | ||
| // expected-error@-1 {{passing 'int2' (aka 'vector<int, 2>') to parameter of incompatible type '__attribute__((__vector_size__(2 * sizeof(float)))) float' (vector of 2 'float' values)}} | ||
| return length(p1); | ||
| // expected-error@-1 {{call to 'length' is ambiguous}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function}} | ||
| // expected-note@hlsl/hlsl_intrinsics.h:* {{candidate function}} | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need
_HLSL_AVAILABILITY(shadermodel, 6.2)on the none half variants?