Add optional for the util function

Author: erman-gurses

mlir/include/mlir/Dialect/AMDGPU/Transforms/Utils.h

@@ -17,7 +17,7 @@ namespace amdgpu {
 /// - Considers memref::LoadOp,  vector::LoadOp,  vector::TransferReadOp
 /// - Considers memref::StoreOp, vector::StoreOp, vector::TransferWriteOp
 /// - Excludes subview op
-Operation::operand_range getIndices(Operation *op);
+std::optional<Operation::operand_range> getIndices(Operation *op);
 void setIndices(Operation *op, ArrayRef<Value> indices);
 
 } // namespace amdgpu

mlir/lib/Dialect/AMDGPU/Transforms/OptimizeSharedMemory.cpp

@@ -138,13 +138,13 @@ getShmReadAndWriteOps(Operation *parentOp, Value shmMemRef,
   if (llvm::any_of(readOps, [](Operation *op) {
         return !isa<memref::LoadOp, vector::LoadOp, vector::TransferReadOp>(
                    op) ||
-               amdgpu::getIndices(op).size() < 2;
+               amdgpu::getIndices(op)->size() < 2;
       }))
     return failure();
   if (llvm::any_of(writeOps, [](Operation *op) {
         return !isa<memref::StoreOp, vector::StoreOp, vector::TransferWriteOp>(
                    op) ||
-               amdgpu::getIndices(op).size() < 2;
+               amdgpu::getIndices(op)->size() < 2;
       }))
     return failure();
 
@@ -199,7 +199,7 @@ mlir::amdgpu::optimizeSharedMemoryReadsAndWrites(Operation *parentOp,
     builder.setInsertionPoint(shmWriteOp);
 
     auto indices = amdgpu::getIndices(shmWriteOp);
-    SmallVector<Value, 4> transformedIndices(indices.begin(), indices.end());
+    SmallVector<Value, 4> transformedIndices(indices->begin(), indices->end());
     transformIndices(builder, shmWriteOp->getLoc(), transformedIndices,
                      memRefType, srcDim, tgtDim);
     amdgpu::setIndices(shmWriteOp, transformedIndices);
@@ -211,7 +211,7 @@ mlir::amdgpu::optimizeSharedMemoryReadsAndWrites(Operation *parentOp,
     builder.setInsertionPoint(shmReadOp);
 
     auto indices = amdgpu::getIndices(shmReadOp);
-    SmallVector<Value, 4> transformedIndices(indices.begin(), indices.end());
+    SmallVector<Value, 4> transformedIndices(indices->begin(), indices->end());
     transformIndices(builder, shmReadOp->getLoc(), transformedIndices,
                      memRefType, srcDim, tgtDim);
     amdgpu::setIndices(shmReadOp, transformedIndices);

mlir/lib/Dialect/AMDGPU/Transforms/Utils.cpp

@@ -15,7 +15,7 @@
 using namespace mlir;
 using namespace mlir::amdgpu;
 
-Operation::operand_range amdgpu::getIndices(Operation *op) {
+std::optional<Operation::operand_range> amdgpu::getIndices(Operation *op) {
   if (auto loadOp = dyn_cast<memref::LoadOp>(op))
     return loadOp.getIndices();
   if (auto storeOp = dyn_cast<memref::StoreOp>(op))
@@ -28,7 +28,7 @@ Operation::operand_range amdgpu::getIndices(Operation *op) {
     return transferReadOp.getIndices();
   if (auto transferWriteOp = dyn_cast<vector::TransferWriteOp>(op))
     return transferWriteOp.getIndices();
-  llvm_unreachable("unsupported op type");
+  return std::nullopt;
 }
 
 void amdgpu::setIndices(Operation *op, ArrayRef<Value> indices) {
@@ -44,5 +44,4 @@ void amdgpu::setIndices(Operation *op, ArrayRef<Value> indices) {
     return transferReadOp.getIndicesMutable().assign(indices);
   if (auto transferWriteOp = dyn_cast<vector::TransferWriteOp>(op))
     return transferWriteOp.getIndicesMutable().assign(indices);
-  llvm_unreachable("unsupported op type");
 }