aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTres Popp <tpopp@google.com>2022-08-23 14:47:47 +0200
committerTres Popp <tpopp@google.com>2022-08-29 12:32:16 +0200
commitda23adec20a3ac92955e9e734c3a26527c5b47e3 (patch)
tree9ae8b71a4019e066cb1f1763843de3dc46af5b27
parentefc76a1ac5f910776091a48947ca1e90e9068845 (diff)
downloadllvm-da23adec20a3ac92955e9e734c3a26527c5b47e3.zip
llvm-da23adec20a3ac92955e9e734c3a26527c5b47e3.tar.gz
llvm-da23adec20a3ac92955e9e734c3a26527c5b47e3.tar.bz2
[mlir] Delete MemRefType::Builder::setMemorySpace(unsigned)
This operation has been deprecated for a very long time now, so remove it completely. https://llvm.discourse.group/t/rfc-memref-memory-shape-as-attribute/2229 Differential Revision: https://reviews.llvm.org/D132466
-rw-r--r--mlir/include/mlir/IR/BuiltinTypes.h3
-rw-r--r--mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp3
-rw-r--r--mlir/lib/IR/BuiltinTypes.cpp7
3 files changed, 2 insertions, 11 deletions
diff --git a/mlir/include/mlir/IR/BuiltinTypes.h b/mlir/include/mlir/IR/BuiltinTypes.h
index 76b3ef8..171203e 100644
--- a/mlir/include/mlir/IR/BuiltinTypes.h
+++ b/mlir/include/mlir/IR/BuiltinTypes.h
@@ -192,9 +192,6 @@ public:
return *this;
}
- // [deprecated] `setMemorySpace(Attribute)` should be used instead.
- Builder &setMemorySpace(unsigned newMemorySpace);
-
operator MemRefType() {
return MemRefType::get(shape, elementType, layout, memorySpace);
}
diff --git a/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp b/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp
index ef3efc8..2e89a3a 100644
--- a/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp
+++ b/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp
@@ -183,7 +183,8 @@ struct LowerGpuOpsToNVVMOpsPass
if (type.getMemorySpaceAsInt() !=
gpu::GPUDialect::getPrivateAddressSpace())
return llvm::None;
- return converter.convertType(MemRefType::Builder(type).setMemorySpace(0));
+ return converter.convertType(MemRefType::Builder(type).setMemorySpace(
+ IntegerAttr::get(IntegerType::get(m.getContext(), 64), 0)));
});
// Lowering for MMAMatrixType.
converter.addConversion([&](gpu::MMAMatrixType type) -> Type {
diff --git a/mlir/lib/IR/BuiltinTypes.cpp b/mlir/lib/IR/BuiltinTypes.cpp
index d122d9c..f361b43 100644
--- a/mlir/lib/IR/BuiltinTypes.cpp
+++ b/mlir/lib/IR/BuiltinTypes.cpp
@@ -532,13 +532,6 @@ unsigned mlir::detail::getMemorySpaceAsInt(Attribute memorySpace) {
return static_cast<unsigned>(memorySpace.cast<IntegerAttr>().getInt());
}
-MemRefType::Builder &
-MemRefType::Builder::setMemorySpace(unsigned newMemorySpace) {
- memorySpace =
- wrapIntegerMemorySpace(newMemorySpace, elementType.getContext());
- return *this;
-}
-
unsigned MemRefType::getMemorySpaceAsInt() const {
return detail::getMemorySpaceAsInt(getMemorySpace());
}