diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2da2d64..000000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/iree.iml b/.idea/iree.iml deleted file mode 100644 index aad402c4e5ff..000000000000 --- a/.idea/iree.iml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index dc9ea4906e15..000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index b3133cabbe4c..000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 20e719faf293..000000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "last_opened_file_path": "/home/vivian/myfolk/megabump/work/iree" - } -} - - - - - 1712729921770 - - - - \ No newline at end of file diff --git a/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp b/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp index 15a0c6acd997..a8aae488f14a 100644 --- a/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp +++ b/compiler/src/iree/compiler/Codegen/Common/TransformExtensions/CommonExtensions.cpp @@ -253,7 +253,7 @@ void transform_dialect::ApplyBubbleExpandPatternsOp::populatePatterns( void transform_dialect::ApplyBubblePackUnpackPatternsOp::populatePatterns( RewritePatternSet &patterns) { linalg::populateDataLayoutPropagationPatterns( - patterns, [](Operation *op) { return true; }); + patterns, [](OpOperand *opOperand) { return true; }); } void transform_dialect::ApplyFoldReshapeIntoTensorHalInterfacePatternsOp:: diff --git a/compiler/src/iree/compiler/Codegen/Dialect/GPU/Transforms/PackToIntrinsics.cpp b/compiler/src/iree/compiler/Codegen/Dialect/GPU/Transforms/PackToIntrinsics.cpp index 91977fbe1d28..6b33d003c0b9 100644 --- a/compiler/src/iree/compiler/Codegen/Dialect/GPU/Transforms/PackToIntrinsics.cpp +++ b/compiler/src/iree/compiler/Codegen/Dialect/GPU/Transforms/PackToIntrinsics.cpp @@ -97,8 +97,8 @@ void PackToIntrinsicsPass::runOnOperation() { // Run layout propagation patterns to pull in adjacent un-configured ops. RewritePatternSet patterns(context); - linalg::ControlPropagationFn control = [](Operation *op) -> bool { - return !getLoweringConfig(op); + linalg::ControlPropagationFn control = [](OpOperand *opOperand) -> bool { + return !getLoweringConfig(opOperand->getOwner()); }; linalg::populateDataLayoutPropagationPatterns(patterns, control); diff --git a/compiler/src/iree/compiler/GlobalOptimization/DataLayoutPropagation.cpp b/compiler/src/iree/compiler/GlobalOptimization/DataLayoutPropagation.cpp index 43d68005b364..5ac7c68abf2e 100644 --- a/compiler/src/iree/compiler/GlobalOptimization/DataLayoutPropagation.cpp +++ b/compiler/src/iree/compiler/GlobalOptimization/DataLayoutPropagation.cpp @@ -23,14 +23,15 @@ struct DataLayoutPropagationPass FunctionOpInterface funcOp = getOperation(); RewritePatternSet patterns(context); - linalg::populateDataLayoutPropagationPatterns(patterns, [](Operation *op) { - // Currently only bubble up/push down pack/unpack through collapse/expand - // shape ops. - // TODO(#17734): The propagation through expand_shape ops is broken. - // Enable the propagation once we find it useful and the upstream issue is - // fixed. - return isa(op); - }); + linalg::populateDataLayoutPropagationPatterns( + patterns, [](OpOperand *opOperand) { + // Currently only bubble up/push down pack/unpack through + // collapse/expand shape ops. + // TODO(#17734): The propagation through expand_shape ops is broken. + // Enable the propagation once we find it useful and the upstream + // issue is fixed. + return isa(opOperand->getOwner()); + }); if (failed(applyPatternsAndFoldGreedily(funcOp, std::move(patterns)))) { funcOp.emitOpError("folding patterns failed"); return signalPassFailure(); diff --git a/compiler/src/iree/compiler/GlobalOptimization/GeneralizeLinalgNamedOps.cpp b/compiler/src/iree/compiler/GlobalOptimization/GeneralizeLinalgNamedOps.cpp index 3ab937a95aed..5f30902c7e2f 100644 --- a/compiler/src/iree/compiler/GlobalOptimization/GeneralizeLinalgNamedOps.cpp +++ b/compiler/src/iree/compiler/GlobalOptimization/GeneralizeLinalgNamedOps.cpp @@ -40,7 +40,7 @@ void GeneralizeLinalgNamedOpsPass::runOnOperation() { linalg::DivUnsignedOp, linalg::ElemwiseBinaryOp, linalg::ElemwiseUnaryOp, linalg::ExpOp, linalg::FloorOp, linalg::LogOp, linalg::MapOp, linalg::MaxOp, - linalg::MulOp, linalg::NegfOp, linalg::ReduceOp, + linalg::MulOp, linalg::NegFOp, linalg::ReduceOp, linalg::SubOp, linalg::TransposeOp>( linalgOp.getOperation())) { namedOpCandidates.push_back(linalgOp); diff --git a/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp b/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp index ac41bd84383d..cdef9148d51a 100644 --- a/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp +++ b/compiler/src/iree/compiler/Preprocessing/Common/ConvertConvToChannelsLast.cpp @@ -686,7 +686,7 @@ class ConvertConvToChannelsLastPass GreedyRewriteConfig config; config.maxIterations = GreedyRewriteConfig::kNoLimit; linalg::populateDataLayoutPropagationPatterns( - patterns, [](Operation *op) { return true; }); + patterns, [](OpOperand *opOperand) { return true; }); if (failed( applyPatternsAndFoldGreedily(op, std::move(patterns), config))) { return signalPassFailure();