[AMDGPU][MC][GFX10] Improved diagnistic message for image instructions w/o DIM modifier

[dp]

Summary

See bug 48241

[rampitec]

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

4032

It is not necessarily "dim". For example image_bvh* do not have dim modifier.

[dp]

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

4032

Thanks. I did not know about these instructions. I thought that at least in gfx1010 all MIMG opcodes require DIM.

[rampitec]

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

4032

You can query if opcode has dim operand.

[foad]

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

4031

Please use isGFX10Plus, which I just added in D92092.

[dp]

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

4031

Sure, thanks.

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

bool AMDGPUAsmParser::MatchAndEmitInstruction(SMLoc IDLoc, unsigned &Opcode,
 
   StringRef Mnemo = ((AMDGPUOperand &)*Operands[0]).getToken();
   if (checkUnsupportedInstruction(Mnemo, IDLoc)) {
     return true;
   }
 
   switch (Result) {
   default: break;
-  case Match_MissingFeature:
+  case Match_MissingFeature: {
     // It has been verified that the specified instruction
     // mnemonic is valid. A match was found but it requires
     // features which are not supported on this GPU.
+    bool IsMIMG = Mnemo.startswith("image_");
+    if (IsMIMG && isGFX10() &&
+        getImmLoc(AMDGPUOperand::ImmTyDim, Operands) == IDLoc) {
+      return Error(IDLoc, "missing dim modifier");
+    }
     return Error(IDLoc, "operands are not valid for this GPU or mode");
+  }
 
   case Match_InvalidOperand: {
     SMLoc ErrorLoc = IDLoc;
     if (ErrorInfo != ~0ULL) {
       if (ErrorInfo >= Operands.size()) {
         return Error(IDLoc, "too few operands for instruction");
       }
       ErrorLoc = ((AMDGPUOperand &)*Operands[ErrorInfo]).getStartLoc();

llvm/test/MC/AMDGPU/gfx10_asm_mimg_err.s

 // RUN: not llvm-mc -arch=amdgcn -mcpu=gfx1010 %s 2>&1 | FileCheck --check-prefixes=NOGFX10 --implicit-check-not=error: %s
 
-// TODO: more helpful error message for missing dim operand
 image_load v[0:3], v0, s[0:7] dmask:0xf unorm
-// NOGFX10: :[[@LINE-1]]:{{[0-9]+}}: error: operands are not valid for this GPU or mode
+// NOGFX10: :[[@LINE-1]]:{{[0-9]+}}: error: missing dim modifier
 
 image_load v[0:3], v0, s[0:7] dmask:0xf dim:SQ_RSRC_IMG_1D da
 // NOGFX10: :[[@LINE-1]]:{{[0-9]+}}: error: invalid operand for instruction
 
 image_load_pck v[0:3], v0, s[0:7] dmask:0xf dim:SQ_RSRC_IMG_1D d16
 // NOGFX10: :[[@LINE-1]]:{{[0-9]+}}: error: invalid operand for instruction
 
 image_load v[0:1], v0, s[0:7] dmask:0xf dim:SQ_RSRC_IMG_1D

llvm/test/MC/AMDGPU/gfx10_err_pos.s

 // message operation does not support streams
 
 s_sendmsg sendmsg(MSG_GS_DONE, GS_OP_NOP, 0)
 // CHECK: error: message operation does not support streams
 // CHECK-NEXT:{{^}}s_sendmsg sendmsg(MSG_GS_DONE, GS_OP_NOP, 0)
 // CHECK-NEXT:{{^}}                                          ^
 
 //==============================================================================
+// missing dim modifier
+
+image_load v[0:3], v0, s[0:7] dmask:0xf unorm
+// CHECK: error: missing dim modifier
+// CHECK-NEXT:{{^}}image_load v[0:3], v0, s[0:7] dmask:0xf unorm
+// CHECK-NEXT:{{^}}^
+
+//==============================================================================
 // missing message operation
 
 s_sendmsg sendmsg(MSG_SYSMSG)
 // CHECK: error: missing message operation
 // CHECK-NEXT:{{^}}s_sendmsg sendmsg(MSG_SYSMSG)
 // CHECK-NEXT:{{^}}                  ^
 
 //==============================================================================