polyhedral/mapping_types -> polyhedral/cuda/cuda_mapping_types

Author: nicolasvasilache

include/tc/core/execution_engine-inl.h

@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include "tc/core/polyhedral/mapping_types.h"
+#include "tc/core/polyhedral/cuda/cuda_mapping_types.h"
 #include "tc/core/utils/memory.h"
 
 #include "tc/lang/parser.h"

include/tc/core/polyhedral/mapping_types-inl.h renamed to include/tc/core/polyhedral/cuda/cuda_mapping_types-inl.h

@@ -133,4 +133,4 @@ struct ThreadId : public MappingId {
 } // namespace polyhedral
 } // namespace tc
 
-#include "tc/core/polyhedral/mapping_types-inl.h"
+#include "tc/core/polyhedral/cuda/cuda_mapping_types-inl.h"

include/tc/core/polyhedral/mapping_types.h renamed to include/tc/core/polyhedral/cuda/cuda_mapping_types.h

@@ -22,7 +22,7 @@
 #include <vector>
 
 #include "tc/core/mapping_options.h"
-#include "tc/core/polyhedral/mapping_types.h"
+#include "tc/core/polyhedral/cuda/cuda_mapping_types.h"
 #include "tc/core/polyhedral/memory_promotion_heuristic.h"
 #include "tc/core/polyhedral/scop.h"
 #include "tc/core/utils/dlpack.h"

include/tc/core/polyhedral/tighten_launch_bounds.h renamed to include/tc/core/polyhedral/cuda/cuda_tighten_launch_bounds.h

@@ -21,8 +21,8 @@
 #include <unordered_set>
 #include <vector>
 
+#include "tc/core/polyhedral/cuda/cuda_mapping_types.h"
 #include "tc/core/polyhedral/functional.h"
-#include "tc/core/polyhedral/mapping_types.h"
 #include "tc/core/polyhedral/options.h"
 #include "tc/core/polyhedral/schedule_tree.h"
 #include "tc/external/isl.h"

include/tc/core/polyhedral/mapped_scop.h

@@ -22,7 +22,7 @@
 
 #include "tc/external/isl.h"
 
-#include "tc/core/polyhedral/mapping_types.h"
+#include "tc/core/polyhedral/cuda/cuda_mapping_types.h"
 
 namespace tc {
 namespace polyhedral {

include/tc/core/polyhedral/schedule_transforms.h

@@ -32,7 +32,7 @@
 #include "tc/core/execution_engine.h"
 #include "tc/core/flags.h"
 #include "tc/core/mapping_options_cpp_printer.h"
-#include "tc/core/polyhedral/mapping_types.h"
+#include "tc/core/polyhedral/cuda/cuda_mapping_types.h"
 #include "tc/core/scope_guard.h"
 #include "tc/core/utils/math.h"
 

include/tc/core/polyhedral/schedule_tree_elem.h

@@ -16,7 +16,6 @@ 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
@@ -27,8 +26,12 @@ add_library(
   polyhedral/schedule_print.cc
   polyhedral/scop.cc
   polyhedral/separation.cc
-  polyhedral/tighten_launch_bounds.cc
   polyhedral/unroll.cc
+
+  # Builds and runs without the CUDA SDK and used in cross-compilation tests
+  polyhedral/codegen_cuda.cc
+  polyhedral/cuda/cuda_mapping_types.cc
+  polyhedral/cuda/cuda_tighten_launch_bounds.cc
 )
 target_include_directories(tc_core PUBLIC ${PROJECT_SOURCE_DIR}/include ${LLVM_INCLUDE_DIRS})
 target_link_libraries(
@@ -92,8 +95,6 @@ if (WITH_CUDA)
     cuda/cuda_compilation_cache.cc
     cuda/cuda_rtc.cc
     cuda/cuda_tc_executor.cc
-
-    polyhedral/codegen_cuda.cc
   )
   target_include_directories(tc_core_cuda PUBLIC ${PROJECT_SOURCE_DIR}/include ${LLVM_INCLUDE_DIRS})
   target_link_libraries(

src/autotuner/genetic_tuning_harness.cc

@@ -26,7 +26,7 @@
 #include "tc/core/libraries.h"
 #include "tc/core/polyhedral/codegen.h"
 #include "tc/core/polyhedral/codegen_cuda.h"
-#include "tc/core/polyhedral/mapping_types.h"
+#include "tc/core/polyhedral/cuda/cuda_mapping_types.h"
 #include "tc/core/polyhedral/memory_promotion.h"
 #include "tc/core/polyhedral/schedule_isl_conversion.h"
 #include "tc/core/polyhedral/schedule_transforms.h"