Update IGC SPIRV translator for CompositeExtract

IGC SPIRV Translator fails to create SPIRVInstTemplateBase for
CompositeExtract instructions. This commit updates the translator to
handle CompositeExtract the same way upstream khronos translator does.

Author: smilczek

IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp

@@ -3648,23 +3648,21 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
 
   case OpCompositeExtract: {
     SPIRVCompositeExtract *CE = static_cast<SPIRVCompositeExtract *>(BV);
-    auto Type = CE->getComposite()->getType();
-    IGC_ASSERT_MESSAGE(BB, "Invalid BB");
-    if (Type->isTypeVector())
-    {
-        IGC_ASSERT_MESSAGE(CE->getIndices().size() == 1, "Invalid index");
-        return mapValue(BV, ExtractElementInst::Create(
-            transValue(CE->getComposite(), F, BB),
-            ConstantInt::get(*Context, APInt(32, CE->getIndices()[0])),
-            BV->getName(), BB));
+    IRBuilder<> Builder(*Context);
+    if (BB) {
+        Builder.SetInsertPoint(BB);
     }
-    else
-    {
-        return mapValue(BV, ExtractValueInst::Create(
-            transValue(CE->getComposite(), F, BB),
-            CE->getIndices(),
-            BV->getName(), BB));
+    if (CE->getComposite()->getType()->isTypeVector()) {
+        IGC_ASSERT_MESSAGE(CE->getIndices().size() == 1, "Invalid index");
+        return mapValue(
+            BV, Builder.CreateExtractElement(
+                transValue(CE->getComposite(), F, BB),
+                ConstantInt::get(*Context, APInt(32, CE->getIndices()[0])),
+                BV->getName()));
     }
+    return mapValue(
+        BV, Builder.CreateExtractValue(transValue(CE->getComposite(), F, BB),
+            CE->getIndices(), BV->getName()));
     }
     break;
 

IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVInstruction.h

@@ -1331,30 +1331,31 @@ class SPIRVExtInst: public SPIRVFunctionCallGeneric<OpExtInst, 5> {
   SPIRVExtInstSetKind ExtSetKind;
 };
 
-class SPIRVCompositeExtract:public SPIRVInstruction {
+class SPIRVCompositeExtractBase:public SPIRVInstTemplateBase {
 public:
-  const static Op OC = OpCompositeExtract;
-  // Incomplete constructor
-  SPIRVCompositeExtract():SPIRVInstruction(OC), Composite(SPIRVID_INVALID){}
+  SPIRVValue* getComposite() { return getValue(Ops[0]); }
+  const std::vector<SPIRVWord> getIndices() const {
+    return std::vector<SPIRVWord>(Ops.begin() + 1, Ops.end());
+  }
 
-  SPIRVValue *getComposite() { return getValue(Composite);}
-  const std::vector<SPIRVWord>& getIndices()const { return Indices;}
 protected:
-  void setWordCount(SPIRVWord TheWordCount) {
-    SPIRVEntry::setWordCount(TheWordCount);
-    Indices.resize(TheWordCount - 4);
-  }
-  _SPIRV_DEF_DEC4(Type, Id, Composite, Indices)
   // ToDo: validate the result type is consistent with the base type and indices
   // need to trace through the base type for struct types
-  void validate()const {
+  void validate() const override {
     SPIRVInstruction::validate();
-    IGC_ASSERT(getValueType(Composite)->isTypeArray() || getValueType(Composite)->isTypeStruct() || getValueType(Composite)->isTypeVector());
+    IGC_ASSERT(OpCode == OpCompositeExtract);
+    SPIRVId Composite = Ops[0];
+    (void)Composite;
+    IGC_ASSERT(getValueType(Composite)->isTypeArray() ||
+      getValueType(Composite)->isTypeStruct() ||
+      getValueType(Composite)->isTypeVector());
   }
-  SPIRVId Composite;
-  std::vector<SPIRVWord> Indices;
 };
 
+typedef SPIRVInstTemplate<SPIRVCompositeExtractBase, OpCompositeExtract, true,
+  4, true>
+  SPIRVCompositeExtract;
+
 class SPIRVCompositeInsert:public SPIRVInstruction {
 public:
   const static Op OC = OpCompositeInsert;