Skip to content

Commit 4e360e2

Browse files
MaheshRavishankarMaheshRavishankar
committed
[DO NOT SUBMIT] Fixes for LLVM PR llvm/llvm-project#162924
Signed-off-by: MaheshRavishankar <[email protected]>
1 parent 4d0ea08 commit 4e360e2

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

‎compiler/src/iree/compiler/Codegen/Dialect/Codegen/IR/IREECodegenOps.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def IREECodegen_NullPointerOp :
185185

186186
def IREECodegen_LoadFromBufferOp : Op<IREECodegen_Dialect, "load_from_buffer",
187187
[DeclareOpInterfaceMethods<MemoryEffectsOpInterface>,
188-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>]> {
188+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>]> {
189189
let summary = [{Loads a tensor from a memref.}];
190190
let description = [{
191191
Loads a tensor from a memref with a compatible shape and the same element

‎compiler/src/iree/compiler/Dialect/Encoding/IR/EncodingOps.td‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class IREEEncoding_PureOp<string mnemonic, list<Trait> traits = []> :
2424
//===----------------------------------------------------------------------===//
2525

2626
def IREEEncoding_SetEncodingOp : IREEEncoding_PureOp<"set_encoding",[
27-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>, Pure
27+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>, Pure
2828
]> {
2929
let summary = [{Perform pack and pad operation on source.}];
3030
let description = [{
@@ -57,7 +57,7 @@ def IREEEncoding_SetEncodingOp : IREEEncoding_PureOp<"set_encoding",[
5757
//===----------------------------------------------------------------------===//
5858

5959
def IREEEncoding_UnsetEncodingOp : IREEEncoding_PureOp<"unset_encoding", [
60-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>, Pure
60+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>, Pure
6161
]> {
6262
let summary = [{Perform unpack and extract operation on source.}];
6363
let description = [{

‎compiler/src/iree/compiler/Dialect/Flow/IR/FlowOps.td‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def OpGroupPartitionedRegionOps : OpDocGroup {
3737
let opDocGroup = OpGroupPartitionedRegionOps in {
3838

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

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

887887
def FLOW_TensorTieShapeOp : FLOW_PureOp<"tensor.tie_shape", [
888888
AllTypesMatch<["operand", "result"]>,
889-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
889+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
890890
Util_ShapeAwareOp,
891891
]> {
892892
let summary = [{Ties a runtime shape to a tensor value.}];

‎compiler/src/iree/compiler/Dialect/HAL/IR/HALOps.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3493,7 +3493,7 @@ def HAL_InterfaceConstantLoadOp : HAL_PureOp<"interface.constant.load"> {
34933493

34943494
def HAL_InterfaceBindingSubspanOp : HAL_PureOp<"interface.binding.subspan", [
34953495
AttrSizedOperandSegments,
3496-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
3496+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
34973497
Util_ShapeAwareOp,
34983498
]> {
34993499
let summary = [{Returns an alias to a subspan of interface binding data.}];

‎compiler/src/iree/compiler/Dialect/LinalgExt/IR/LinalgExtOps.td‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ let opDocGroup = OpGroupNonStructuredOps in {
4646

4747
def IREELinalgExt_ScatterOp : IREELinalgExt_Op<"scatter",
4848
[AttrSizedOperandSegments,
49-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
49+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
5050
DeclareOpInterfaceMethods<LinalgFusionInterface,
5151
["getIndexingMapsForResults", "getIndexingMapsForOperands",
5252
"getStaticLoopRanges"]>,
@@ -178,7 +178,7 @@ def IREELinalgExt_ScatterOp : IREELinalgExt_Op<"scatter",
178178

179179
def IREELinalgExt_GatherOp : IREELinalgExt_Op<"gather",
180180
[AttrSizedOperandSegments,
181-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
181+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
182182
DeclareOpInterfaceMethods<LinalgFusionInterface,
183183
["getIndexingMapsForResults", "getIndexingMapsForOperands",
184184
"getStaticLoopRanges"]>,
@@ -375,7 +375,7 @@ def IREELinalgExt_MapScatterOp : IREELinalgExt_Op<"map_scatter",
375375

376376
def IREELinalgExt_SortOp : IREELinalgExt_Op<"sort",
377377
[AttrSizedOperandSegments,
378-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
378+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
379379
DeclareOpInterfaceMethods<TilingInterface,
380380
["generateScalarImplementation",
381381
"getIterationDomain",
@@ -429,7 +429,7 @@ def IREELinalgExt_SortOp : IREELinalgExt_Op<"sort",
429429

430430
def IREELinalgExt_FftOp : IREELinalgExt_Op<"fft", [
431431
AttrSizedOperandSegments,
432-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
432+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
433433
DeclareOpInterfaceMethods<TilingInterface,
434434
["generateScalarImplementation",
435435
"getIterationDomain",
@@ -500,7 +500,7 @@ def IREELinalgExt_FftOp : IREELinalgExt_Op<"fft", [
500500

501501
def IREELinalgExt_ScanOp : IREELinalgExt_Op<"scan",
502502
[AttrSizedOperandSegments,
503-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
503+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
504504
DeclareOpInterfaceMethods<TilingInterface,
505505
["generateScalarImplementation",
506506
"getIterationDomain",
@@ -557,7 +557,7 @@ def IREELinalgExt_ScanOp : IREELinalgExt_Op<"scan",
557557

558558
def IREELinalgExt_TopkOp : IREELinalgExt_Op<"topk",[
559559
AttrSizedOperandSegments,
560-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
560+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
561561
DeclareOpInterfaceMethods<LinalgExtInterface>,
562562
DeclareOpInterfaceMethods<TilingInterface,
563563
["generateScalarImplementation",
@@ -635,7 +635,7 @@ def IREELinalgExt_TopkOp : IREELinalgExt_Op<"topk",[
635635

636636
def IREELinalgExt_ArgCompareOp : IREELinalgExt_Op<"arg_compare", [
637637
AttrSizedOperandSegments,
638-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
638+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
639639
DeclareOpInterfaceMethods<LinalgFusionInterface,
640640
["getIndexingMapsForResults", "getIndexingMapsForOperands",
641641
"getStaticLoopRanges"]>,
@@ -769,7 +769,7 @@ def IREELinalgExt_AttentionOp : IREELinalgExt_Op<"attention",
769769
["getIndexingMapsForResults", "getIndexingMapsForOperands",
770770
"getStaticLoopRanges"]>,
771771
DeclareOpInterfaceMethods<IndexingMapOpInterface, ["getMatchingIndexingMap"]>,
772-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
772+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
773773
DeclareOpInterfaceMethods<AggregatedOpInterface, ["decomposeOperation"]>,
774774
DeclareOpInterfaceMethods<TilingInterface,
775775
["getIterationDomain",
@@ -876,7 +876,7 @@ def IREELinalgExt_AttentionOp : IREELinalgExt_Op<"attention",
876876

877877
def IREELinalgExt_OnlineAttentionOp : IREELinalgExt_Op<"online_attention",
878878
[IndexingMapOpInterface,
879-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
879+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
880880
DeclareOpInterfaceMethods<AggregatedOpInterface, ["decomposeOperation"]>,
881881
DeclareOpInterfaceMethods<TilingInterface,
882882
["getIterationDomain",
@@ -1164,7 +1164,7 @@ def IREELinalgExt_ExpReductionOp : IREELinalgExt_Op<"exp_reduction",
11641164

11651165
def IREELinalgExt_Im2colOp : IREELinalgExt_Op<"im2col",
11661166
[AttrSizedOperandSegments,
1167-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
1167+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
11681168
DeclareOpInterfaceMethods<AggregatedOpInterface, ["decomposeOperation"]>,
11691169
DeclareOpInterfaceMethods<TilingInterface,
11701170
["getIterationDomain",
@@ -1360,7 +1360,7 @@ let opDocGroup = OpGroupDataTilingOps in {
13601360

13611361
def IREELinalgExt_PackOp : IREELinalgExt_Op<"pack", [
13621362
AttrSizedOperandSegments,
1363-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
1363+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
13641364
DeclareOpInterfaceMethods<LinalgExtInterface>,
13651365
DeclareOpInterfaceMethods<TilingInterface,
13661366
["getIterationDomain",
@@ -1524,7 +1524,7 @@ def IREELinalgExt_PackOp : IREELinalgExt_Op<"pack", [
15241524

15251525
def IREELinalgExt_UnPackOp : IREELinalgExt_Op<"unpack", [
15261526
AttrSizedOperandSegments,
1527-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
1527+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
15281528
DeclareOpInterfaceMethods<LinalgExtInterface>,
15291529
DeclareOpInterfaceMethods<TilingInterface,
15301530
["getIterationDomain",
@@ -1659,7 +1659,7 @@ let opDocGroup = OpGroupWinogradOps in {
16591659

16601660
def IREELinalgExt_WinogradInputTransformOp : IREELinalgExt_Op<"winograd.input_transform",
16611661
[AttrSizedOperandSegments,
1662-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
1662+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
16631663
DeclareOpInterfaceMethods<TilingInterface,
16641664
["getIterationDomain",
16651665
"getLoopIteratorTypes",
@@ -1765,7 +1765,7 @@ def IREELinalgExt_WinogradInputTransformOp : IREELinalgExt_Op<"winograd.input_tr
17651765

17661766
def IREELinalgExt_WinogradFilterTransformOp : IREELinalgExt_Op<"winograd.filter_transform",
17671767
[AttrSizedOperandSegments,
1768-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
1768+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
17691769
DeclareOpInterfaceMethods<TilingInterface,
17701770
["getIterationDomain",
17711771
"getLoopIteratorTypes",
@@ -1876,7 +1876,7 @@ def IREELinalgExt_WinogradFilterTransformOp : IREELinalgExt_Op<"winograd.filter_
18761876

18771877
def IREELinalgExt_WinogradOutputTransformOp : IREELinalgExt_Op<"winograd.output_transform",
18781878
[AttrSizedOperandSegments,
1879-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
1879+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
18801880
DeclareOpInterfaceMethods<TilingInterface,
18811881
["getIterationDomain",
18821882
"getLoopIteratorTypes",
@@ -1995,7 +1995,7 @@ def IREELinalgExt_CustomOp : IREELinalgExt_Op<"custom_op", [
19951995
DeclareOpInterfaceMethods<AggregatedOpInterface, [
19961996
"decomposeOperation"]>,
19971997
DeclareOpInterfaceMethods<LinalgFusionInterface>,
1998-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
1998+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
19991999
DeclareOpInterfaceMethods<TilingInterface,
20002000
["getIterationDomain",
20012001
"getLoopIteratorTypes",

‎compiler/src/iree/compiler/Dialect/TensorExt/IR/TensorExtOps.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def IREETensorExt_BitCastOp : IREETensorExt_PureOp<"bitcast", [
9898
def IREETensorExt_DispatchTensorLoadOp : IREETensorExt_PureOp<"dispatch.tensor.load", [
9999
AttrSizedOperandSegments,
100100
OffsetSizeAndStrideOpInterface,
101-
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface>,
101+
DeclareOpInterfaceMethods<ReifyRankedShapedTypeOpInterface, ["reifyResultShapes"]>,
102102
DeclareOpInterfaceMethods<Util_TiedOpInterface, [
103103
"getTiedResult",
104104
"getTiedResultOperandIndex",

‎third_party/llvm-project‎

Submodule llvm-project updated 16 files

0 commit comments

Comments
 (0)