Skip to content

Commit fda9981

Browse files
author
Vladimir Radosavljevic
committed
[mlir] Update source after adding MLIR CAPI for Sol and Yul
Signed-off-by: Vladimir Radosavljevic <vr@matterlabs.dev>
1 parent ff9051e commit fda9981

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

libsolidity/codegen/mlir/Passes.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "mlir/Conversion/ReconcileUnrealizedCasts/ReconcileUnrealizedCasts.h"
2525
#include "mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h"
2626
#include "mlir/Dialect/LLVMIR/Transforms/Passes.h"
27-
#include "mlir/Dialect/Sol/Transforms/Immutables.h"
27+
#include "mlir/Dialect/Sol/Transforms/SolImmutables.h"
2828
#include "mlir/Pass/PassManager.h"
2929
#include "mlir/Target/LLVMIR/Dialect/Builtin/BuiltinToLLVMIRTranslation.h"
3030
#include "mlir/Target/LLVMIR/Dialect/LLVMIR/LLVMToLLVMIRTranslation.h"
@@ -49,8 +49,8 @@
4949
void solidity::mlirgen::addConversionPasses(mlir::PassManager &passMgr,
5050
Target tgt, bool enableDI) {
5151
passMgr.addPass(mlir::createCanonicalizerPass());
52-
passMgr.addPass(mlir::sol::createModifierOpLoweringPass());
53-
passMgr.addPass(mlir::sol::createConvertSolToStandardPass());
52+
passMgr.addPass(mlir::sol::createSolModifierOpLoweringPass());
53+
passMgr.addPass(mlir::createConvertSolToStandardPass());
5454
// Canonicalizer removes unreachable blocks, which is important for getting
5555
// the translation to llvm-ir working correctly.
5656
passMgr.addPass(mlir::createCanonicalizerPass());
@@ -274,8 +274,8 @@ std::string solidity::mlirgen::printJob(JobSpec const &job,
274274
case Action::PrintStandardMLIR:
275275
assert(job.tgt != Target::Undefined);
276276
passMgr.addPass(mlir::createCanonicalizerPass());
277-
passMgr.addPass(mlir::sol::createModifierOpLoweringPass());
278-
passMgr.addPass(mlir::sol::createConvertSolToStandardPass());
277+
passMgr.addPass(mlir::sol::createSolModifierOpLoweringPass());
278+
passMgr.addPass(mlir::createConvertSolToStandardPass());
279279
passMgr.addPass(mlir::createCanonicalizerPass());
280280
if (mlir::failed(passMgr.run(mod))) {
281281
mod.print(ss);

test/lit/mlirCodegen/Transforms/fuse-free-ptr.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: sol-opt -sol-fuse-free-ptr %s | FileCheck %s
1+
// RUN: sol-opt -yul-fuse-free-ptr %s | FileCheck %s
22

33
module {
44

tools/solOpt/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ int main(int argc, char **argv) {
4242
arith::ArithDialect, scf::SCFDialect>();
4343

4444
registerPass([](void) -> std::unique_ptr<Pass> {
45-
return sol::createLoopInvariantCodeMotionPass();
45+
return sol::createSolLoopInvariantCodeMotionPass();
4646
});
4747
registerPass([](void) -> std::unique_ptr<Pass> {
48-
return yul::createFuseFreePtrPass();
48+
return yul::createYulFuseFreePtrPass();
4949
});
5050

5151
registerTransformsPasses();

0 commit comments

Comments
 (0)