Fix in SPIRV debug info adaptor to emit all dimensions of multi-dimensional array in debug info.

Change-Id: I116fe8bb9c38b33e497b41b7bbca6563c3ac35a3

Author: lwesiers

IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp

@@ -318,14 +318,22 @@ class SPIRVToLLVMDbgTran {
 
       OpDebugTypeArray arrayType(inst);
 
-      auto size = BM->get<SPIRVConstant>(arrayType.getComponentCount())->getZExtIntValue();
       auto baseType = createType(BM->get<SPIRVExtInst>(arrayType.getBaseType()));
+      auto numDims = arrayType.getNumDims();
 
-      auto sr = Builder.getOrCreateSubrange(0, size-1);
-      auto mds = llvm::makeArrayRef(llvm::cast<llvm::Metadata>(sr));
-      llvm::DINodeArray subscripts = llvm::MDTuple::get(M->getContext(), mds);
+      SmallVector<llvm::Metadata *, 8> subscripts;
+      uint64_t totalCount = 1;
 
-      return addMDNode(inst, Builder.createArrayType(size * baseType->getSizeInBits(), 0, baseType, subscripts));
+      for (unsigned int i = 0; i != numDims; i++)
+      {
+          auto val = BM->get<SPIRVConstant>(arrayType.getComponentCount(i))->getZExtIntValue();
+          subscripts.push_back(Builder.getOrCreateSubrange(0, val));
+          totalCount *= (uint64_t)(val);
+      }
+
+      DINodeArray subscriptArray = Builder.getOrCreateArray(subscripts);
+
+      return addMDNode(inst, Builder.createArrayType(totalCount * baseType->getSizeInBits(), 0, baseType, subscriptArray));
   }
 
   DIType* createTypeVector(SPIRVExtInst* inst)
@@ -338,11 +346,11 @@ class SPIRVToLLVMDbgTran {
       auto size = vectorType.getNumComponents();
       auto type = createType(BM->get<SPIRVExtInst>(vectorType.getBaseType()));
 
-      auto sr = Builder.getOrCreateSubrange(0, size);
-      auto mds = llvm::makeArrayRef(llvm::cast<llvm::Metadata>(sr));
-      llvm::DINodeArray subscripts = llvm::MDTuple::get(M->getContext(), mds);
+      SmallVector<llvm::Metadata *, 8> subscripts;
+      subscripts.push_back(Builder.getOrCreateSubrange(0, size));
+      DINodeArray subscriptArray = Builder.getOrCreateArray(subscripts);
 
-      return addMDNode(inst, Builder.createVectorType(size, 0, type, subscripts));
+      return addMDNode(inst, Builder.createVectorType(size * type->getSizeInBits(), 0, type, subscriptArray));
   }
 
   DIType* createTypeDef(SPIRVExtInst* inst)

IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVDebugInfoExt.h

@@ -660,7 +660,8 @@ namespace spv {
     public:
         OpDebugTypeArray(SPIRVExtInst* extInst) : OpDebugInfoBase(extInst) {}
         SPIRVId getBaseType() { return arg<SPIRVId>(SPIRVDebug::Operand::TypeArray::BaseTypeIdx); }
-        SPIRVId getComponentCount() { return arg<SPIRVId>(SPIRVDebug::Operand::TypeArray::ComponentCountIdx); }
+        SPIRVWord getNumDims() { return (getNumArgs() - SPIRVDebug::Operand::TypeArray::ComponentCountIdx); }
+        SPIRVId getComponentCount(unsigned int i) { return arg<SPIRVId>(i + SPIRVDebug::Operand::TypeArray::ComponentCountIdx); }
     };
 
     class OpDebugTypeVector : OpDebugInfoBase