Revert "Enable e2e lowering of neura-compiler with arch"

.github/workflows/main.yml

@@ -66,7 +66,7 @@ jobs:
       run: |
         mkdir -p ${{ env.CCACHE_DIR }}
         git --version
-        git clone --depth 1 --filter=blob:none --revision=${{ env.LLVM_COMMIT }} https://github.com/llvm/llvm-project.git
+        git clone --revision=${{ env.LLVM_COMMIT }} https://github.com/llvm/llvm-project.git
         cd llvm-project
         mkdir build && cd build
         cmake -G Ninja ../llvm \

include/NeuraDialect/Architecture/Architecture.h

@@ -453,7 +453,6 @@ class Architecture {
   Architecture(int multi_cgra_rows, int multi_cgra_columns,
                BaseTopology multi_cgra_base_topology = BaseTopology::MESH,
                int per_cgra_rows = 4, int per_cgra_columns = 4,
-               int max_ctrl_mem_items = 20,
                BaseTopology per_cgra_base_topology = BaseTopology::MESH,
                const TileDefaults &tile_defaults = TileDefaults(),
                const std::vector<TileOverride> &tile_overrides =
@@ -469,7 +468,6 @@ class Architecture {
   int getMultiCgraColumns() const { return multi_cgra_columns_; }
   int getPerCgraRows() const { return per_cgra_rows_; }
   int getPerCgraColumns() const { return per_cgra_columns_; }
-  int getMaxCtrlMemItems() const { return max_ctrl_mem_items_; }
 
   Link *getLink(int id);
   Link *getLink(int src_tile_x, int src_tile_y, int dst_tile_x, int dst_tile_y);
@@ -522,11 +520,8 @@ class Architecture {
   int multi_cgra_columns_;
   int per_cgra_rows_;
   int per_cgra_columns_;
-  int max_ctrl_mem_items_;
 };
 
-// Function for getting the architecture object.
-const Architecture &getArchitecture();
 } // namespace neura
 } // namespace mlir
 

include/NeuraDialect/Architecture/ArchitectureSpec.h

@@ -68,6 +68,13 @@ struct LinkOverride {
   bool existence = true;
 };
 
+// Function for getting the architecture specification file path.
+// This is set by the command line tool when a YAML file is provided.
+std::string getArchitectureSpecFile();
+
+// Function for getting tile defaults configuration.
+TileDefaults getTileDefaults();
+
 } // namespace neura
 } // namespace mlir
 

lib/NeuraDialect/Architecture/Architecture.cpp

@@ -1,4 +1,5 @@
 #include "NeuraDialect/Architecture/Architecture.h"
+#include "NeuraDialect/Architecture/ArchitectureSpec.h"
 #include "llvm/Support/raw_ostream.h"
 #include <algorithm>
 #include <cassert>
@@ -388,8 +389,7 @@ void Architecture::createLinkIfValid(int &link_id, Tile *src_tile, int dst_x,
                                      const LinkDefaults &link_defaults) {
   if (dst_x >= 0 && dst_x < getPerCgraColumns() && dst_y >= 0 &&
       dst_y < getPerCgraRows()) {
-    // Checks if the destination tile actually exists (not removed by
-    // tile_overrides).
+    // Checks if the destination tile actually exists (not removed by tile_overrides).
     auto it = coord_to_tile_.find({dst_x, dst_y});
     if (it != coord_to_tile_.end()) {
       createSingleLink(link_id, src_tile, it->second, link_defaults);
@@ -553,7 +553,6 @@ void Architecture::applyLinkOverrides(
 Architecture::Architecture(int multi_cgra_rows, int multi_cgra_columns,
                            BaseTopology multi_cgra_base_topology,
                            int per_cgra_rows, int per_cgra_columns,
-                           int max_ctrl_mem_items,
                            BaseTopology per_cgra_base_topology,
                            const TileDefaults &tile_defaults,
                            const std::vector<TileOverride> &tile_overrides,
@@ -566,7 +565,6 @@ Architecture::Architecture(int multi_cgra_rows, int multi_cgra_columns,
   // this->multi_cgra_base_topology_ = multi_cgra_base_topology;
   this->per_cgra_rows_ = per_cgra_rows;
   this->per_cgra_columns_ = per_cgra_columns;
-  this->max_ctrl_mem_items_ = max_ctrl_mem_items;
 
   // Initializes architecture components using helper methods.
   initializeTiles(per_cgra_rows, per_cgra_columns);

lib/NeuraDialect/CMakeLists.txt

@@ -10,8 +10,6 @@ add_mlir_dialect_library(MLIRNeura
         Mapping/HeuristicMapping/HeuristicMapping.cpp
         Architecture/Architecture.cpp
         Transforms/GraphMining/GraMi.cpp
-        Util/ArchParser.cpp
-        Util/ParserUtils.cpp
 
         ADDITIONAL_HEADER_DIRS
         ${PROJECT_SOURCE_DIR}/include/NeuraDialect

lib/NeuraDialect/NeuraPasses.cpp

@@ -9,7 +9,6 @@
 #include "NeuraDialect/NeuraOps.h"
 #include "NeuraDialect/NeuraPasses.h"
 #include "NeuraDialect/NeuraTypes.h"
-#include "mlir/Transforms/ViewOpGraph.h"
 
 std::string filename = "opgraph.dot";
 std::error_code EC;
@@ -21,11 +20,8 @@ void mlir::neura::registerNeuraConversionPassPipeline() {
       "neura-conversion", "Convert all dialects to Neura dialect",
       [](OpPassManager &pm) {
         pm.addPass(mlir::neura::createAssignAcceleratorPass());
-
-        pm.addPass(mlir::createLowerAffineToNeuraPass());
+        // Convert all the other dialects into the Neura dialect
         pm.addPass(mlir::createLowerArithToNeuraPass());
-        pm.addPass(mlir::createLowerMemRefToNeuraPass());
-        pm.addPass(mlir::createLowerBuiltinToNeuraPass());
         pm.addPass(mlir::createLowerLlvmToNeuraPass());
         pm.addPass(mlir::createPrintOpGraphPass(os));
 
@@ -42,8 +38,5 @@ void mlir::neura::registerNeuraConversionPassPipeline() {
         pm.addPass(mlir::neura::createFusePatternPass());
         pm.addPass(mlir::neura::createInsertDataMovPass());
         pm.addPass(mlir::createPrintOpGraphPass(os));
-
-        pm.addPass(mlir::neura::createMapToAcceleratorPass());
-        pm.addPass(mlir::neura::createGenerateCodePass());
       });
 }

lib/NeuraDialect/Transforms/GenerateCodePass.cpp

@@ -267,7 +267,16 @@ struct Topology {
 
 static Topology getTopologyFromArchitecture(int per_cgra_rows, int per_cgra_columns) {
   Topology topo;
-  const Architecture &architecture = mlir::neura::getArchitecture();
+  mlir::neura::Architecture architecture(1,
+                                         1,
+                                         mlir::neura::BaseTopology::MESH,
+                                         per_cgra_rows,
+                                         per_cgra_columns,
+                                         mlir::neura::BaseTopology::MESH,
+                                         mlir::neura::TileDefaults{},
+                                         std::vector<mlir::neura::TileOverride>{},
+                                         mlir::neura::LinkDefaults{},
+                                         std::vector<mlir::neura::LinkOverride>{});
 
   for (auto *tile : architecture.getAllTiles()) {
     topo.tile_location[tile->getId()] = {tile->getX(), tile->getY()};
@@ -402,9 +411,7 @@ struct GenerateCodePass
   }
 
   std::pair<int, int> getArrayDimensions(func::FuncOp function) {
-    const Architecture &architecture = mlir::neura::getArchitecture();
-    int columns = architecture.getPerCgraColumns();
-    int rows = architecture.getPerCgraRows();
+    int columns = 4, rows = 4; // default 4x4 CGRA.
     if (auto mapping_info = function->getAttrOfType<DictionaryAttr>(attr::kMappingInfo)) {
       if (auto x_tiles = dyn_cast_or_null<IntegerAttr>(mapping_info.get(attr::kXTiles))) columns = x_tiles.getInt();
       if (auto y_tiles = dyn_cast_or_null<IntegerAttr>(mapping_info.get(attr::kYTiles))) rows   = y_tiles.getInt();