Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[HLSL] Fix FileCheck annotation typos #95155

Merged
merged 1 commit into from
Jun 11, 2024
Merged

[HLSL] Fix FileCheck annotation typos #95155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/test/CodeGenHLSL/convergence/for.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void test6() {
// CHECK: [[C1:%[a-zA-Z0-9]+]] = call spir_func noundef i1 @_Z4condv() [[A3]] [ "convergencectrl"(token [[T1]]) ]
// CHECK: br i1 [[C1]], label %if.then, label %if.end
// CHECK: if.then:
// CHECK call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
// CHECK: call spir_func void @_Z3foov() [[A3:#[0-9]+]] [ "convergencectrl"(token [[T1]]) ]
// CHECK: br label %for.end
// CHECK: if.end:
// CHECK: br label %for.inc
Expand Down
5 changes: 2 additions & 3 deletions clang/test/SemaHLSL/standard_conversion_sequences.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
void test() {

// CHECK: VarDecl {{.*}} used f3 'vector<float, 3>':'float __attribute__((ext_vector_type(3)))' cinit
// CHECK-NEXt: ImplicitCastExpr {{.*}} 'vector<float, 3>':'float __attribute__((ext_vector_type(3)))' <VectorSplat>
// CHECK-NEXt: ImplicitCastExpr {{.*}} 'float' <FloatingCast>
// CHECK-NEXt: FloatingLiteral {{.*}} 'double' 1.000000e+00
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'vector<float, 3>':'float __attribute__((ext_vector_type(3)))' <VectorSplat>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we lost a CHECK line here. Is that expected?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/llvm/llvm-project/pull/93193/files#diff-49956cafb2ae707ec035858ec16fe0c8742aef703f29ce83339abf206c25080e in original diff there 3 of checks and test (looks like) passes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes this is intentional, as the test doesn't pass without the change. Since #91015 the literal is a float, not a double, so the implicit cast to float doesn't happen.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The log is truncated so we can't see the actual error, but you can see that this test is listed in the failures in the build for #93193 here: https://buildkite.com/llvm-project/github-pull-requests/builds/69357#018fdf40-9615-457d-93d7-b23bc0726a57/6-20940

// CHECK-NEXT: FloatingLiteral {{.*}} 'float' 1.000000e+00
vector<float,3> f3 = 1.0; // No warning for splatting to a vector from a literal.


Expand Down
Loading