From da23adec20a3ac92955e9e734c3a26527c5b47e3 Mon Sep 17 00:00:00 2001 From: Tres Popp Date: Tue, 23 Aug 2022 14:47:47 +0200 Subject: [PATCH] [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 --- mlir/include/mlir/IR/BuiltinTypes.h | 3 --- mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp | 3 ++- mlir/lib/IR/BuiltinTypes.cpp | 7 ------- 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(memorySpace.cast().getInt()); } -MemRefType::Builder & -MemRefType::Builder::setMemorySpace(unsigned newMemorySpace) { - memorySpace = - wrapIntegerMemorySpace(newMemorySpace, elementType.getContext()); - return *this; -} - unsigned MemRefType::getMemorySpaceAsInt() const { return detail::getMemorySpaceAsInt(getMemorySpace()); } -- 2.7.4