[mlir][Sol][yul] Add support for CAPI

Migrate passes to tablegen-generated definitions to expose them
through the MLIR C API. Add CAPI dialect registration and pass
bindings for Sol and Yul. Rename source files to use
dialect-prefixed convention. Register both dialects in
InitAllDialects.h.

Signed-off-by: Vladimir Radosavljevic <vr@matterlabs.dev>

Author: vladimirradosavljevic

mlir/include/mlir-c/Dialect/Sol.h

@@ -0,0 +1,36 @@
+//===-- mlir-c/Dialect/Sol.h - C API for Sol dialect --------------*- C -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef MLIR_C_DIALECT_SOL_H
+#define MLIR_C_DIALECT_SOL_H
+
+#include "mlir-c/IR.h"
+#include "mlir-c/Support.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+MLIR_DECLARE_CAPI_DIALECT_REGISTRATION(Sol, sol);
+
+/// Lowers llvm.setimmutable ops using the provided immutable offset map.
+MLIR_CAPI_EXPORTED void mlirEvmLowerSetImmutables(MlirModule mod,
+                                                  const char **immIDs,
+                                                  const uint64_t *immOffsets,
+                                                  uint64_t immCount);
+
+/// Removes all llvm.setimmutable ops.
+MLIR_CAPI_EXPORTED void mlirEvmRemoveSetImmutables(MlirModule mod);
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "mlir/Dialect/Sol/Transforms/Passes.capi.h.inc"
+
+#endif // MLIR_C_DIALECT_SOL_H

mlir/include/mlir-c/Dialect/Yul.h

@@ -0,0 +1,27 @@
+//===-- mlir-c/Dialect/Yul.h - C API for Yul dialect --------------*- C -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef MLIR_C_DIALECT_YUL_H
+#define MLIR_C_DIALECT_YUL_H
+
+#include "mlir-c/IR.h"
+#include "mlir-c/Support.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+MLIR_DECLARE_CAPI_DIALECT_REGISTRATION(Yul, yul);
+
+#ifdef __cplusplus
+}
+#endif
+
+#include "mlir/Dialect/Yul/Transforms/Passes.capi.h.inc"
+
+#endif // MLIR_C_DIALECT_YUL_H

mlir/include/mlir/Conversion/Passes.h

@@ -65,6 +65,9 @@
 #include "mlir/Conversion/SCFToSPIRV/SCFToSPIRVPass.h"
 #include "mlir/Conversion/SPIRVToLLVM/SPIRVToLLVMPass.h"
 #include "mlir/Conversion/ShapeToStandard/ShapeToStandard.h"
+// EVM local begin
+#include "mlir/Conversion/SolToStandard/SolToStandard.h"
+// EVM local end
 #include "mlir/Conversion/TensorToLinalg/TensorToLinalgPass.h"
 #include "mlir/Conversion/TensorToSPIRV/TensorToSPIRVPass.h"
 #include "mlir/Conversion/TosaToArith/TosaToArith.h"

mlir/include/mlir/Conversion/Passes.td

@@ -1504,4 +1504,22 @@ def ConvertXeVMToLLVMPass : Pass<"convert-xevm-to-llvm"> {
   let dependentDialects = ["LLVM::LLVMDialect"];
 }
 
+// EVM local begin
+//===----------------------------------------------------------------------===//
+// SolToStandard
+//===----------------------------------------------------------------------===//
+
+def ConvertSolToStandard : Pass<"convert-sol-to-std", "ModuleOp"> {
+  let summary = "Convert Sol dialect to standard dialects";
+  let dependentDialects = [
+    "yul::YulDialect",
+    "func::FuncDialect",
+    "scf::SCFDialect",
+    "cf::ControlFlowDialect",
+    "arith::ArithDialect",
+    "LLVM::LLVMDialect",
+  ];
+}
+// EVM local end
+
 #endif // MLIR_CONVERSION_PASSES

mlir/include/mlir/Conversion/SolToStandard/SolToStandard.h

@@ -22,12 +22,9 @@ class Pass;
 class TypeConverter;
 class RewritePatternSet;
 
-namespace sol {
+#define GEN_PASS_DECL_CONVERTSOLTOSTANDARD
+#include "mlir/Conversion/Passes.h.inc"
 
-/// Creates a pass to lower sol dialect to standard dialects.
-std::unique_ptr<Pass> createConvertSolToStandardPass();
-
-} // namespace sol
 } // namespace mlir
 
 #endif // MLIR_CONVERSION_SOLTOSTANDARD_SOLTOSTANDARD_H

mlir/include/mlir/Dialect/Sol/CMakeLists.txt

@@ -21,6 +21,12 @@ mlir_tablegen(SolCanonicalization.inc -gen-rewriters)
 # Create MLIRSolExtraIncGen.
 add_public_tablegen_target(MLIRSolExtraIncGen)
 
+set(LLVM_TARGET_DEFINITIONS Transforms/Passes.td)
+mlir_tablegen(Transforms/Passes.h.inc -gen-pass-decls -name Sol)
+mlir_tablegen(Transforms/Passes.capi.h.inc -gen-pass-capi-header --prefix Sol)
+mlir_tablegen(Transforms/Passes.capi.cpp.inc -gen-pass-capi-impl --prefix Sol)
+add_public_tablegen_target(MLIRSolPassIncGen)
+
 # Generate the docs
 add_mlir_doc(SolDialect SolDialect Sol/ -gen-dialect-doc)
 add_mlir_doc(SolOps SolOps Sol/ -gen-op-doc)

mlir/include/mlir/Dialect/Sol/Transforms/Passes.h

@@ -14,16 +14,15 @@
 #define MLIR_DIALECT_SOL_TRANSFORMS_PASSES_H
 
 #include "mlir/Pass/Pass.h"
-#include <memory>
 
 namespace mlir {
 namespace sol {
 
-/// Creates a pass that lowers modifier-related ops.
-std::unique_ptr<Pass> createModifierOpLoweringPass();
+#define GEN_PASS_DECL
+#include "mlir/Dialect/Sol/Transforms/Passes.h.inc"
 
-/// Creates a pass for loop invariant code motion.
-std::unique_ptr<Pass> createLoopInvariantCodeMotionPass();
+#define GEN_PASS_REGISTRATION
+#include "mlir/Dialect/Sol/Transforms/Passes.h.inc"
 
 } // namespace sol
 } // namespace mlir

mlir/include/mlir/Dialect/Sol/Transforms/Passes.td

@@ -0,0 +1,22 @@
+//===-- Passes.td - Sol pass definition file ---------------*- tablegen -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef MLIR_DIALECT_SOL_TRANSFORMS_PASSES
+#define MLIR_DIALECT_SOL_TRANSFORMS_PASSES
+
+include "mlir/Pass/PassBase.td"
+
+def SolModifierOpLowering : Pass<"sol-lower-modifier", "ModuleOp"> {
+  let summary = "Lower modifier-related ops in the Sol dialect";
+}
+
+def SolLoopInvariantCodeMotion : Pass<"sol-licm"> {
+  let summary = "Loop invariant code motion for the Sol dialect";
+}
+
+#endif

…mlir/Dialect/Sol/Transforms/Immutables.h …r/Dialect/Sol/Transforms/SolImmutables.hmlir/include/mlir/Dialect/Sol/Transforms/Immutables.h renamed to mlir/include/mlir/Dialect/Sol/Transforms/SolImmutables.h mlir/include/mlir/Dialect/Sol/Transforms/Immutables.h renamed to mlir/include/mlir/Dialect/Sol/Transforms/SolImmutables.h

@@ -1,4 +1,4 @@
-//===- Immutables.h - Solidity immutable lowering ---------------*- C++ -*-===//
+//===- SolImmutables.h - Solidity immutable lowering ------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_SOL_TRANSFORMS_IMMUTABLES_H
-#define MLIR_DIALECT_SOL_TRANSFORMS_IMMUTABLES_H
+#ifndef MLIR_DIALECT_SOL_TRANSFORMS_SOLIMMUTABLES_H
+#define MLIR_DIALECT_SOL_TRANSFORMS_SOLIMMUTABLES_H
 
 #include "mlir/IR/BuiltinOps.h"
 #include "llvm/ADT/SmallVector.h"
@@ -31,4 +31,4 @@ void removeSetImmutables(ModuleOp mod);
 } // namespace evm
 } // namespace mlir
 
-#endif // MLIR_DIALECT_SOL_TRANSFORMS_IMMUTABLES_H
+#endif // MLIR_DIALECT_SOL_TRANSFORMS_SOLIMMUTABLES_H

mlir/include/mlir/Dialect/Yul/CMakeLists.txt

@@ -7,3 +7,9 @@ set(LLVM_TARGET_DEFINITIONS YulOps.td)
 # Generate documentation.
 add_mlir_doc(YulDialect YulDialect Yul/ -gen-dialect-doc)
 add_mlir_doc(YulOps YulOps Yul/ -gen-op-doc)
+
+set(LLVM_TARGET_DEFINITIONS Transforms/Passes.td)
+mlir_tablegen(Transforms/Passes.h.inc -gen-pass-decls -name Yul)
+mlir_tablegen(Transforms/Passes.capi.h.inc -gen-pass-capi-header --prefix Yul)
+mlir_tablegen(Transforms/Passes.capi.cpp.inc -gen-pass-capi-impl --prefix Yul)
+add_public_tablegen_target(MLIRYulPassIncGen)