Initialize LLVM update to 99020b3c73c1e22fa388be8fd0c44391d40b3a38

Author: agostini01

CMakeLists.txt

@@ -3,7 +3,7 @@ project(soda-opt LANGUAGES CXX C)
 
 set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
 
-set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
+set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
 
 find_package(MLIR REQUIRED CONFIG)
 

README.md

@@ -27,7 +27,7 @@ And follow one of our tutorials [here](docs/tutorials).
 This setup assumes that you have built LLVM and MLIR in `$BUILD_DIR` and
 installed it to `$PREFIX`. 
 The current version of this project was tested with `llvm-project` commit:
-`d0a4450ecdaf124f9d422dbcba8cbdbeb50c836a`.
+`99020b3c73c1e22fa388be8fd0c44391d40b3a38`.
 Make sure you have the correct commit checked-out.
 
 **Note**: Make sure to pass `-DLLVM_INSTALL_UTILS=ON` when building LLVM/MLIR 

include/soda-c/Dialect/SODA.h

@@ -1,7 +1,7 @@
 #ifndef SODA_C_DIALECT_SODA_H
 #define SODA_C_DIALECT_SODA_H
 
-#include "mlir-c/Registration.h"
+#include "mlir-c/IR.h"
 
 #ifdef __cplusplus
 extern "C" {

include/soda/Dialect/SNN/IR/SNNTypesBase.td

@@ -203,21 +203,21 @@ class ArrayMaxCt<int n> : AttrConstraint<
     CPred<"$_self.cast<::mlir::ArrayAttr>().size() <= " # n>,
     "with at least " # n # " elements">;
 
-def SNN_Fp32ArrayAttr2 : Confined<F32ArrayAttr, [ArrayCount<2>]>;
-def SNN_Fp32ArrayAttr3 : Confined<F32ArrayAttr, [ArrayCount<3>]>;
-def SNN_Fp32ArrayAttr4 : Confined<F32ArrayAttr, [ArrayCount<4>]>;
-def SNN_Fp32ArrayAttr5 : Confined<F32ArrayAttr, [ArrayCount<5>]>;
-def SNN_Fp32ArrayAttr6 : Confined<F32ArrayAttr, [ArrayCount<6>]>;
-
-def SNN_IntArrayAttr2 : Confined<I64ArrayAttr, [ArrayCount<2>]>;
-def SNN_IntArrayAttr3 : Confined<I64ArrayAttr, [ArrayCount<3>]>;
-def SNN_IntArrayAttr4 : Confined<I64ArrayAttr, [ArrayCount<4>]>;
-def SNN_IntArrayAttr5 : Confined<I64ArrayAttr, [ArrayCount<5>]>;
-def SNN_IntArrayAttr6 : Confined<I64ArrayAttr, [ArrayCount<6>]>;
-
-def SNN_IntArrayAttrUpto2 : Confined<I64ArrayAttr, [ArrayMaxCt<2>]>;
-def SNN_IntArrayAttrUpto4 : Confined<I64ArrayAttr, [ArrayMaxCt<4>]>;
-def SNN_IntArrayAttrUpto5 : Confined<I64ArrayAttr, [ArrayMaxCt<5>]>;
+def SNN_Fp32ArrayAttr2 : ConfinedAttr<F32ArrayAttr, [ArrayCount<2>]>;
+def SNN_Fp32ArrayAttr3 : ConfinedAttr<F32ArrayAttr, [ArrayCount<3>]>;
+def SNN_Fp32ArrayAttr4 : ConfinedAttr<F32ArrayAttr, [ArrayCount<4>]>;
+def SNN_Fp32ArrayAttr5 : ConfinedAttr<F32ArrayAttr, [ArrayCount<5>]>;
+def SNN_Fp32ArrayAttr6 : ConfinedAttr<F32ArrayAttr, [ArrayCount<6>]>;
+
+def SNN_IntArrayAttr2 : ConfinedAttr<I64ArrayAttr, [ArrayCount<2>]>;
+def SNN_IntArrayAttr3 : ConfinedAttr<I64ArrayAttr, [ArrayCount<3>]>;
+def SNN_IntArrayAttr4 : ConfinedAttr<I64ArrayAttr, [ArrayCount<4>]>;
+def SNN_IntArrayAttr5 : ConfinedAttr<I64ArrayAttr, [ArrayCount<5>]>;
+def SNN_IntArrayAttr6 : ConfinedAttr<I64ArrayAttr, [ArrayCount<6>]>;
+
+def SNN_IntArrayAttrUpto2 : ConfinedAttr<I64ArrayAttr, [ArrayMaxCt<2>]>;
+def SNN_IntArrayAttrUpto4 : ConfinedAttr<I64ArrayAttr, [ArrayMaxCt<4>]>;
+def SNN_IntArrayAttrUpto5 : ConfinedAttr<I64ArrayAttr, [ArrayMaxCt<5>]>;
 
 //===----------------------------------------------------------------------===//
 // Iterable attributes.

python/CMakeLists.txt

@@ -40,6 +40,7 @@ add_mlir_python_common_capi_library(SODAPythonCAPI
   RELATIVE_INSTALL_ROOT "../../../.."
   DECLARED_SOURCES
     SODAPythonSources
+    MLIRPythonExtension.RegisterEverything
     MLIRPythonSources.Core
 )
 

test/CAPI/CMakeLists.txt

@@ -6,7 +6,7 @@ add_mlir_aggregate(SODACAPITestLib
   SHARED
   EMBED_LIBS
   MLIRCAPIIR
-  MLIRCAPIRegistration
+  MLIRCAPIRegisterEverything
   SODACAPI
 )
 

test/CAPI/soda-capi-test.c

@@ -6,12 +6,20 @@
 
 #include "mlir-c/IR.h"
 #include "soda-c/Dialect/SODA.h"
+#include "mlir-c/RegisterEverything.h"
+
+static void registerAllUpstreamDialects(MlirContext ctx) {
+  MlirDialectRegistry registry = mlirDialectRegistryCreate();
+  mlirRegisterAllDialects(registry);
+  mlirContextAppendDialectRegistry(ctx, registry);
+  mlirDialectRegistryDestroy(registry);
+}
 
 int main(int argc, char **argv) {
   MlirContext ctx = mlirContextCreate();
   // TODO: Create the dialect handles for the builtin dialects and avoid this.
   // This adds dozens of MB of binary size over just the standalone dialect.
-  mlirRegisterAllDialects(ctx);
+  registerAllUpstreamDialects(ctx);
   mlirDialectHandleRegisterDialect(mlirGetDialectHandle__soda__(), ctx);
 
   MlirModule module = mlirModuleCreateParse(

tools/soda-opt/soda-opt.cpp

@@ -37,9 +37,12 @@ int registerTestLinalgCodegenStrategy();
 // Register important linalg passes
 inline void registerLinalgPassesForSoda() {
 
-  mlir::registerLinalgPromotionPass();
+  // TODO: MLIR removed the promotion pass. Expose it to the command line.
+  // mlir::registerLinalgPromotionPass();
   // Test passes
-  mlir::test::registerTestLinalgCodegenStrategy();
+  // mlir::test::registerTestLinalgCodegenStrategy();
+
+  mlir::registerLinalgPasses();
 }
 
 // Register important affine passes