Fixes to AMDGPUToROCDL PR

Author: krzysz00

mlir/include/mlir/Dialect/AMDGPU/IR/AMDGPU.td

@@ -71,7 +71,7 @@ def AMDGPU_AddressSpaceAttr : EnumAttr<AMDGPU_Dialect, AMDGPU_AddressSpace,
     structured indexing that is primarily seen in graphics applications. This
     is also incompatible with the simple indexing model supported by memref.
   }];
-  let assemblyFormat = [{ `<` $value `>` }];
+  let assemblyFormat = "`<` $value `>`";
 }
 
 //===----------------------------------------------------------------------===//

mlir/lib/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.cpp

@@ -210,12 +210,16 @@ struct FatRawBufferCastLowering
     else
       offset = descriptor.offset(rewriter, loc);
 
+    bool hasSizes = memrefType.getRank() > 0;
     // No need to unpack() and pack() all the individual sizes and strides,
     // so we'll just extract the arrays.
-    Value sizes = rewriter.create<LLVM::ExtractValueOp>(
-        loc, descriptor, kSizePosInMemRefDescriptor);
-    Value strides = rewriter.create<LLVM::ExtractValueOp>(
-        loc, descriptor, kStridePosInMemRefDescriptor);
+    Value sizes = hasSizes ? rewriter.create<LLVM::ExtractValueOp>(
+                                 loc, descriptor, kSizePosInMemRefDescriptor)
+                           : Value{};
+    Value strides = hasSizes
+                        ? rewriter.create<LLVM::ExtractValueOp>(
+                              loc, descriptor, kStridePosInMemRefDescriptor)
+                        : Value{};
 
     Value rsrc = makeBufferRsrc(rewriter, loc, basePointer, numRecords,
                                 adaptor.getBoundsCheck(), chipset,
@@ -232,11 +236,12 @@ struct FatRawBufferCastLowering
         loc, result, fatPtr, kAlignedPtrPosInMemRefDescriptor);
     result = rewriter.create<LLVM::InsertValueOp>(loc, result, offset,
                                                   kOffsetPosInMemRefDescriptor);
-    result = rewriter.create<LLVM::InsertValueOp>(loc, result, sizes,
-                                                  kSizePosInMemRefDescriptor);
-    result = rewriter.create<LLVM::InsertValueOp>(loc, result, strides,
-                                                  kStridePosInMemRefDescriptor);
-
+    if (hasSizes) {
+      result = rewriter.create<LLVM::InsertValueOp>(loc, result, sizes,
+                                                    kSizePosInMemRefDescriptor);
+      result = rewriter.create<LLVM::InsertValueOp>(
+          loc, result, strides, kStridePosInMemRefDescriptor);
+    }
     rewriter.replaceOp(op, result);
     return success();
   }