Skip to content

Removed inheritance in fpga_mem #11917

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 2 commits into from
Nov 20, 2023
+36 −68
Merged

Removed inheritance in fpga_mem #11917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddf5251
flattened fpga_mem
artemrad Nov 16, 2023
31c012f
clang-format
artemrad Nov 16, 2023
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
104 changes: 36 additions & 68 deletions sycl/include/sycl/ext/intel/experimental/fpga_mem/fpga_mem.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,30 @@
namespace sycl {
inline namespace _V1 {
namespace ext::intel::experimental {
namespace detail {

// Hide the base implementation in details so that manipulation
// of properties parameter pack can be modularized away from main logic
template <typename T, typename... Props> class fpga_mem_base {
// Primary template should never be deduced. Needed to establish which
// parameters fpga_mem can be templated on
template <typename T, typename PropertyListT =
ext::oneapi::experimental::empty_properties_t>
class fpga_mem {

static_assert(
ext::oneapi::experimental::is_property_list<PropertyListT>::value,
"Property list is invalid.");
};

// Template specialization that all calls should use. Separates Props from
// properties_t which allows the class to apply Props as attributes.
template <typename T, typename... Props>
class
#ifdef __SYCL_DEVICE_ONLY__
[[__sycl_detail__::add_ir_attributes_global_variable(
"sycl-resource",
ext::oneapi::experimental::detail::PropertyMetaInfo<Props>::name...,
"DEFAULT",
ext::oneapi::experimental::detail::PropertyMetaInfo<Props>::value...)]]
#endif
fpga_mem<T, ext::oneapi::experimental::detail::properties_t<Props...>> {

protected:
T val
Expand All @@ -47,14 +66,14 @@ template <typename T, typename... Props> class fpga_mem_base {
// All the initialization
// constexpr is used as a hint to the compiler to try and evaluate the
// constructor at compile-time
template <typename... S> constexpr fpga_mem_base(S... args) : val{args...} {}
template <typename... S> constexpr fpga_mem(S... args) : val{args...} {}

fpga_mem_base() = default;
fpga_mem() = default;

fpga_mem_base(const fpga_mem_base &) = default;
fpga_mem_base(fpga_mem_base &&) = default;
fpga_mem_base &operator=(const fpga_mem_base &) = default;
fpga_mem_base &operator=(fpga_mem_base &&) = default;
fpga_mem(const fpga_mem &) = default;
fpga_mem(fpga_mem &&) = default;
fpga_mem &operator=(const fpga_mem &) = default;
fpga_mem &operator=(fpga_mem &&) = default;

T &get() noexcept { return val; }

Expand All @@ -66,75 +85,24 @@ template <typename T, typename... Props> class fpga_mem_base {
// Allows for implicit conversion from this to T
constexpr operator const T &() const noexcept { return get(); }

fpga_mem_base &operator=(const T &newValue) noexcept {
fpga_mem &operator=(const T &newValue) noexcept {
val = newValue;
return *this;
}

// Note that there is no need for "fpga_mem_base" to define member functions
// Note that there is no need for "fpga_mem" to define member functions
// for operators like "++", "[]", "->", comparison, etc. Instead, the type
// "T" need only define these operators as non-member functions. Because
// there is an implicit conversion from "fpga_mem_base" to "T&".
};
} // namespace detail

// alias for proper namespace
template <typename... Props>
using properties_t = ext::oneapi::experimental::detail::properties_t<Props...>;

// Empty property list specialization
template <typename T, typename PropertyListT =
ext::oneapi::experimental::empty_properties_t>
class
#ifdef __SYCL_DEVICE_ONLY__
[[__sycl_detail__::add_ir_attributes_global_variable("sycl-resource",
"DEFAULT")]]
#endif
fpga_mem : public detail::fpga_mem_base<T> {

using property_list_t = ext::oneapi::experimental::empty_properties_t;

// Inherits the base class' constructors
using detail::fpga_mem_base<T>::fpga_mem_base;

public:
template <typename propertyT> static constexpr bool has_property() {
return property_list_t::template has_property<propertyT>();
}

template <typename propertyT> static constexpr auto get_property() {
return property_list_t::template get_property<propertyT>();
}
};

template <typename T, typename... Props>
class
#ifdef __SYCL_DEVICE_ONLY__
[[__sycl_detail__::add_ir_attributes_global_variable(
"sycl-resource",
ext::oneapi::experimental::detail::PropertyMetaInfo<Props>::name...,
"DEFAULT",
ext::oneapi::experimental::detail::PropertyMetaInfo<Props>::value...)]]
#endif
fpga_mem<T, properties_t<Props...>>
: public detail::fpga_mem_base<T, Props...> {

using property_list_t = properties_t<Props...>;

// Inherits the base class' constructors
using detail::fpga_mem_base<T, Props...>::fpga_mem_base;

public:
static_assert(
ext::oneapi::experimental::is_property_list<property_list_t>::value,
"Property list is invalid.");
// there is an implicit conversion from "fpga_mem" to "T&".

template <typename propertyT> static constexpr bool has_property() {
return property_list_t::template has_property<propertyT>();
return ext::oneapi::experimental::detail::properties_t<
Props...>::template has_property<propertyT>();
}

template <typename propertyT> static constexpr auto get_property() {
return property_list_t::template get_property<propertyT>();
return ext::oneapi::experimental::detail::properties_t<
Props...>::template get_property<propertyT>();
}
};

Expand Down