-
Notifications
You must be signed in to change notification settings - Fork 13.5k
[HLSL] implementation of lerp intrinsic #83077
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
2 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -emit-llvm -disable-llvm-passes -o - | FileCheck %s | ||
|
|
||
|
|
||
|
|
||
| // CHECK-LABEL: builtin_lerp_half_scalar | ||
| // CHECK: %3 = fsub double %conv1, %conv | ||
| // CHECK: %4 = fmul double %conv2, %3 | ||
| // CHECK: %dx.lerp = fadd double %conv, %4 | ||
| // CHECK: %conv3 = fptrunc double %dx.lerp to half | ||
| // CHECK: ret half %conv3 | ||
| half builtin_lerp_half_scalar (half p0) { | ||
| return __builtin_hlsl_lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // CHECK-LABEL: builtin_lerp_float_scalar | ||
| // CHECK: %3 = fsub double %conv1, %conv | ||
| // CHECK: %4 = fmul double %conv2, %3 | ||
| // CHECK: %dx.lerp = fadd double %conv, %4 | ||
| // CHECK: %conv3 = fptrunc double %dx.lerp to float | ||
| // CHECK: ret float %conv3 | ||
| float builtin_lerp_float_scalar ( float p0) { | ||
| return __builtin_hlsl_lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // CHECK-LABEL: builtin_lerp_half_vector | ||
| // CHECK: %dx.lerp = call <3 x half> @llvm.dx.lerp.v3f16(<3 x half> %0, <3 x half> %1, <3 x half> %2) | ||
| // CHECK: ret <3 x half> %dx.lerp | ||
| half3 builtin_lerp_half_vector (half3 p0) { | ||
| return __builtin_hlsl_lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // CHECK-LABEL: builtin_lerp_floar_vector | ||
| // CHECK: %dx.lerp = call <2 x float> @llvm.dx.lerp.v2f32(<2 x float> %0, <2 x float> %1, <2 x float> %2) | ||
| // CHECK: ret <2 x float> %dx.lerp | ||
| float2 builtin_lerp_floar_vector ( float2 p0) { | ||
| return __builtin_hlsl_lerp ( p0, p0, 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 |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| // 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: %3 = fsub half %1, %0 | ||
| // NATIVE_HALF: %4 = fmul half %2, %3 | ||
| // NATIVE_HALF: %dx.lerp = fadd half %0, %4 | ||
| // NATIVE_HALF: ret half %dx.lerp | ||
| // NO_HALF: %3 = fsub float %1, %0 | ||
| // NO_HALF: %4 = fmul float %2, %3 | ||
| // NO_HALF: %dx.lerp = fadd float %0, %4 | ||
| // NO_HALF: ret float %dx.lerp | ||
| half test_lerp_half ( half p0) { | ||
| return lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // NATIVE_HALF: %dx.lerp = call <2 x half> @llvm.dx.lerp.v2f16(<2 x half> %0, <2 x half> %1, <2 x half> %2) | ||
| // NATIVE_HALF: ret <2 x half> %dx.lerp | ||
| // NO_HALF: %dx.lerp = call <2 x float> @llvm.dx.lerp.v2f32(<2 x float> %0, <2 x float> %1, <2 x float> %2) | ||
| // NO_HALF: ret <2 x float> %dx.lerp | ||
| half2 test_lerp_half2 ( half2 p0, half2 p1 ) { | ||
| return lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // NATIVE_HALF: %dx.lerp = call <3 x half> @llvm.dx.lerp.v3f16(<3 x half> %0, <3 x half> %1, <3 x half> %2) | ||
| // NATIVE_HALF: ret <3 x half> %dx.lerp | ||
| // NO_HALF: %dx.lerp = call <3 x float> @llvm.dx.lerp.v3f32(<3 x float> %0, <3 x float> %1, <3 x float> %2) | ||
| // NO_HALF: ret <3 x float> %dx.lerp | ||
| half3 test_lerp_half3 ( half3 p0, half3 p1 ) { | ||
| return lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // NATIVE_HALF: %dx.lerp = call <4 x half> @llvm.dx.lerp.v4f16(<4 x half> %0, <4 x half> %1, <4 x half> %2) | ||
| // NATIVE_HALF: ret <4 x half> %dx.lerp | ||
| // NO_HALF: %dx.lerp = call <4 x float> @llvm.dx.lerp.v4f32(<4 x float> %0, <4 x float> %1, <4 x float> %2) | ||
| // NO_HALF: ret <4 x float> %dx.lerp | ||
| half4 test_lerp_half4 ( half4 p0, half4 p1 ) { | ||
| return lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // CHECK: %3 = fsub float %1, %0 | ||
| // CHECK: %4 = fmul float %2, %3 | ||
| // CHECK: %dx.lerp = fadd float %0, %4 | ||
| // CHECK: ret float %dx.lerp | ||
| float test_lerp_float ( float p0, float p1 ) { | ||
| return lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // CHECK: %dx.lerp = call <2 x float> @llvm.dx.lerp.v2f32(<2 x float> %0, <2 x float> %1, <2 x float> %2) | ||
| // CHECK: ret <2 x float> %dx.lerp | ||
| float2 test_lerp_float2 ( float2 p0, float2 p1 ) { | ||
| return lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // CHECK: %dx.lerp = call <3 x float> @llvm.dx.lerp.v3f32(<3 x float> %0, <3 x float> %1, <3 x float> %2) | ||
| // CHECK: ret <3 x float> %dx.lerp | ||
| float3 test_lerp_float3 ( float3 p0, float3 p1 ) { | ||
| return lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // CHECK: %dx.lerp = call <4 x float> @llvm.dx.lerp.v4f32(<4 x float> %0, <4 x float> %1, <4 x float> %2) | ||
| // CHECK: ret <4 x float> %dx.lerp | ||
| float4 test_lerp_float4 ( float4 p0, float4 p1) { | ||
| return lerp ( p0, p0, p0 ); | ||
| } | ||
|
|
||
| // CHECK: %dx.lerp = call <2 x float> @llvm.dx.lerp.v2f32(<2 x float> %splat.splat, <2 x float> %1, <2 x float> %2) | ||
| // CHECK: ret <2 x float> %dx.lerp | ||
| float2 test_lerp_float2_splat ( float p0, float2 p1 ) { | ||
| return lerp( p0, p1, p1 ); | ||
| } | ||
|
|
||
| // CHECK: %dx.lerp = call <3 x float> @llvm.dx.lerp.v3f32(<3 x float> %splat.splat, <3 x float> %1, <3 x float> %2) | ||
| // CHECK: ret <3 x float> %dx.lerp | ||
| float3 test_lerp_float3_splat ( float p0, float3 p1 ) { | ||
| return lerp( p0, p1, p1 ); | ||
| } | ||
|
|
||
| // CHECK: %dx.lerp = call <4 x float> @llvm.dx.lerp.v4f32(<4 x float> %splat.splat, <4 x float> %1, <4 x float> %2) | ||
| // CHECK: ret <4 x float> %dx.lerp | ||
| float4 test_lerp_float4_splat ( float p0, float4 p1 ) { | ||
| return lerp( p0, p1, p1 ); | ||
| } | ||
|
|
||
| // CHECK: %conv = sitofp i32 %2 to float | ||
| // CHECK: %splat.splatinsert = insertelement <2 x float> poison, float %conv, i64 0 | ||
| // CHECK: %splat.splat = shufflevector <2 x float> %splat.splatinsert, <2 x float> poison, <2 x i32> zeroinitializer | ||
| // CHECK: %dx.lerp = call <2 x float> @llvm.dx.lerp.v2f32(<2 x float> %0, <2 x float> %1, <2 x float> %splat.splat) | ||
| // CHECK: ret <2 x float> %dx.lerp | ||
| float2 test_lerp_float2_int_splat ( float2 p0, int p1 ) { | ||
| return lerp ( p0, p0, p1 ); | ||
| } | ||
|
|
||
| // CHECK: %conv = sitofp i32 %2 to float | ||
| // CHECK: %splat.splatinsert = insertelement <3 x float> poison, float %conv, i64 0 | ||
| // CHECK: %splat.splat = shufflevector <3 x float> %splat.splatinsert, <3 x float> poison, <3 x i32> zeroinitializer | ||
| // CHECK: %dx.lerp = call <3 x float> @llvm.dx.lerp.v3f32(<3 x float> %0, <3 x float> %1, <3 x float> %splat.splat) | ||
| // CHECK: ret <3 x float> %dx.lerp | ||
| float3 test_lerp_float3_int_splat ( float3 p0, int p1 ) { | ||
| return lerp ( p0, p0, p1 ); | ||
| } |
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.
It wouldn't make sense to change it as part of this commit, but with this in place "err_vec_builtin_non_vector" has a bit of an ambiguous name now. Might be worth following up at some point
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.
I did it this way because the amount of test cases I would need to update to not be tied to two args was very large.
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.
I disagree here. I think we should collapse these down. You can use a
%select{...}block in the error format string to support the old message and the new message from the same diagnostic entry.These diagnostic strings end up becoming some pretty large constant data tables in the final clang executable so we've generally tried to reuse errors where it makes sense.
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.
#83609