diff --git a/a.out b/a.out new file mode 100755 index 000000000000..b3d4e8071045 Binary files /dev/null and b/a.out differ diff --git a/compiler/src/iree/compiler/Codegen/Common/Passes.td b/compiler/src/iree/compiler/Codegen/Common/Passes.td index d56d109e9556..40edf1c2f302 100644 --- a/compiler/src/iree/compiler/Codegen/Common/Passes.td +++ b/compiler/src/iree/compiler/Codegen/Common/Passes.td @@ -442,11 +442,10 @@ def TransformDialectInterpreter : "Optional filename containing a transform dialect specification to " "apply. If left empty, the IR is assumed to contain one top-level " "transform dialect operation somewhere in the module.">, - Option<"transformLibraryFileName", - "transform-library-file-name", + ListOption<"transformLibraryPaths", + "transform-library-paths", "std::string", - /*default=*/"\"\"", - "If non-empty, the name of the file containing definitions of " + "If non-empty, the paths to files containing definitions of " "external symbols referenced in the transform script. " "These definitions will be used to replace declarations.">, Option<"debugPayloadRootTag", "debug-payload-root-tag", "std::string", diff --git a/compiler/src/iree/compiler/Dialect/Flow/Transforms/Passes.td b/compiler/src/iree/compiler/Dialect/Flow/Transforms/Passes.td index 2591ff803c65..1b3edf448009 100644 --- a/compiler/src/iree/compiler/Dialect/Flow/Transforms/Passes.td +++ b/compiler/src/iree/compiler/Dialect/Flow/Transforms/Passes.td @@ -136,11 +136,10 @@ def DispatchWithTransformDialect : "Optional filename containing a transform dialect specification to " "apply. If left empty, the IR is assumed to contain one top-level " "transform dialect operation somewhere in the module.">, - Option<"transformLibraryFileName", - "transform-library-file-name", + ListOption<"transformLibraryPaths", + "transform-library-paths", "std::string", - /*default=*/"\"\"", - "If non-empty, the name of the file containing definitions of " + "If non-empty, the paths to files containing definitions of " "external symbols referenced in the transform script. " "These definitions will be used to replace declarations.">, Option<"debugPayloadRootTag", "debug-payload-root-tag", "std::string", diff --git a/compiler/src/iree/compiler/InputConversion/TOSA/Passes.cpp b/compiler/src/iree/compiler/InputConversion/TOSA/Passes.cpp index 0b28c9294d07..a55935029c25 100644 --- a/compiler/src/iree/compiler/InputConversion/TOSA/Passes.cpp +++ b/compiler/src/iree/compiler/InputConversion/TOSA/Passes.cpp @@ -49,7 +49,7 @@ void buildTOSAInputConversionPassPipeline(OpPassManager &passManager) { iree_compiler::createTosaToLinalgExt()); passManager.addNestedPass(mlir::createCanonicalizerPass()); - tosa::addTosaToLinalgPasses(passManager); + tosa::addTosaToLinalgPasses(passManager, TosaToLinalgOptions()); passManager.addNestedPass( iree_compiler::createConverti48Toi64()); diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/Passes/TransformInterpreter.cpp b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/Passes/TransformInterpreter.cpp index 26c4777e8520..4d78e418ca4f 100644 --- a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/Passes/TransformInterpreter.cpp +++ b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/Passes/TransformInterpreter.cpp @@ -119,12 +119,11 @@ class TransformDialectInterpreter "Select the operation with 'transform.target_tag' attribute having " "the given value as container IR for top-level transform ops."), ::llvm::cl::init("")}; - Pass::Option transformLibraryFileName{ - *this, "transform-library-file-name", + Pass::ListOption transformLibraryPaths{ + *this, "transform-library-paths", llvm::cl::ZeroOrMore, llvm::cl::desc( "Optional name of the file containing transform dialect symbol " - "definitions to be injected into the transform module."), - llvm::cl::init("")}; + "definitions to be injected into the transform module.")}; }; struct DropSchedulePass : public PassWrapper { diff --git a/third_party/llvm-project b/third_party/llvm-project index 1151cc387a4f..be444b6640c7 160000 --- a/third_party/llvm-project +++ b/third_party/llvm-project @@ -1 +1 @@ -Subproject commit 1151cc387a4ff519f2fc70d37137505a448df829 +Subproject commit be444b6640c715476e405da8518ce204520aded8