Skip to content

[DO NOT SUBMIT] Fixes for LLVM PR https://github.com/llvm/llvm-project/pull/162924 #22439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[DO NOT SUBMIT] Fixes for LLVM PR https://github.com/llvm/llvm-project/pull/162924 #22439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/iree/compiler/Codegen/Dialect/Codegen/IR/IREECodegenOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def IREECodegen_NullPointerOp :

def IREECodegen_LoadFromBufferOp : Op<IREECodegen_Dialect, "load_from_buffer",
[DeclareOpInterfaceMethods<MemoryEffectsOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>]> {
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>]> {
let summary = [{Loads a tensor from a memref.}];
let description = [{
Loads a tensor from a memref with a compatible shape and the same element
Expand Down
4 changes: 2 additions & 2 deletions compiler/src/iree/compiler/Dialect/Encoding/IR/EncodingOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class IREEEncoding_PureOp<string mnemonic, list<Trait> traits = []> :
//===----------------------------------------------------------------------===//

def IREEEncoding_SetEncodingOp : IREEEncoding_PureOp<"set_encoding",[
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>, Pure
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>, Pure
]> {
let summary = [{Perform pack and pad operation on source.}];
let description = [{
Expand Down Expand Up @@ -57,7 +57,7 @@ def IREEEncoding_SetEncodingOp : IREEEncoding_PureOp<"set_encoding",[
//===----------------------------------------------------------------------===//

def IREEEncoding_UnsetEncodingOp : IREEEncoding_PureOp<"unset_encoding", [
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>, Pure
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>, Pure
]> {
let summary = [{Perform unpack and extract operation on source.}];
let description = [{
Expand Down
6 changes: 3 additions & 3 deletions compiler/src/iree/compiler/Dialect/Flow/IR/FlowOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def OpGroupPartitionedRegionOps : OpDocGroup {
let opDocGroup = OpGroupPartitionedRegionOps in {

def FLOW_DispatchRegionOp : FLOW_PureOp<"dispatch.region", [
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
Util_ShapeAwareOp,
AttrSizedOperandSegments]> {
let summary = [{A grouping of ops with implicit capture.}];
Expand Down Expand Up @@ -356,7 +356,7 @@ def FLOW_DispatchWorkgroupSizeOp : FLOW_PureOp<"dispatch.workgroup.size", [

def FLOW_DispatchTieShapeOp : FLOW_PureOp<"dispatch.tie_shape", [
AllTypesMatch<["operand", "result"]>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
Util_ShapeAwareOp,
]> {
let summary = [{Ties a runtime shape to a dispatch I/O argument.}];
Expand Down Expand Up @@ -886,7 +886,7 @@ def FLOW_TensorDynamicConstantOp : FLOW_Op<"tensor.dynamic_constant"> {

def FLOW_TensorTieShapeOp : FLOW_PureOp<"tensor.tie_shape", [
AllTypesMatch<["operand", "result"]>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
Util_ShapeAwareOp,
]> {
let summary = [{Ties a runtime shape to a tensor value.}];
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/iree/compiler/Dialect/HAL/IR/HALOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3493,7 +3493,7 @@ def HAL_InterfaceConstantLoadOp : HAL_PureOp<"interface.constant.load"> {

def HAL_InterfaceBindingSubspanOp : HAL_PureOp<"interface.binding.subspan", [
AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
Util_ShapeAwareOp,
]> {
let summary = [{Returns an alias to a subspan of interface binding data.}];
Expand Down
32 changes: 16 additions & 16 deletions compiler/src/iree/compiler/Dialect/LinalgExt/IR/LinalgExtOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ let opDocGroup = OpGroupNonStructuredOps in {

def IREELinalgExt_ScatterOp : IREELinalgExt_Op<"scatter",
[AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<LinalgFusionInterface,
["getIndexingMapsForResults", "getIndexingMapsForOperands",
"getStaticLoopRanges"]>,
Expand Down Expand Up @@ -178,7 +178,7 @@ def IREELinalgExt_ScatterOp : IREELinalgExt_Op<"scatter",

def IREELinalgExt_GatherOp : IREELinalgExt_Op<"gather",
[AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<LinalgFusionInterface,
["getIndexingMapsForResults", "getIndexingMapsForOperands",
"getStaticLoopRanges"]>,
Expand Down Expand Up @@ -375,7 +375,7 @@ def IREELinalgExt_MapScatterOp : IREELinalgExt_Op<"map_scatter",

def IREELinalgExt_SortOp : IREELinalgExt_Op<"sort",
[AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<TilingInterface,
["generateScalarImplementation",
"getIterationDomain",
Expand Down Expand Up @@ -429,7 +429,7 @@ def IREELinalgExt_SortOp : IREELinalgExt_Op<"sort",

def IREELinalgExt_FftOp : IREELinalgExt_Op<"fft", [
AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<TilingInterface,
["generateScalarImplementation",
"getIterationDomain",
Expand Down Expand Up @@ -500,7 +500,7 @@ def IREELinalgExt_FftOp : IREELinalgExt_Op<"fft", [

def IREELinalgExt_ScanOp : IREELinalgExt_Op<"scan",
[AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<TilingInterface,
["generateScalarImplementation",
"getIterationDomain",
Expand Down Expand Up @@ -557,7 +557,7 @@ def IREELinalgExt_ScanOp : IREELinalgExt_Op<"scan",

def IREELinalgExt_TopkOp : IREELinalgExt_Op<"topk",[
AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<LinalgExtInterface>,
DeclareOpInterfaceMethods<TilingInterface,
["generateScalarImplementation",
Expand Down Expand Up @@ -635,7 +635,7 @@ def IREELinalgExt_TopkOp : IREELinalgExt_Op<"topk",[

def IREELinalgExt_ArgCompareOp : IREELinalgExt_Op<"arg_compare", [
AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<LinalgFusionInterface,
["getIndexingMapsForResults", "getIndexingMapsForOperands",
"getStaticLoopRanges"]>,
Expand Down Expand Up @@ -769,7 +769,7 @@ def IREELinalgExt_AttentionOp : IREELinalgExt_Op<"attention",
["getIndexingMapsForResults", "getIndexingMapsForOperands",
"getStaticLoopRanges"]>,
DeclareOpInterfaceMethods<IndexingMapOpInterface, ["getMatchingIndexingMap"]>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<AggregatedOpInterface, ["decomposeOperation"]>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
Expand Down Expand Up @@ -876,7 +876,7 @@ def IREELinalgExt_AttentionOp : IREELinalgExt_Op<"attention",

def IREELinalgExt_OnlineAttentionOp : IREELinalgExt_Op<"online_attention",
[IndexingMapOpInterface,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<AggregatedOpInterface, ["decomposeOperation"]>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
Expand Down Expand Up @@ -1164,7 +1164,7 @@ def IREELinalgExt_ExpReductionOp : IREELinalgExt_Op<"exp_reduction",

def IREELinalgExt_Im2colOp : IREELinalgExt_Op<"im2col",
[AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<AggregatedOpInterface, ["decomposeOperation"]>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
Expand Down Expand Up @@ -1360,7 +1360,7 @@ let opDocGroup = OpGroupDataTilingOps in {

def IREELinalgExt_PackOp : IREELinalgExt_Op<"pack", [
AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<LinalgExtInterface>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
Expand Down Expand Up @@ -1524,7 +1524,7 @@ def IREELinalgExt_PackOp : IREELinalgExt_Op<"pack", [

def IREELinalgExt_UnPackOp : IREELinalgExt_Op<"unpack", [
AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<LinalgExtInterface>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
Expand Down Expand Up @@ -1659,7 +1659,7 @@ let opDocGroup = OpGroupWinogradOps in {

def IREELinalgExt_WinogradInputTransformOp : IREELinalgExt_Op<"winograd.input_transform",
[AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
"getLoopIteratorTypes",
Expand Down Expand Up @@ -1765,7 +1765,7 @@ def IREELinalgExt_WinogradInputTransformOp : IREELinalgExt_Op<"winograd.input_tr

def IREELinalgExt_WinogradFilterTransformOp : IREELinalgExt_Op<"winograd.filter_transform",
[AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
"getLoopIteratorTypes",
Expand Down Expand Up @@ -1876,7 +1876,7 @@ def IREELinalgExt_WinogradFilterTransformOp : IREELinalgExt_Op<"winograd.filter_

def IREELinalgExt_WinogradOutputTransformOp : IREELinalgExt_Op<"winograd.output_transform",
[AttrSizedOperandSegments,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
"getLoopIteratorTypes",
Expand Down Expand Up @@ -1995,7 +1995,7 @@ def IREELinalgExt_CustomOp : IREELinalgExt_Op<"custom_op", [
DeclareOpInterfaceMethods<AggregatedOpInterface, [
"decomposeOperation"]>,
DeclareOpInterfaceMethods<LinalgFusionInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<TilingInterface,
["getIterationDomain",
"getLoopIteratorTypes",
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/iree/compiler/Dialect/TensorExt/IR/TensorExtOps.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def IREETensorExt_BitCastOp : IREETensorExt_PureOp<"bitcast", [
def IREETensorExt_DispatchTensorLoadOp : IREETensorExt_PureOp<"dispatch.tensor.load", [
AttrSizedOperandSegments,
OffsetSizeAndStrideOpInterface,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
DeclareOpInterfaceMethods<Util_TiedOpInterface, [
"getTiedResult",
"getTiedResultOperandIndex",
Expand Down
2 changes: 1 addition & 1 deletion third_party/llvm-project
Open in desktop
Submodule llvm-project updated 16 files
+4 −2 mlir/include/mlir/Dialect/Bufferization/IR/BufferizationOps.td
+2 −1 mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.td
+2 −1 mlir/include/mlir/Dialect/Linalg/IR/LinalgRelayoutOps.td
+2 −1 mlir/include/mlir/Dialect/MemRef/IR/MemRefOps.td
+10 −0 mlir/include/mlir/Dialect/MemRef/Transforms/Passes.td
+15 −7 mlir/include/mlir/Dialect/Tensor/IR/TensorOps.td
+2 −1 mlir/include/mlir/Dialect/Tosa/IR/TosaOps.td
+4 −0 mlir/include/mlir/Interfaces/InferTypeOpInterface.h
+60 −4 mlir/include/mlir/Interfaces/InferTypeOpInterface.td
+21 −12 mlir/lib/Dialect/MemRef/Transforms/ResolveShapedTypeResultDims.cpp
+3 −0 mlir/lib/Dialect/Tensor/IR/TensorInferTypeOpInterfaceImpl.cpp
+16 −0 mlir/lib/Interfaces/InferTypeOpInterface.cpp
+131 −4 mlir/test/Interfaces/InferShapedTypeOpInterface/resolve-shaped-type-result-dims.mlir
+99 −2 mlir/test/lib/Dialect/Test/TestOpDefs.cpp
+1 −0 mlir/test/lib/Dialect/Test/TestOps.h
+87 −3 mlir/test/lib/Dialect/Test/TestOps.td
Loading