-
Notifications
You must be signed in to change notification settings - Fork 14.3k
[HLSL] Add support for modulo of floating point scalar and vectors #135125
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \ | ||
| // RUN: -fnative-half-type -emit-llvm -disable-llvm-passes -o - | \ | ||
| // RUN: FileCheck %s | ||
| // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan-compute %s \ | ||
| // RUN: -fnative-half-type -emit-llvm -disable-llvm-passes -o - | \ | ||
| // RUN: FileCheck %s | ||
|
|
||
| half2 half_vec_mod_by_int(half2 p1) { | ||
| // CHECK-LABEL: half_vec_mod_by_int | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x half> %{{.*}}, splat (half 0xH4000) | ||
| return p1 % 2; | ||
| } | ||
|
|
||
| half2 half_vec_mod_by_float(half2 p1) { | ||
| // CHECK-LABEL: half_vec_mod_by_float | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x half> %{{.*}}, splat (half 0xH4000) | ||
| return p1 % (half)2.0; | ||
| } | ||
|
|
||
| half2 half_vec_mod_by_half(half2 p1, half p2 ) { | ||
| // CHECK-LABEL: half_vec_mod_by_half | ||
| // CHECK: %splat.splatinsert = insertelement <2 x half> poison, half %{{.*}}, i64 0 | ||
| // CHECK: %splat.splat = shufflevector <2 x half> %splat.splatinsert, <2 x half> poison, <2 x i32> zeroinitializer | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x half> %{{.*}}, %splat.splat | ||
| return p1 % p2; | ||
| } | ||
|
|
||
| half2 half_vec_mod_by_half_vec(half2 p1, half2 p2 ) { | ||
| // CHECK-LABEL: half_vec_mod_by_half_vec | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x half> %{{.*}}, %{{.*}} | ||
| return p1 % p2; | ||
| } | ||
|
|
||
| half half_vec_mod_by_int(half p1) { | ||
| // CHECK-LABEL: half_vec_mod_by_int | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn half %{{.*}}, 0xH4000 | ||
| return p1 % 2; | ||
| } | ||
|
|
||
| half half_mod_by_float(half p1) { | ||
| // CHECK-LABEL: half_mod_by_float | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn half %{{.*}}, 0xH4000 | ||
| return p1 % (half)2.0; | ||
| } | ||
|
|
||
| half half_mod_by_half(half p1, half p2 ) { | ||
| // CHECK-LABEL: half_mod_by_half | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn half %{{.*}}, %{{.*}} | ||
| return p1 % p2; | ||
| } | ||
|
|
||
| half half_mod_by_half_vec(half p1, half2 p2 ) { | ||
| // CHECK-LABEL: half_mod_by_half_vec | ||
| // CHECK: %splat.splatinsert = insertelement <2 x half> poison, half %{{.*}}, i64 0 | ||
| // CHECK: %splat.splat = shufflevector <2 x half> %splat.splatinsert, <2 x half> poison, <2 x i32> zeroinitializer | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x half> %splat.splat, %{{.*}} | ||
| return p1 % p2; | ||
| } | ||
|
|
||
| float2 float_vec_mod_by_int(float2 p1) { | ||
| // CHECK-LABEL: float_vec_mod_by_int | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x float> %{{.*}}, splat (float 2.000000e+00) | ||
| return p1 % 2; | ||
| } | ||
|
|
||
| float2 float_vec_mod_by_float_const(float2 p1) { | ||
| // CHECK-LABEL: float_vec_mod_by_float_const | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x float> %{{.*}}, splat (float 2.000000e+00) | ||
| return p1 % 2.0; | ||
| } | ||
|
|
||
| float2 float_vec_mod_by_float(float2 p1, float p2 ) { | ||
| // CHECK-LABEL: float_vec_mod_by_float | ||
| // CHECK: %splat.splatinsert = insertelement <2 x float> poison, float %{{.*}}, i64 0 | ||
| // CHECK: %splat.splat = shufflevector <2 x float> %splat.splatinsert, <2 x float> poison, <2 x i32> zeroinitializer | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x float> %{{.*}}, %splat.splat | ||
| return p1 % p2; | ||
| } | ||
|
|
||
| float2 float_vec_mod_by_float_vec(float2 p1, float2 p2 ) { | ||
| // CHECK-LABEL: float_vec_mod_by_float_vec | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x float> %{{.*}}, %{{.*}} | ||
| return p1 % p2; | ||
| } | ||
|
|
||
| float float_mod_by_int(float p1) { | ||
| // CHECK-LABEL: float_mod_by_int | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn float %{{.*}}, 2.000000e+00 | ||
| return p1 % 2; | ||
| } | ||
|
|
||
| float float_mod_by_float_const(float p1) { | ||
| // CHECK-LABEL: float_mod_by_float_const | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn float %{{.*}}, 2.000000e+00 | ||
| return p1 % 2.0; | ||
| } | ||
|
|
||
| float float_mod_by_float(float p1, float p2 ) { | ||
| // CHECK-LABEL: float_mod_by_float | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn float %{{.*}}, %{{.*}} | ||
| return p1 % p2; | ||
| } | ||
|
|
||
| float float_mod_by_float_vec(float p1, float2 p2 ) { | ||
| // CHECK-LABEL: float_mod_by_float_vec | ||
| // CHECK: %splat.splatinsert = insertelement <2 x float> poison, float %{{.*}}, i64 0 | ||
| // CHECK: %splat.splat = shufflevector <2 x float> %splat.splatinsert, <2 x float> poison, <2 x i32> zeroinitializer | ||
| // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x float> %splat.splat, %{{.*}} | ||
| return p1 % p2; | ||
| } | ||
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,41 @@ | ||
| // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -emit-llvm-only -disable-llvm-passes -verify | ||
|
|
||
| export double2 double_vec_mod_by_int(double2 p1) { | ||
| return p1 % 2; | ||
| // expected-error@-1 {{invalid operands to binary expression ('double2' (aka 'vector<double, 2>') and 'int')}} | ||
| } | ||
|
|
||
| export double2 double_vec_mod_by_float(double2 p1) { | ||
| return p1 % 2.0; | ||
| // expected-error@-1 {{invalid operands to binary expression ('double2' (aka 'vector<double, 2>') and 'float')}} | ||
| } | ||
|
|
||
| export double2 double_vec_mod_by_double(double2 p1, double p2 ) { | ||
| return p1 % p2; | ||
| // expected-error@-1 {{invalid operands to binary expression ('double2' (aka 'vector<double, 2>') and 'double')}} | ||
| } | ||
|
|
||
| export double2 double_vec_mod_by_double_vec(double2 p1, double2 p2 ) { | ||
| return p1 % p2; | ||
| // expected-error@-1 {{invalid operands to binary expression ('double2' (aka 'vector<double, 2>') and 'double2')}} | ||
| } | ||
|
|
||
| export double double_mod_by_int(double p1) { | ||
| return p1 % 2; | ||
| // expected-error@-1 {{invalid operands to binary expression ('double' and 'int')}} | ||
| } | ||
|
|
||
| export double double_mod_by_float(double p1) { | ||
| return p1 % 2.0; | ||
| // expected-error@-1 {{invalid operands to binary expression ('double' and 'float')}} | ||
| } | ||
|
|
||
| export double double_mod_by_double(double p1, double p2 ) { | ||
| return p1 % p2; | ||
| // expected-error@-1 {{invalid operands to binary expression ('double' and 'double')}} | ||
| } | ||
|
|
||
| export double double_mod_by_double_vec(double p1, double2 p2 ) { | ||
| return p1 % p2; | ||
| // expected-error@-1 {{invalid operands to binary expression ('double' and 'double2' (aka 'vector<double, 2>'))}} | ||
| } |
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.
this wasn't abiguous?
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.
Thats a Good question. so no it isn't ambigious because in SemaExpr::CheckRemainderOperands if we get into either the
CheckVectorOperandsfor the vector cases orUsualArithmeticConversionsfor the scalar cases. the integer literal go through a conversion to match the non literal type. I saw ints become halfs or floats depending on what the variable type was.The float literal however did not do this. The float literal would cast the half variables to a float so to prevent this in the testing i cast the float literals to half. If thats a bug I'll try an address it in a future pr.