Skip to content

Commit eace731

Browse files
committed
Revert "[mlir][ArmSME] Add rudimentary support for tile spills to the stack (llvm#76086)"
breaks SLES 15 SP4 gcc 7.5 builds This reverts commit 5417a5f. Change-Id: I1d78d877481f9445ef74ee59b0987630e7279844
1 parent a81aa94 commit eace731

File tree

9 files changed

+66
-595
lines changed

9 files changed

+66
-595
lines changed

mlir/include/mlir/Dialect/ArmSME/IR/ArmSME.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
#include "mlir/Interfaces/SideEffectInterfaces.h"
2626

2727
namespace mlir::arm_sme {
28-
static constexpr unsigned kInMemoryTileIdBase = 16;
2928
#include "mlir/Dialect/ArmSME/IR/ArmSMEOpInterfaces.h.inc"
30-
} // namespace mlir::arm_sme
29+
}
3130

3231
#define GET_ATTRDEF_CLASSES
3332
#include "mlir/Dialect/ArmSME/IR/ArmSMEAttrDefs.h.inc"

mlir/include/mlir/Dialect/ArmSME/IR/ArmSMEOps.td

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ def ArmSMETileOpInterface : OpInterface<"ArmSMETileOpInterface"> {
9797
// This operation does not allocate a tile.
9898
return std::nullopt;
9999
}]
100-
>,
101-
InterfaceMethod<
102-
"Returns the VectorType of the tile used by this operation.",
103-
/*returnType=*/"VectorType",
104-
/*methodName=*/"getTileType"
105100
>
106101
];
107102

@@ -122,11 +117,6 @@ def ArmSMETileOpInterface : OpInterface<"ArmSMETileOpInterface"> {
122117
rewriter.replaceOp($_op, newOp);
123118
return newOp;
124119
}
125-
126-
bool isInMemoryTile() {
127-
auto tileId = getTileId();
128-
return tileId && tileId.getInt() >= kInMemoryTileIdBase;
129-
}
130120
}];
131121

132122
let verify = [{ return ::mlir::arm_sme::verifyOperationHasValidTileId($_op); }];
@@ -341,9 +331,6 @@ def ZeroOp : ArmSME_Op<"zero", [ArmSMETileOpInterface]> {
341331
std::optional<arm_sme::ArmSMETileType> getAllocatedTileType() {
342332
return arm_sme::getSMETileType(getVectorType());
343333
}
344-
VectorType getTileType() {
345-
return getVectorType();
346-
}
347334
}];
348335
let assemblyFormat = "attr-dict `:` type($res)";
349336
}
@@ -420,9 +407,6 @@ def TileLoadOp : ArmSME_Op<"tile_load", [
420407
std::optional<arm_sme::ArmSMETileType> getAllocatedTileType() {
421408
return arm_sme::getSMETileType(getVectorType());
422409
}
423-
VectorType getTileType() {
424-
return getVectorType();
425-
}
426410
}];
427411

428412
let builders = [
@@ -491,9 +475,6 @@ def TileStoreOp : ArmSME_Op<"tile_store", [
491475
VectorType getVectorType() {
492476
return ::llvm::cast<VectorType>(getValueToStore().getType());
493477
}
494-
VectorType getTileType() {
495-
return getVectorType();
496-
}
497478
}];
498479

499480
let builders = [
@@ -558,9 +539,6 @@ def LoadTileSliceOp : ArmSME_Op<"load_tile_slice", [
558539
VectorType getVectorType() {
559540
return ::llvm::cast<VectorType>(getResult().getType());
560541
}
561-
VectorType getTileType() {
562-
return getVectorType();
563-
}
564542
}];
565543

566544
let assemblyFormat = [{
@@ -618,9 +596,6 @@ def StoreTileSliceOp : ArmSME_Op<"store_tile_slice", [
618596
VectorType getVectorType() {
619597
return ::llvm::cast<VectorType>(getTile().getType());
620598
}
621-
VectorType getTileType() {
622-
return getVectorType();
623-
}
624599
}];
625600

626601
let assemblyFormat = [{
@@ -713,9 +688,6 @@ def MoveTileSliceToVectorOp : ArmSME_Op<"move_tile_slice_to_vector", [
713688

714689
let extraClassDeclaration = [{
715690
VectorType getSliceType() { return getResult().getType(); }
716-
VectorType getTileType() {
717-
return ::llvm::cast<VectorType>(getTile().getType());
718-
}
719691
}];
720692

721693
let assemblyFormat = [{
@@ -808,9 +780,6 @@ let arguments = (ins
808780
return arm_sme::getSMETileType(getResultType());
809781
return std::nullopt;
810782
}
811-
VectorType getTileType() {
812-
return getResultType();
813-
}
814783
}];
815784
}
816785

0 commit comments

Comments
 (0)