Merge pull request #7743 from rsuderman:main-to-google PiperOrigin-RevId: 412105918
diff --git a/SUBMODULE_VERSIONS.txt b/SUBMODULE_VERSIONS.txt index 202589e..42cc1e0 100644 --- a/SUBMODULE_VERSIONS.txt +++ b/SUBMODULE_VERSIONS.txt
@@ -4,7 +4,7 @@ aa533abfd4232b01f9e57041d70114d5a77e6de0 third_party/googletest 88b845dee001723c4a0db1fe5477de735b6d3bb0 third_party/liburing acd6f6f014c25e46363e718381e0b35205df2d83 third_party/libyaml -47e2644c89b3be6faa0f5cc4c70ef96ec295da9a third_party/llvm-project +d32787230d52af709d67a0583a15727054231a0a third_party/llvm-project 4a124ee092300d908f0adc343248bbf150c6d233 third_party/mlir-hlo 3f701faace7addc75d16dea8a6cd769fa5b3f260 third_party/musl 4c7697dbe973ed01ae6fbec37d186ebd05982e1f third_party/pybind11
diff --git a/iree/compiler/Codegen/Common/BUILD b/iree/compiler/Codegen/Common/BUILD index f0403b5..34549de 100644 --- a/iree/compiler/Codegen/Common/BUILD +++ b/iree/compiler/Codegen/Common/BUILD
@@ -87,8 +87,10 @@ "@llvm-project//mlir:SideEffectInterfaces", "@llvm-project//mlir:StandardOps", "@llvm-project//mlir:Support", + "@llvm-project//mlir:TensorBufferizableOpInterfaceImpl", "@llvm-project//mlir:TensorDialect", "@llvm-project//mlir:Transforms", + "@llvm-project//mlir:VectorBufferizableOpInterfaceImpl", "@llvm-project//mlir:VectorOps", ], )
diff --git a/iree/compiler/Codegen/Common/CMakeLists.txt b/iree/compiler/Codegen/Common/CMakeLists.txt index c7757e5..b5742e4 100644 --- a/iree/compiler/Codegen/Common/CMakeLists.txt +++ b/iree/compiler/Codegen/Common/CMakeLists.txt
@@ -66,8 +66,10 @@ MLIRStandard MLIRSupport MLIRTensor + MLIRTensorBufferizableOpInterfaceImpl MLIRTransforms MLIRVector + MLIRVectorBufferizableOpInterfaceImpl iree::compiler::Codegen::Common::FoldTensorExtractOpIncGen iree::compiler::Codegen::Dialect::IREECodegenDialect iree::compiler::Codegen::PassHeaders
diff --git a/iree/compiler/Codegen/Common/IREEComprehensiveBufferizePass.cpp b/iree/compiler/Codegen/Common/IREEComprehensiveBufferizePass.cpp index b767d8c..624b603 100644 --- a/iree/compiler/Codegen/Common/IREEComprehensiveBufferizePass.cpp +++ b/iree/compiler/Codegen/Common/IREEComprehensiveBufferizePass.cpp
@@ -33,6 +33,8 @@ #include "mlir/Dialect/Linalg/ComprehensiveBufferize/BufferizableOpInterface.h" #include "mlir/Dialect/Linalg/ComprehensiveBufferize/ComprehensiveBufferize.h" #include "mlir/Dialect/Linalg/ComprehensiveBufferize/LinalgInterfaceImpl.h" +#include "mlir/Dialect/Linalg/ComprehensiveBufferize/TensorInterfaceImpl.h" +#include "mlir/Dialect/Linalg/ComprehensiveBufferize/VectorInterfaceImpl.h" #include "mlir/Dialect/Linalg/IR/LinalgOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/MemRef/Transforms/Passes.h" @@ -251,6 +253,10 @@ registerBufferizableOpInterfaceExternalModels(registry); linalg::comprehensive_bufferize::linalg_ext:: registerBufferizableOpInterfaceExternalModels(registry); + linalg::comprehensive_bufferize::tensor_ext:: + registerBufferizableOpInterfaceExternalModels(registry); + linalg::comprehensive_bufferize::vector_ext:: + registerBufferizableOpInterfaceExternalModels(registry); // Register IREE operations. registry.addOpInterface<IREE::Flow::DispatchTensorLoadOp,
diff --git a/iree/tools/init_mlir_passes.h b/iree/tools/init_mlir_passes.h index 40b19d9..b3cba96 100644 --- a/iree/tools/init_mlir_passes.h +++ b/iree/tools/init_mlir_passes.h
@@ -46,7 +46,7 @@ registerAffineScalarReplacementPass(); registerParallelLoopCollapsingPass(); registerPrintOpStatsPass(); - registerViewOpGraphPassPass(); + registerViewOpGraphPass(); registerStripDebugInfoPass(); registerSymbolDCEPass();
diff --git a/third_party/llvm-project b/third_party/llvm-project index 47e2644..d327872 160000 --- a/third_party/llvm-project +++ b/third_party/llvm-project
@@ -1 +1 @@ -Subproject commit 47e2644c89b3be6faa0f5cc4c70ef96ec295da9a +Subproject commit d32787230d52af709d67a0583a15727054231a0a