Print all OpMemberDecorate operands.

Author: s-perron

llvm/lib/Target/SPIRV/MCTargetDesc/SPIRVInstPrinter.cpp

@@ -142,6 +142,9 @@ void SPIRVInstPrinter::printInst(const MCInst *MI, uint64_t Address,
           printRemainingVariableOps(MI, NumFixedOps, OS, false, true);
           break;
         }
+        case SPIRV::OpMemberDecorate:
+          printRemainingVariableOps(MI, NumFixedOps, OS);
+          break;
         case SPIRV::OpExecutionMode:
         case SPIRV::OpExecutionModeId:
         case SPIRV::OpLoopMerge: {

llvm/lib/Target/SPIRV/SPIRVInstrInfo.td

@@ -127,8 +127,9 @@ def OpModuleProcessed: Op<330, (outs), (ins StringImm:$process, variable_ops),
 
 def OpDecorate: Op<71, (outs), (ins ANY:$target, Decoration:$dec, variable_ops),
                   "OpDecorate $target $dec">;
-def OpMemberDecorate: Op<72, (outs), (ins TYPE:$t, i32imm:$m, Decoration:$d, variable_ops),
-                  "OpMemberDecorate $t $m $d">;
+def OpMemberDecorate
+    : Op<72, (outs), (ins TYPE:$t, i32imm:$m, Decoration:$d, variable_ops),
+         "OpMemberDecorate $t $m $d", []>;
 
 // TODO Currently some deprecated opcodes are missing: OpDecorationGroup,
 // OpGroupDecorate and OpGroupMemberDecorate

llvm/test/CodeGen/SPIRV/hlsl-resources/StructuredBuffer.ll

@@ -12,12 +12,12 @@ declare target("spirv.VulkanBuffer", [0 x i32], 12, 1) @llvm.spv.resource.handle
 ; CHECK: OpDecorate [[BufferVar:%.+]] DescriptorSet 0
 ; CHECK: OpDecorate [[BufferVar]] Binding 0
 ; CHECK: OpDecorate [[BufferType:%.+]] Block
+; CHECK: OpMemberDecorate [[BufferType]] 0 Offset 0
 ; CHECK: OpMemberDecorate [[BufferType]] 0 NonWritable
-; CHECK-DISABLE: OpMemberDecorate [[RWBufferType]] 0 Offset 0 // The 0 at the end is not output for some reason
 ; CHECK: OpDecorate [[RWBufferVar:%.+]] DescriptorSet 0
 ; CHECK: OpDecorate [[RWBufferVar]] Binding 1
 ; CHECK: OpDecorate [[RWBufferType:%.+]] Block
-; CHECK-DISABLE: OpMemberDecorate [[BufferType]] 0 Offset 0 //  Same as above
+; CHECK: OpMemberDecorate [[RWBufferType]] 0 Offset 0
 
 
 ; CHECK: [[int:%[0-9]+]] = OpTypeInt 32 0