drop ScheduleTree::elemAsBase

Its only purpose was to support having ScheduleTreeElemMappingFilter
as a subclass of ScheduleTreeElemFilter, but this is now no longer the case.

Author: Sven Verdoolaege

tc/core/polyhedral/schedule_isl_conversion.cc

@@ -32,24 +32,6 @@ namespace tc {
 namespace polyhedral {
 namespace detail {
 
-// static constexpr std::initializer_list need both definition and declaration
-constexpr std::initializer_list<detail::ScheduleTreeType>
-    ScheduleTreeElemExtension::NodeDerivedTypes;
-constexpr std::initializer_list<detail::ScheduleTreeType>
-    ScheduleTreeElemSequence::NodeDerivedTypes;
-constexpr std::initializer_list<detail::ScheduleTreeType>
-    ScheduleTreeElemSet::NodeDerivedTypes;
-constexpr std::initializer_list<detail::ScheduleTreeType>
-    ScheduleTreeElemDomain::NodeDerivedTypes;
-constexpr std::initializer_list<detail::ScheduleTreeType>
-    ScheduleTreeElemFilter::NodeDerivedTypes;
-constexpr std::initializer_list<detail::ScheduleTreeType>
-    ScheduleTreeElemMappingFilter::NodeDerivedTypes;
-constexpr std::initializer_list<detail::ScheduleTreeType>
-    ScheduleTreeElemBand::NodeDerivedTypes;
-constexpr std::initializer_list<detail::ScheduleTreeType>
-    ScheduleTreeElemContext::NodeDerivedTypes;
-
 namespace {
 
 isl::schedule_node insertChild(isl::schedule_node node, const ScheduleTree* st);

tc/core/polyhedral/schedule_tree.h

@@ -449,34 +449,6 @@ struct ScheduleTree {
         const_cast<const ScheduleTreeElemBase*>(elem_.get()));
   }
 
-  // View elem_ as the specified type.
-  // Returns nullptr if neither this type, **nor any of the derived types**,
-  // are T.
-  // Inline impl for now, does not justify an extra -inl.h file
-  template <typename T>
-  T* elemAsBase() {
-    const ScheduleTree* t = this;
-    return const_cast<T*>(t->elemAsBase<const T>());
-  }
-  template <typename T>
-  const T* elemAsBase() const {
-    static_assert(
-        std::is_base_of<ScheduleTreeElemBase, T>::value,
-        "Must call with a class derived from ScheduleTreeElemBase");
-    // These T::NodeDerivedTypes are ugly, let's see if we can improve in the
-    // future but if we want dynamic typing and to avoid enumerations at each
-    // call site, which I claim we absolutely do, then we are not left with
-    // many options.
-    if (type_ != T::NodeType &&
-        std::find(
-            T::NodeDerivedTypes.begin(), T::NodeDerivedTypes.end(), type_) ==
-            T::NodeDerivedTypes.end()) {
-      return nullptr;
-    }
-    return static_cast<const T*>(
-        const_cast<const ScheduleTreeElemBase*>(elem_.get()));
-  }
-
   //
   // Data members
   //

tc/core/polyhedral/schedule_tree_elem.h

@@ -56,8 +56,6 @@ struct ScheduleTreeElemBase {
 };
 
 struct ScheduleTreeElemContext : public ScheduleTreeElemBase {
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::None};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::Context;
   isl::set context_;
@@ -77,8 +75,6 @@ struct ScheduleTreeElemContext : public ScheduleTreeElemBase {
 };
 
 struct ScheduleTreeElemDomain : public ScheduleTreeElemBase {
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::None};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::Domain;
   isl::union_set domain_;
@@ -98,8 +94,6 @@ struct ScheduleTreeElemDomain : public ScheduleTreeElemBase {
 };
 
 struct ScheduleTreeElemExtension : public ScheduleTreeElemBase {
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::None};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::Extension;
   isl::union_map extension_;
@@ -119,8 +113,6 @@ struct ScheduleTreeElemExtension : public ScheduleTreeElemBase {
 };
 
 struct ScheduleTreeElemFilter : public ScheduleTreeElemBase {
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::MappingFilter};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::Filter;
   isl::union_set filter_;
@@ -144,8 +136,6 @@ struct ScheduleTreeElemMappingFilter : public ScheduleTreeElemBase {
       mapping::MappingId,
       isl::union_pw_aff,
       typename mapping::MappingId::Hash>;
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::None};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::MappingFilter;
   ScheduleTreeElemMappingFilter() = delete;
@@ -186,8 +176,6 @@ struct ScheduleTreeElemMappingFilter : public ScheduleTreeElemBase {
 };
 
 struct ScheduleTreeElemSequence : public ScheduleTreeElemBase {
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::None};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::Sequence;
   explicit ScheduleTreeElemSequence() {}
@@ -204,8 +192,6 @@ struct ScheduleTreeElemSequence : public ScheduleTreeElemBase {
 };
 
 struct ScheduleTreeElemSet : public ScheduleTreeElemBase {
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::None};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::Set;
   explicit ScheduleTreeElemSet() {}
@@ -226,8 +212,6 @@ struct ScheduleTreeElemBand : public ScheduleTreeElemBase {
   ScheduleTreeElemBand() = default;
 
  public:
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::None};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::Band;
 
@@ -280,8 +264,6 @@ struct ScheduleTreeElemBand : public ScheduleTreeElemBase {
  * underneath the innermost band member mapped to threads.
  */
 struct ScheduleTreeElemThreadSpecificMarker : public ScheduleTreeElemBase {
-  static constexpr std::initializer_list<detail::ScheduleTreeType>
-      NodeDerivedTypes{detail::ScheduleTreeType::None};
   static constexpr detail::ScheduleTreeType NodeType =
       detail::ScheduleTreeType::ThreadSpecificMarker;
   explicit ScheduleTreeElemThreadSpecificMarker() {}