diff --git a/mlir-compiler/llvm-sha.txt b/mlir-compiler/llvm-sha.txt index e0624e4fe90..0dea32271e1 100644 --- a/mlir-compiler/llvm-sha.txt +++ b/mlir-compiler/llvm-sha.txt @@ -1 +1 @@ -7d09e1d7cf27ce781e83f9d388a7a3e1e6487ead +7b153b43d3a14d76975039408c4b922beb576735 diff --git a/mlir-compiler/mlir-compiler/CMakeLists.txt b/mlir-compiler/mlir-compiler/CMakeLists.txt index 136b40f02d6..791d54fef3a 100644 --- a/mlir-compiler/mlir-compiler/CMakeLists.txt +++ b/mlir-compiler/mlir-compiler/CMakeLists.txt @@ -58,7 +58,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE LLVMTarget MLIRIR MLIRLLVMIR - MLIRTargetLLVMIR + MLIRLLVMToLLVMIRTranslation MLIRTransforms MLIRStandardOpsTransforms MLIRLinalgTransforms diff --git a/mlir-compiler/mlir-compiler/src/lowering.cpp b/mlir-compiler/mlir-compiler/src/lowering.cpp index 96c0bcf92cc..6c34ac75278 100644 --- a/mlir-compiler/mlir-compiler/src/lowering.cpp +++ b/mlir-compiler/mlir-compiler/src/lowering.cpp @@ -12,8 +12,8 @@ #include #include -#include #include +#include #include diff --git a/mlir-compiler/mlir-compiler/src/pipelines/lower_to_llvm.cpp b/mlir-compiler/mlir-compiler/src/pipelines/lower_to_llvm.cpp index c8d0badad17..70e94013769 100644 --- a/mlir-compiler/mlir-compiler/src/pipelines/lower_to_llvm.cpp +++ b/mlir-compiler/mlir-compiler/src/pipelines/lower_to_llvm.cpp @@ -587,7 +587,7 @@ struct ApplyFastmathFlags : public mlir::OpRewritePattern }); if (changed) { - op.fastmathFlagsAttr(mlir::LLVM::FMFAttr::get(fmf, op.getContext())); + op.fastmathFlagsAttr(mlir::LLVM::FMFAttr::get(op.getContext(), fmf)); rewriter.finalizeRootUpdate(op); } else diff --git a/mlir-compiler/plier/CMakeLists.txt b/mlir-compiler/plier/CMakeLists.txt index efa093339f1..0d62fb8b4fa 100644 --- a/mlir-compiler/plier/CMakeLists.txt +++ b/mlir-compiler/plier/CMakeLists.txt @@ -70,7 +70,6 @@ target_compile_definitions(${PLIER_LIB} PRIVATE ${LLVM_DEFINITIONS}) target_link_libraries(${PLIER_LIB} PRIVATE MLIRIR MLIRLLVMIR - MLIRTargetLLVMIR MLIRTransforms MLIRStandardOpsTransforms MLIRLinalgTransforms diff --git a/mlir-compiler/plier/include/plier/PlierOps.td b/mlir-compiler/plier/include/plier/PlierOps.td index 0c2f71efa93..3c222966ef3 100644 --- a/mlir-compiler/plier/include/plier/PlierOps.td +++ b/mlir-compiler/plier/include/plier/PlierOps.td @@ -28,7 +28,7 @@ def ArgOp : Plier_Op<"arg", [NoSideEffect]> { let hasFolder = 1; let builders = [ - OpBuilderDAG<(ins "unsigned":$index, "::mlir::StringRef":$name)> + OpBuilder<(ins "unsigned":$index, "::mlir::StringRef":$name)> ]; } @@ -39,7 +39,7 @@ def ConstOp : Plier_Op<"const", [NoSideEffect]> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::Attribute":$val)> + OpBuilder<(ins "::mlir::Attribute":$val)> ]; } @@ -50,7 +50,7 @@ def GlobalOp : Plier_Op<"global", [NoSideEffect]> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::StringRef":$name)> + OpBuilder<(ins "::mlir::StringRef":$name)> ]; } @@ -63,7 +63,7 @@ def BinOp : Plier_Op<"binop", []> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$lhs, "::mlir::Value":$rhs, "::mlir::StringRef ":$op)> + OpBuilder<(ins "::mlir::Value":$lhs, "::mlir::Value":$rhs, "::mlir::StringRef ":$op)> ]; } @@ -75,7 +75,7 @@ def UnaryOp : Plier_Op<"unary", []> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value, "::mlir::StringRef ":$op)> + OpBuilder<(ins "::mlir::Value":$value, "::mlir::StringRef ":$op)> ]; } @@ -98,7 +98,7 @@ def PyCallOp : Plier_Op<"call", []> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$func, "::mlir::StringRef":$func_name, + OpBuilder<(ins "::mlir::Value":$func, "::mlir::StringRef":$func_name, "::mlir::ValueRange":$args, "::mlir::ArrayRef>":$kwargs)> ]; @@ -111,7 +111,7 @@ def BuildTupleOp : Plier_Op<"build_tuple", [NoSideEffect]> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::ValueRange":$args)> + OpBuilder<(ins "::mlir::ValueRange":$args)> ]; } @@ -124,7 +124,7 @@ def GetItemOp : Plier_Op<"getitem", []> { let hasFolder = 1; let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value, "::mlir::Value":$index)> + OpBuilder<(ins "::mlir::Value":$value, "::mlir::Value":$index)> ]; } @@ -138,7 +138,7 @@ def StaticGetItemOp : Plier_Op<"static_getitem", []> { let hasFolder = 1; let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value, "::mlir::Value":$index_var, "unsigned":$index)> + OpBuilder<(ins "::mlir::Value":$value, "::mlir::Value":$index_var, "unsigned":$index)> ]; } @@ -158,7 +158,7 @@ def GetiterOp : Plier_Op<"getiter", [NoSideEffect]> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value)> + OpBuilder<(ins "::mlir::Value":$value)> ]; } @@ -169,7 +169,7 @@ def IternextOp : Plier_Op<"iternext", []> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value)> + OpBuilder<(ins "::mlir::Value":$value)> ]; } @@ -180,7 +180,7 @@ def PairfirstOp : Plier_Op<"pair_first", [NoSideEffect]> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value)> + OpBuilder<(ins "::mlir::Value":$value)> ]; } @@ -191,7 +191,7 @@ def PairsecondOp : Plier_Op<"pair_second", [NoSideEffect]> { let results = (outs AnyType); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value)> + OpBuilder<(ins "::mlir::Value":$value)> ]; } @@ -210,7 +210,7 @@ def GetattrOp : Plier_Op<"getattr", [NoSideEffect]> { let hasCanonicalizer = 1; let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value, "::mlir::StringRef":$name)> + OpBuilder<(ins "::mlir::Value":$value, "::mlir::StringRef":$name)> ]; } @@ -221,7 +221,7 @@ def EnforceShapeOp : Plier_Op<"enforce_shape"> { let results = (outs AnyRankedTensor:$result); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value, "::mlir::ValueRange":$shape)> + OpBuilder<(ins "::mlir::Value":$value, "::mlir::ValueRange":$shape)> ]; let hasFolder = 1; @@ -234,7 +234,7 @@ def RetainOp : Plier_Op<"retain"> { let results = (outs Res]>:$memref); let builders = [ - OpBuilderDAG<(ins "::mlir::Value":$value)> + OpBuilder<(ins "::mlir::Value":$value)> ]; } @@ -251,7 +251,7 @@ def ParallelOp : Plier_Op<"parallel", let skipDefaultBuilders = 1; let builders = [ - OpBuilderDAG<(ins "::mlir::ValueRange":$lowerBounds, "::mlir::ValueRange":$upperBounds, "::mlir::ValueRange":$steps, + OpBuilder<(ins "::mlir::ValueRange":$lowerBounds, "::mlir::ValueRange":$upperBounds, "::mlir::ValueRange":$steps, CArg<"::mlir::function_ref", "nullptr">)> ]; @@ -264,7 +264,7 @@ def ParallelOp : Plier_Op<"parallel", def YieldOp : Plier_Op<"yield", [NoSideEffect, ReturnLike, Terminator, ParentOneOf<["ParallelOp"]>]> { let arguments = (ins Variadic:$results); - let builders = [OpBuilderDAG<(ins), [{ /* nothing to do */ }]>]; + let builders = [OpBuilder<(ins), [{ /* nothing to do */ }]>]; // Override default verifier (defined in SCF_Op), no custom verification // needed. let verifier = ?;