Skip to content

[SYCL] Make properties constructor constexpr #5928

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

Merged
merged 3 commits into from
Mar 31, 2022
Merged

[SYCL] Make properties constructor constexpr #5928

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
032d74a
[SYCL] Make properties constructor constexpr
steffenlarsen Mar 30, 2022
1b6ccbe
Fix formatting
steffenlarsen Mar 30, 2022
448e63a
Change expected error line after format change
steffenlarsen Mar 30, 2022
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
6 changes: 3 additions & 3 deletions sycl/include/sycl/ext/oneapi/properties/properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ struct ExtractProperties<std::tuple<PropertiesTs...>> {
using ExtractedPropertiesT = std::tuple<>;

template <typename... PropertyValueTs>
static ExtractedPropertiesT<PropertyValueTs...>
static constexpr ExtractedPropertiesT<PropertyValueTs...>
Extract(std::tuple<PropertyValueTs...>) {
return {};
}
Expand All @@ -112,7 +112,7 @@ struct ExtractProperties<std::tuple<PropertyT, PropertiesTs...>> {
NextExtractedPropertiesT<PropertyValueTs...>>::type;

template <typename... PropertyValueTs>
static ExtractedPropertiesT<PropertyValueTs...>
static constexpr ExtractedPropertiesT<PropertyValueTs...>
Extract(std::tuple<PropertyValueTs...> PropertyValues) {
PropertyT ThisExtractedProperty = std::get<PropertyT>(PropertyValues);
NextExtractedPropertiesT<PropertyValueTs...> NextExtractedProperties =
Expand All @@ -137,7 +137,7 @@ template <typename PropertiesT> class properties {

public:
template <typename... PropertyValueTs>
properties(PropertyValueTs... props)
constexpr properties(PropertyValueTs... props)
: Storage(detail::ExtractProperties<StorageT>::Extract(
std::tuple<PropertyValueTs...>{props...})) {}

Expand Down
7 changes: 4 additions & 3 deletions sycl/test/extensions/properties/mock_compile_time_properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct boo_key {
};

struct foo {
foo(int v) : value(v) {}
constexpr foo(int v) : value(v) {}
int value;
};

Expand All @@ -41,9 +41,9 @@ inline bool operator==(const foo &lhs, const foo &rhs) {
inline bool operator!=(const foo &lhs, const foo &rhs) { return !(lhs == rhs); }

struct foz {
foz(float v1, bool v2) : value1(v1), value2(v2) {}
constexpr foz(float v1, bool v2) : value1(v1), value2(v2) {}
// Define copy constructor to make foz non-trivially copyable
foz(const foz &f) {
constexpr foz(const foz &f) {
value1 = f.value1;
value2 = f.value2;
}
Expand All @@ -57,6 +57,7 @@ inline bool operator==(const foz &lhs, const foz &rhs) {
inline bool operator!=(const foz &lhs, const foz &rhs) { return !(lhs == rhs); }

struct fir {
// Intentionally not constexpr to test for properties that cannot be constexpr
fir(float v1, bool v2) : value1(v1), value2(v2) {}
// Define copy constructor to make foz non-trivially copyable
fir(const foz &f) {
Expand Down
73 changes: 73 additions & 0 deletions sycl/test/extensions/properties/properties_ctor_constexpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s

#include <CL/sycl.hpp>

#include "mock_compile_time_properties.hpp"

int main() {
// Empty properties
constexpr decltype(sycl::ext::oneapi::experimental::properties{})
EmptyProps1{};
constexpr auto EmptyProps2 = sycl::ext::oneapi::experimental::properties{};

// Compile-time value properties
constexpr decltype(sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::bar,
sycl::ext::oneapi::experimental::baz<1>,
sycl::ext::oneapi::experimental::boo<int, bool>}) CTProps1{
sycl::ext::oneapi::experimental::bar,
sycl::ext::oneapi::experimental::baz<1>,
sycl::ext::oneapi::experimental::boo<int, bool>};
constexpr auto CTProps2 = sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::bar,
sycl::ext::oneapi::experimental::baz<1>,
sycl::ext::oneapi::experimental::boo<int, bool>};

// Runtime value properties
constexpr decltype(sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::foo(42),
sycl::ext::oneapi::experimental::foz(3.14, false)}) RTProps1{
sycl::ext::oneapi::experimental::foo(42),
sycl::ext::oneapi::experimental::foz(3.14, false)};
constexpr auto RTProps2 = sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::foo(42),
sycl::ext::oneapi::experimental::foz(3.14, false)};

// Mixed compile-time and runtime value properties
constexpr decltype(sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::bar,
sycl::ext::oneapi::experimental::baz<1>,
sycl::ext::oneapi::experimental::boo<int, bool>,
sycl::ext::oneapi::experimental::foo(42),
sycl::ext::oneapi::experimental::foz(3.14, false)}) MixProps1{
sycl::ext::oneapi::experimental::bar,
sycl::ext::oneapi::experimental::baz<1>,
sycl::ext::oneapi::experimental::boo<int, bool>,
sycl::ext::oneapi::experimental::foo(42),
sycl::ext::oneapi::experimental::foz(3.14, false)};
constexpr auto MixProps2 = sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::bar,
sycl::ext::oneapi::experimental::baz<1>,
sycl::ext::oneapi::experimental::boo<int, bool>,
sycl::ext::oneapi::experimental::foo(42),
sycl::ext::oneapi::experimental::foz(3.14, false)};

// Runtime value property without constexpr ctors
// expected-error@+3 {{constexpr variable cannot have non-literal type}}
constexpr decltype(sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::fir(3.14, false)}) NCRTProps1{
sycl::ext::oneapi::experimental::fir(3.14, false)};
// expected-error@+1 {{constexpr variable cannot have non-literal type}}
constexpr auto NCRTProps2 = sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::fir(3.14, false)};
int RTIntValue = 1;
// expected-error@+3 {{constexpr variable 'NCRTProps3' must be initialized by a constant expression}}
constexpr decltype(sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::foo(RTIntValue)}) NCRTProps3{
sycl::ext::oneapi::experimental::foo(RTIntValue)};
// expected-error@+1 {{constexpr variable 'NCRTProps4' must be initialized by a constant expressio}}
constexpr auto NCRTProps4 = sycl::ext::oneapi::experimental::properties{
sycl::ext::oneapi::experimental::foo(RTIntValue)};

return 0;
}