Skip to content

Commit

Permalink
Integrate llvm 20231012 (#15163)
Browse files Browse the repository at this point in the history
Carrying local reverts for:

* #15083 (fixes still being made)
* llvm/llvm-project#67816 while we sync to a
corresponding TF version
* llvm/llvm-project#67809, which has already
been reverted at HEAD and will drop on its own

Landing with local revert: #15207

---------

Co-authored-by: Kunwar Grover <groverkss@gmail.com>
Co-authored-by: Julian Walker <julianreidwalker@gmail.com>
  • Loading branch information
3 people authored Oct 16, 2023
1 parent acddd0c commit 46a2305
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 14 deletions.
Binary file added a.out
Binary file not shown.
7 changes: 3 additions & 4 deletions compiler/src/iree/compiler/Codegen/Common/Passes.td
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 3 additions & 4 deletions compiler/src/iree/compiler/Dialect/Flow/Transforms/Passes.td
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/iree/compiler/InputConversion/TOSA/Passes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void buildTOSAInputConversionPassPipeline(OpPassManager &passManager) {
iree_compiler::createTosaToLinalgExt());
passManager.addNestedPass<func::FuncOp>(mlir::createCanonicalizerPass());

tosa::addTosaToLinalgPasses(passManager);
tosa::addTosaToLinalgPasses(passManager, TosaToLinalgOptions());
passManager.addNestedPass<func::FuncOp>(
iree_compiler::createConverti48Toi64());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string> transformLibraryFileName{
*this, "transform-library-file-name",
Pass::ListOption<std::string> 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<DropSchedulePass, Pass> {
Expand Down
2 changes: 1 addition & 1 deletion third_party/llvm-project

0 comments on commit 46a2305

Please sign in to comment.