Introduce support for OpConstFunctionPointerINTEL in SPIRVReader

Change-Id: I61b2e4ae69748d28cff17c3dab96d7c804cedff5

Author: aratajew

IGC/AdaptorOCL/SPIRV/SPIRVReader.cpp

@@ -2441,6 +2441,14 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
     return mapValue(BV, transValue(BI, nullptr, nullptr, false));
   }
 
+  case OpConstFunctionPointerINTEL: {
+    SPIRVConstFunctionPointerINTEL* BC =
+      static_cast<SPIRVConstFunctionPointerINTEL*>(BV);
+    SPIRVFunction* F = BC->getFunction();
+    BV->setName(F->getName());
+    return mapValue(BV, transFunction(F));
+  }
+
   case OpConstantPipeStorage:
   {
       auto CPS = static_cast<SPIRVConstantPipeStorage*>(BV);
@@ -2969,13 +2977,6 @@ SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
     // function exactly we are calling.
     return mapValue(BV, Call);
     }
-  case OpFunctionPointerINTEL: {
-    SPIRVFunctionPointerINTEL *BC =
-      static_cast<SPIRVFunctionPointerINTEL *>(BV);
-    SPIRVFunction* F = BC->getFunction();
-    BV->setName(F->getName());
-    return mapValue(BV, transFunction(F));
-    }
 
   case OpExtInst:
     return mapValue(BV, transOCLBuiltinFromExtInst(

IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVFunction.h

@@ -191,6 +191,30 @@ class SPIRVFunction: public SPIRVValue, public SPIRVComponentExecutionModes {
 
 typedef SPIRVEntryOpCodeOnly<OpFunctionEnd> SPIRVFunctionEnd;
 
+class SPIRVConstFunctionPointerINTEL : public SPIRVValue {
+  const static Op OC = OpConstFunctionPointerINTEL;
+  const static SPIRVWord FixedWordCount = 4;
+
+public:
+  SPIRVConstFunctionPointerINTEL(SPIRVId TheId, SPIRVType* TheType,
+    SPIRVFunction* TheFunction, SPIRVModule* M)
+    : SPIRVValue(M, FixedWordCount, OC, TheType, TheId),
+    TheFunction(TheFunction->getId()) {
+    validate();
+  }
+  SPIRVConstFunctionPointerINTEL()
+    : SPIRVValue(OC), TheFunction(SPIRVID_INVALID) {}
+  SPIRVFunction* getFunction() const { return get<SPIRVFunction>(TheFunction); }
+  _SPIRV_DEF_DEC3_OVERRIDE(Type, Id, TheFunction)
+  void validate() const override { SPIRVValue::validate(); }
+  CapVec getRequiredCapability() const override {
+    return getVec(CapabilityFunctionPointersINTEL);
+  }
+
+protected:
+  SPIRVId TheFunction;
+};
+
 }
 
 #endif /* SPIRVFUNCTION_HPP_ */

IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVInstruction.cpp

@@ -136,19 +136,6 @@ void SPIRVFunctionPointerCallINTEL::validate() const {
   SPIRVFunctionCallGeneric::validate();
 }
 
-SPIRVFunctionPointerINTEL::SPIRVFunctionPointerINTEL(SPIRVId TheId,
-  SPIRVType * TheType,
-  SPIRVFunction * TheFunction,
-  SPIRVBasicBlock * BB)
-  : SPIRVInstruction(FixedWordCount, OC, TheType, TheId, BB),
-  TheFunction(TheFunction->getId()) {
-  validate();
-}
-
-void SPIRVFunctionPointerINTEL::validate() const {
-  SPIRVInstruction::validate();
-}
-
 //Each instruction should implement this function
 std::vector<SPIRVValue*>
 SPIRVInstruction::getOperands() {

IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVInstruction.h

@@ -1165,25 +1165,6 @@ class SPIRVFunctionPointerCallINTEL
   SPIRVId CalledValueId;
 };
 
-class SPIRVFunctionPointerINTEL : public SPIRVInstruction {
-  const static Op OC = OpFunctionPointerINTEL;
-  const static SPIRVWord FixedWordCount = 4;
-public:
-  SPIRVFunctionPointerINTEL(SPIRVId TheId, SPIRVType* TheType,
-    SPIRVFunction* TheFunction, SPIRVBasicBlock* BB);
-  SPIRVFunctionPointerINTEL() : SPIRVInstruction(OC), TheFunction(SPIRVID_INVALID) {}
-  SPIRVFunction* getFunction() const { return SPIRVEntry::get<SPIRVFunction>(TheFunction); }
-  _SPIRV_DEF_DEC3_OVERRIDE(Type, Id, TheFunction)
-  void validate() const override;
-  bool isOperandLiteral(unsigned Index) const override { return false; }
-  CapVec getRequiredCapability() const override {
-    return getVec(CapabilityFunctionPointersINTEL);
-  }
-
-protected:
-  SPIRVId TheFunction;
-};
-
 class SPIRVExtInst: public SPIRVFunctionCallGeneric<OpExtInst, 5> {
 public:
   SPIRVExtInst(SPIRVExtInstSetKind SetKind = SPIRVEIS_Count,

IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVOpCode.h

@@ -217,7 +217,7 @@ inline bool isConstantOpCode(Op OpCode) {
   unsigned OC = OpCode;
   return (OpConstantTrue <= OC
       && OC <= OpSpecConstantOp)
-      || OC == OpUndef;
+      || OC == OpUndef || OC == OpConstFunctionPointerINTEL;
 }
 
 inline bool isModuleScopeAllowedOpCode(Op OpCode) {

IGC/AdaptorOCL/SPIRV/libSPIRV/SPIRVOpCodeEnum.h

@@ -383,7 +383,7 @@ _SPIRV_OP(AsmCallINTEL, 5611)
 _SPIRV_OP(AssumeTrueINTEL, 5630)
 _SPIRV_OP(ExpectINTEL, 5631)
 // Function pointers
-_SPIRV_OP(FunctionPointerINTEL, 5600)
+_SPIRV_OP(ConstFunctionPointerINTEL, 5600)
 _SPIRV_OP(FunctionPointerCallINTEL, 5601)
 // device_side_avc_motion_estimation extension
 _SPIRV_OP(VmeImageINTEL, 5699)