Cgra merge

CMakeLists.txt

@@ -1,16 +1,24 @@
-cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20.0 FATAL_ERROR)
 
 project(Thorin)
 
 set(PACKAGE_VERSION "0.3.9")
-set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "limited config" FORCE)
+#set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "limited config" FORCE)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS 1)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 option(THORIN_PROFILE "profile complexity in thorin::HashTable - only works in Debug build" ON)
 
+option (FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." FALSE)
+if (${FORCE_COLORED_OUTPUT})
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+       add_compile_options (-fdiagnostics-color=always)
+    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+       add_compile_options (-fcolor-diagnostics)
+    endif ()
+endif ()
 
 if(CMAKE_BUILD_TYPE STREQUAL "")
     set(CMAKE_BUILD_TYPE Debug CACHE STRING "Debug or Release" FORCE)
@@ -26,16 +34,30 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 find_package(Half REQUIRED)
 message(STATUS "Building with Half library from ${Half_INCLUDE_DIRS}.")
 
+# find json package for json output support.
+if(TARGET nlohmann_json)
+    set(THORIN_ENABLE_JSON TRUE)
+else()
+    find_package(nlohmann_json 3.2.0 QUIET)
+    if(nlohmann_json_FOUND)
+        set(THORIN_ENABLE_JSON TRUE)
+    endif()
+endif()
+
 # check for possible llvm extension
 find_package(LLVM QUIET CONFIG)
 if(LLVM_FOUND)
     message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
     message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
     if(LLVM_LINK_LLVM_DYLIB)
         set(AnyDSL_LLVM_LINK_SHARED "USE_SHARED")
+    else()
+        if (BUILD_SHARED_LIBS)
+            message(SEND_ERROR "Cannot build thorin as a shared library with the current build of LLVM. Build LLVM with LLVM_LINK_LLVM_DYLIB or change BUILD_SHARED_LIBS to off.")
+        endif()
     endif()
     # check for RV
-    find_package(RV)
+    find_package(RV QUIET CONFIG)
     if(RV_FOUND)
         message(STATUS "Building with RV from LLVM installation.")
     else()
@@ -45,6 +67,26 @@ else()
     message(STATUS "Building without LLVM and RV. Specify LLVM_DIR to compile with LLVM.")
 endif()
 
+include(CheckIncludeFile)
+check_include_file(sys/resource.h THORIN_ENABLE_RLIMITS)
+
+if (NOT TARGET shady)
+    find_package(shady CONFIG)
+    if (shady_FOUND)
+        message(STATUS "Found shady at ${shady_DIR}")
+        set(THORIN_ENABLE_SHADY TRUE)
+    endif()
+else()
+    export(TARGETS shady api FILE ${CMAKE_BINARY_DIR}/share/anydsl/cmake/shady-exports.cmake)
+    set(THORIN_ENABLE_SHADY TRUE)
+endif()
+
+find_package(SPIRV-Headers)
+if (SPIRV-Headers_FOUND)
+    message(STATUS "Found SPIRV-Headers at ${SPIRV-Headers_DIR}")
+    set(THORIN_ENABLE_SPIRV TRUE)
+endif()
+
 message(STATUS "Using Debug flags: ${CMAKE_CXX_FLAGS_DEBUG}")
 message(STATUS "Using Release flags: ${CMAKE_CXX_FLAGS_RELEASE}")
 if(DEFINED CMAKE_BUILD_TYPE)

cmake/thorin-config.cmake.in

@@ -28,8 +28,11 @@ list(APPEND CMAKE_MODULE_PATH "${Thorin_ROOT_DIR}/cmake/modules")
 find_path(Half_DIR NAMES half.hpp PATHS ${Half_DIR} $ENV{Half_DIR} "@Half_DIR@" "@Half_INCLUDE_DIR@")
 find_package(Half REQUIRED)
 
+set(Thorin_HAS_JSON_SUPPORT @THORIN_ENABLE_JSON@)
 set(Thorin_HAS_LLVM_SUPPORT @LLVM_FOUND@)
 set(Thorin_HAS_RV_SUPPORT @RV_FOUND@)
+set(Thorin_HAS_SHADY_SUPPORT @THORIN_ENABLE_SHADY@)
+set(Thorin_HAS_SPIRV_SUPPORT @THORIN_ENABLE_SPIRV@)
 set(AnyDSL_LLVM_LINK_SHARED @AnyDSL_LLVM_LINK_SHARED@)
 
 if(Thorin_HAS_LLVM_SUPPORT)

src/thorin/CMakeLists.txt

@@ -16,8 +16,6 @@ set(THORIN_SOURCES
     world.h
     analyses/cfg.cpp
     analyses/cfg.h
-    analyses/domfrontier.cpp
-    analyses/domfrontier.h
     analyses/domtree.cpp
     analyses/domtree.h
     analyses/free_defs.cpp
@@ -37,6 +35,7 @@ set(THORIN_SOURCES
     be/c/c.h
     be/config_script/config_script.cpp
     be/config_script/config_script.h
+    be/runtime.h
     be/kernel_config.h
     tables/allnodes.h
     tables/arithoptable.h
@@ -45,9 +44,6 @@ set(THORIN_SOURCES
     tables/primtypetable.h
     tables/mathoptable.h
     transform/cleanup_world.cpp
-    transform/cleanup_world.h
-    transform/clone_bodies.cpp
-    transform/clone_bodies.h
     transform/closure_conversion.cpp
     transform/closure_conversion.h
     transform/codegen_prepare.h
@@ -70,6 +66,8 @@ set(THORIN_SOURCES
     transform/resolve_loads.h
     transform/partial_evaluation.cpp
     transform/partial_evaluation.h
+    transform/rewrite.cpp
+    transform/rewrite.h
     transform/split_slots.cpp
     transform/split_slots.h
     transform/hls_dataflow.cpp
@@ -93,6 +91,9 @@ set(THORIN_SOURCES
     util/symbol.h
     util/types.h
     util/utility.h
+    util/graphviz_dump.cpp
+    util/scoped_dump.h
+    util/scoped_dump.cpp
     )
 
 if(LLVM_FOUND)
@@ -103,6 +104,10 @@ if(LLVM_FOUND)
         be/llvm/llvm.h
         be/llvm/amdgpu.cpp
         be/llvm/amdgpu.h
+        be/llvm/amdgpu_hsa.cpp
+        be/llvm/amdgpu_hsa.h
+        be/llvm/amdgpu_pal.cpp
+        be/llvm/amdgpu_pal.h
         be/llvm/nvvm.cpp
         be/llvm/nvvm.h
         be/llvm/parallel.cpp
@@ -113,6 +118,28 @@ if(LLVM_FOUND)
     )
 endif()
 
+if (THORIN_ENABLE_SHADY)
+    list(APPEND THORIN_SOURCES
+        be/shady/shady.cpp
+    )
+endif()
+
+if(THORIN_ENABLE_JSON)
+    list(APPEND THORIN_SOURCES
+        be/json/json.cpp
+        be/json/json.h
+    )
+endif()
+
+if(THORIN_ENABLE_SPIRV)
+    list(APPEND THORIN_SOURCES
+        be/spirv/spirv.cpp
+        be/spirv/spirv_types.cpp
+        be/spirv/spirv_instructions.cpp
+        be/spirv/spirv.h
+    )
+endif()
+
 add_library(thorin ${THORIN_SOURCES})
 target_include_directories(thorin PUBLIC ${Half_INCLUDE_DIRS} ${Thorin_ROOT_DIR}/src ${CMAKE_BINARY_DIR}/include)
 
@@ -127,3 +154,15 @@ if(LLVM_FOUND)
     endif()
     llvm_config(thorin ${AnyDSL_LLVM_LINK_SHARED} ${Thorin_LLVM_COMPONENTS})
 endif()
+
+if (THORIN_ENABLE_SHADY)
+    if (shady_FOUND)
+        target_link_libraries(thorin PRIVATE shady::shady)
+    else()
+        target_link_libraries(thorin PRIVATE shady)
+    endif()
+endif()
+
+if(THORIN_ENABLE_JSON)
+    target_link_libraries(thorin PRIVATE nlohmann_json::nlohmann_json)
+endif()

src/thorin/analyses/cfg.cpp

@@ -6,7 +6,6 @@
 #include <stack>
 
 #include "thorin/world.h"
-#include "thorin/analyses/domfrontier.h"
 #include "thorin/analyses/domtree.h"
 #include "thorin/analyses/looptree.h"
 #include "thorin/analyses/scope.h"
@@ -30,7 +29,7 @@ Stream& CFNode::stream(Stream& s) const { return s << continuation(); }
 CFA::CFA(const Scope& scope)
     : scope_(scope)
     , entry_(node(scope.entry()))
-    , exit_ (node(scope.exit() ))
+    , exit_ (node(scope.entry()->world().end_scope()))
 {
     std::queue<Continuation*> cfg_queue;
     ContinuationSet cfg_done;
@@ -194,7 +193,6 @@ template<bool forward> const CFNodes& CFG<forward>::preds(const CFNode* n) const
 template<bool forward> const CFNodes& CFG<forward>::succs(const CFNode* n) const { assert(n != nullptr); return forward ? n->succs() : n->preds(); }
 template<bool forward> const DomTreeBase<forward>& CFG<forward>::domtree() const { return lazy_init(this, domtree_); }
 template<bool forward> const LoopTree<forward>& CFG<forward>::looptree() const { return lazy_init(this, looptree_); }
-template<bool forward> const DomFrontierBase<forward>& CFG<forward>::domfrontier() const { return lazy_init(this, domfrontier_); }
 
 template class CFG<true>;
 template class CFG<false>;

src/thorin/analyses/cfg.h

@@ -132,7 +132,6 @@ class CFG {
     const CFNode* operator [] (Continuation* continuation) const { return cfa()[continuation]; }    ///< Maps from @p l to @p CFNode.
     const DomTreeBase<forward>& domtree() const;
     const LoopTree<forward>& looptree() const;
-    const DomFrontierBase<forward>& domfrontier() const;
 
     static size_t index(const CFNode* n) { return forward ? n->f_index_ : n->b_index_; }
 
@@ -143,7 +142,6 @@ class CFG {
     Map<const CFNode*> rpo_;
     mutable std::unique_ptr<const DomTreeBase<forward>> domtree_;
     mutable std::unique_ptr<const LoopTree<forward>> looptree_;
-    mutable std::unique_ptr<const DomFrontierBase<forward>> domfrontier_;
 };
 
 //------------------------------------------------------------------------------

src/thorin/analyses/free_defs.cpp

@@ -23,7 +23,7 @@ DefSet free_defs(const Scope& scope, bool include_closures) {
 
     while (!queue.empty()) {
         auto def = pop(queue);
-        if (def->isa_structural()) {
+        if (def->isa_structural() && !def->isa<Param>()) {
             if (!include_closures && def->isa<Closure>()) {
                 result.emplace(def);
                 queue.push(def->op(1));