Separate out MappingId

This changeset separates cuda-specific typed mapping ids on the path towards supporting multiple backends.

Author: nicolasvasilache

include/tc/core/polyhedral/cuda/cuda_mapping_types-inl.h

@@ -18,27 +18,6 @@
 namespace tc {
 namespace polyhedral {
 namespace mapping {
-bool MappingId::isBlockId() {
-  return *this == BlockId::x() or *this == BlockId::y() or
-      *this == BlockId::z();
-}
-BlockId* MappingId::asBlockId() {
-  if (!isBlockId()) {
-    return nullptr;
-  }
-  return static_cast<BlockId*>(this);
-}
-bool MappingId::isThreadId() {
-  return *this == ThreadId::x() or *this == ThreadId::y() or
-      *this == ThreadId::z();
-}
-ThreadId* MappingId::asThreadId() {
-  if (!isThreadId()) {
-    return nullptr;
-  }
-  return static_cast<ThreadId*>(this);
-}
-
 ThreadId ThreadId::makeId(size_t dim) {
   CHECK(dim < 3);
   if (dim == 0) {

include/tc/core/polyhedral/cuda/cuda_mapping_types.h

@@ -17,48 +17,12 @@
 
 #include "tc/external/isl.h"
 
-namespace tc {
-
-struct Block;
-struct Grid;
+#include "tc/core/polyhedral/mapping_types.h"
 
+namespace tc {
 namespace polyhedral {
 namespace mapping {
 
-struct BlockId;
-struct ThreadId;
-
-struct MappingId : public isl::id {
- protected:
-  MappingId(isl::id i, unsigned char l) : isl::id(i), dim(l) {}
-
- public:
-  MappingId(const MappingId& id) : isl::id(id), dim(id.dim) {}
-
-  inline bool isBlockId();
-  inline BlockId* asBlockId();
-
-  inline bool isThreadId();
-  inline ThreadId* asThreadId();
-
-  // For indexing into positional arrays
-  // TODO: this should go away but this probably requires tinkering with
-  // mapping_options.h::Grid/Block.
-  // Also, generally can't have fully static types and dynamic behavior
-  // like is used in mapped_scop.cc, so pick your poison:
-  //   API bloat/templates or dynamic checks
-  const unsigned char dim;
-
-  // Placeholder value to use in absence of mapping size.
-  static constexpr size_t unmapped = 1;
-
-  struct Hash {
-    size_t operator()(const MappingId& id) const {
-      return isl::IslIdIslHash().operator()(id);
-    }
-  };
-};
-
 // Note: do not add members to ThreadId or slicing will ensue.
 // We use containers of MappingId. This makes sense because of isl::id
 // semantics and the fact that a MappingId **isa** isl::id.

include/tc/core/polyhedral/mapping_types.h

@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#pragma once
+
+#include "tc/external/isl.h"
+
+namespace tc {
+
+struct Block;
+struct Grid;
+
+namespace polyhedral {
+namespace mapping {
+
+struct BlockId;
+struct ThreadId;
+
+struct MappingId : public isl::id {
+ protected:
+  MappingId(isl::id i, unsigned char l) : isl::id(i), dim(l) {}
+
+ public:
+  MappingId(const MappingId& id) : isl::id(id), dim(id.dim) {}
+
+  bool isBlockId();
+  BlockId* asBlockId();
+
+  bool isThreadId();
+  ThreadId* asThreadId();
+
+  // For indexing into positional arrays
+  // TODO: this should go away but this probably requires tinkering with
+  // mapping_options.h::Grid/Block.
+  // Also, generally can't have fully static types and dynamic behavior
+  // like is used in mapped_scop.cc, so pick your poison:
+  //   API bloat/templates or dynamic checks
+  const unsigned char dim;
+
+  // Placeholder value to use in absence of mapping size.
+  static constexpr size_t unmapped = 1;
+
+  struct Hash {
+    size_t operator()(const MappingId& id) const {
+      return isl::IslIdIslHash().operator()(id);
+    }
+  };
+};
+} // namespace mapping
+} // namespace polyhedral
+} // namespace tc

src/core/CMakeLists.txt

@@ -16,6 +16,7 @@ add_library(
 
   polyhedral/codegen.cc
   polyhedral/mapped_scop.cc
+  polyhedral/mapping_types.cc
   polyhedral/memory_promotion.cc
   polyhedral/memory_promotion_heuristic.cc
   polyhedral/reduction_matcher.cc

src/core/polyhedral/mapping_types.cc

@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2017-present, Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "tc/core/polyhedral/mapping_types.h"
+#include "tc/core/polyhedral/cuda/cuda_mapping_types.h"
+
+namespace tc {
+namespace polyhedral {
+namespace mapping {
+bool MappingId::isBlockId() {
+  return *this == BlockId::x() or *this == BlockId::y() or
+      *this == BlockId::z();
+}
+BlockId* MappingId::asBlockId() {
+  if (!isBlockId()) {
+    return nullptr;
+  }
+  return static_cast<BlockId*>(this);
+}
+bool MappingId::isThreadId() {
+  return *this == ThreadId::x() or *this == ThreadId::y() or
+      *this == ThreadId::z();
+}
+ThreadId* MappingId::asThreadId() {
+  if (!isThreadId()) {
+    return nullptr;
+  }
+  return static_cast<ThreadId*>(this);
+}
+} // namespace mapping
+} // namespace polyhedral
+} // namespace tc