[SYCL] Remove need to mark free functions with SYCL_EXTERNAL attribute #14170
There are no files selected for viewing
This file contains 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 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 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 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,59 @@ | ||
| //==---- free_function_attribute_check.cpp ---------------------------------==// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| // RUN: %clang_cc1 -fsycl-is-device -triple -spir64-unknown-unknown -verify %s | ||
|
|
||
| // expected-no-diagnostics | ||
|
|
||
| // This test checks that non-constexpr values appearing in | ||
|
There was a problem hiding this comment. Can you please update this comment? You can say something along the lines of "This test ensures that the compiler does not crash when functions or methods with add_ir_attributes_function attribute in dependent contexts are checked for the presence of the free function property" There was a problem hiding this comment. OK, I've updated the comment. |
||
| // add_ir_attributes_function can be handled when checking whether a function is | ||
| // a free function. When all values in the attribute can be handled, then we can | ||
| // safely test any candidate function for being a free function. | ||
|
|
||
| template <typename T> constexpr int value() { return 5; } | ||
|
|
||
| // In this struct the function the add_ir_attributes_function values for "S()" | ||
| // are as follows. Note that the "value" is represented as a CallExpr. | ||
| // `-SYCLAddIRAttributesFunctionAttr 0x562ec6c13390 < col:5, col : 67 > | ||
| // | -ConstantExpr 0x562ec6c13440 < col:49 > 'const char[5]' lvalue | ||
| // | |-value: LValue <todo> | ||
| // | `-StringLiteral 0x562ec6c13160 < col:49 > 'const char[5]' lvalue "name" | ||
| // `-CallExpr 0x562ec6c13220 < col:57, col : 66 > '<dependent type>' | ||
| // `-UnresolvedLookupExpr 0x562ec6c131a8 < col:57, col : 64 > '<dependent type>' lvalue(ADL) = 'value' 0x562ec6bea700 | ||
| // `-TemplateArgument type 'T':'type-parameter-0-0' | ||
| // `-TemplateTypeParmType 0x562ec6bea8b0 'T' dependent depth 0 index 0 | ||
| // `-TemplateTypeParm 0x562ec6bea860 'T' | ||
|
|
||
| template <typename T> struct S { | ||
| #if defined(__SYCL_DEVICE_ONLY__) | ||
| [[__sycl_detail__::add_ir_attributes_function("name", value<T>())]] | ||
| #endif | ||
| S() { | ||
| } | ||
| }; | ||
|
|
||
| // For the free function "f" the add_ir_attributes_function values are: | ||
| // | -SYCLAddIRAttributesFunctionAttr 0x56361c3c3ea8 < line:37 : 32, line : 39 : 15 > | ||
| // | |-ConstantExpr 0x56361c3c3f00 < line:38 : 5 > 'const char[5]' lvalue | ||
| // | | |-value: LValue <todo> | ||
| // | | `-StringLiteral 0x56361c398cf0 < col:5 > 'const char[5]' lvalue "name" | ||
| // | `-ConstantExpr 0x56361c3c3f60 < line:39 : 5, col : 14 > 'int' | ||
| // | |-value: Int 5 | ||
| // | `-CallExpr 0x56361c3c3e88 < col:5, col : 14 > 'int' | ||
| // | `-ImplicitCastExpr 0x56361c3c3e70 < col:5, col : 12 > 'int (*)()' < FunctionToPointerDecay > | ||
| // | `-DeclRefExpr 0x56361c3c3dc0 < col:5, col : 12 > 'int ()' lvalue Function 0x56361c3c3cc8 'value' 'int ()' (FunctionTemplate 0x56361c398a90 'value') | ||
|
|
||
| template <typename T> | ||
| __attribute__((sycl_device)) [[__sycl_detail__::add_ir_attributes_function( | ||
| "name", | ||
| value<T>())]] [[__sycl_detail__:: | ||
| add_ir_attributes_function("sycl-single-task-kernel", | ||
| 0)]] void | ||
| f(T i) {} | ||
|
|
||
| template void f(int i); | ||
This file contains 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 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 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,51 @@ | ||
| //==---- free_function_errors.cpp --------------------------------------==// | ||
| // | ||
| // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| // RUN: %clangxx -fsyntax-only -fsycl-device-only -Xclang -verify -Xclang -verify-ignore-unexpected=note %s | ||
|
|
||
| #include <array> | ||
| #include <sycl/sycl.hpp> | ||
|
|
||
| using namespace sycl; | ||
|
|
||
| struct S { | ||
| int i; | ||
| float f; | ||
| }; | ||
|
|
||
| union U { | ||
| int i; | ||
| float f; | ||
| }; | ||
|
|
||
| using accType = accessor<int, 1, access::mode::read_write>; | ||
|
|
||
| // expected-error@+3 {{'struct S' cannot be used as the type of a kernel parameter}} | ||
| SYCL_EXT_ONEAPI_FUNCTION_PROPERTY( | ||
| (ext::oneapi::experimental::single_task_kernel)) | ||
| void ff(struct S s) {} | ||
|
|
||
| // expected-error@+3 {{'union U' cannot be used as the type of a kernel parameter}} | ||
| SYCL_EXT_ONEAPI_FUNCTION_PROPERTY( | ||
| (ext::oneapi::experimental::single_task_kernel)) | ||
| void ff(union U u) {} | ||
|
|
||
| // expected-error@+3 {{'accType' (aka 'accessor<int, 1, access::mode::read_write>') cannot be used as the type of a kernel parameter}} | ||
| SYCL_EXT_ONEAPI_FUNCTION_PROPERTY( | ||
| (ext::oneapi::experimental::single_task_kernel)) | ||
| void ff(accType acc) {} | ||
|
|
||
| // expected-error@+3 {{'std::array<int, 10>' cannot be used as the type of a kernel parameter}} | ||
| SYCL_EXT_ONEAPI_FUNCTION_PROPERTY( | ||
| (ext::oneapi::experimental::single_task_kernel)) | ||
| void ff(std::array<int, 10> a) {} | ||
|
|
||
| // expected-error@+3 {{'int &' cannot be used as the type of a kernel parameter}} | ||
| SYCL_EXT_ONEAPI_FUNCTION_PROPERTY( | ||
| (ext::oneapi::experimental::single_task_kernel)) | ||
| void ff(int &ip) {} |
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.
Based on your tests below and explanation in PR comments, it sounds like this issue does not have anything to do with
constexprvalues. The issue here is we have non-instantiated functions/methods being checked when they shouldn't be. Can you try replacing this check withLangOpts.SYCLIsDevice && Body && FD->isDependentContext()without theTemplatedKindchecks. You also do not need theif (FD)since L16305 above checks this already.I think you should also replace the
hasDependentExprchecks you added in SemaSYCL to asserts instead because we should not be having dependent arguments at that 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.
Slight correction, that should be
!FD->isDependentContext()-- basically, if the function isn't dependent, it's safe to check the arguments; if the function IS dependent somehow, we need to wait to do those checks until the function has been instantiated (regardless of whether it's a member function or free function).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.
The
hasDependentExprcheck I added was a check before callinggetAttributeNameValuePairsbecause that would assert if all expressions in the attribute were not constexprs. So there is already an assert there. Perhaps an assert before callinggetAttributeNameValuePairsis not needed?Making the other change in SemaDecl.cpp was fine. The tests all pass.
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.
Ok. You can remove all that the code you added then if one already exists in
getAttributeNameValuePairsThere 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.
Done.