[MLIR][SPIRV] Support different function control in (de)serialization

[georgemitenkov]

Summary

Added support for different function control
in serialization and deserialization.

[mravishankar]

THanks!

mlir/lib/Dialect/SPIRV/Serialization/Deserializer.cpp

if (!resultType) {
     return emitError(unknownLoc, "undefined result type from <id> ")
            << operands[0];
   }
 
   if (funcMap.count(operands[1])) {
     return emitError(unknownLoc, "duplicate function definition/declaration");
   }
 
-  auto functionControl = spirv::symbolizeFunctionControl(operands[2]);
-  if (!functionControl) {
+  auto fnControl = spirv::symbolizeFunctionControl(operands[2]);
+  if (!fnControl) {
     return emitError(unknownLoc, "unknown Function Control: ") << operands[2];
   }
-  if (functionControl.getValue() != spirv::FunctionControl::None) {
-    /// TODO: Handle different function controls
-    return emitError(unknownLoc, "unhandled Function Control: '")
-           << spirv::stringifyFunctionControl(functionControl.getValue())
-           << "'";
-  }
 
   Type fnType = getType(operands[3]);
   if (!fnType || !fnType.isa<FunctionType>()) {
     return emitError(unknownLoc, "unknown function type from <id> ")
            << operands[3];
   }
   auto functionType = fnType.cast<FunctionType>();
 
   if ((isVoidType(resultType) && functionType.getNumResults() != 0) ||
       (functionType.getNumResults() == 1 &&
        functionType.getResult(0) != resultType)) {
     return emitError(unknownLoc, "mismatch in function type ")
            << functionType << " and return type " << resultType << " specified";
   }
 
   std::string fnName = getFunctionSymbol(operands[1]);
-  auto funcOp =
-      opBuilder.create<spirv::FuncOp>(unknownLoc, fnName, functionType);
+  auto funcOp = opBuilder.create<spirv::FuncOp>(
+      unknownLoc, fnName, functionType, fnControl.getValue());
   curFunction = funcMap[operands[1]] = funcOp;
   LLVM_DEBUG(llvm::dbgs() << "-- start function " << fnName << " (type = "
                           << fnType << ", id = " << operands[1] << ") --\n");
   auto *entryBlock = funcOp.addEntryBlock();
   LLVM_DEBUG(llvm::dbgs() << "[block] created entry block " << entryBlock
                           << "\n");
 
   // Parse the op argument instructions

mlir/lib/Dialect/SPIRV/Serialization/Serializer.cpp

LogicalResult Serializer::processFuncOp(spirv::FuncOp op) {
   if (failed(processType(op.getLoc(),
                          (resultTypes.empty() ? getVoidType() : resultTypes[0]),
                          resTypeID))) {
     return failure();
   }
   operands.push_back(resTypeID);
   auto funcID = getOrCreateFunctionID(op.getName());
   operands.push_back(funcID);
-  // TODO: Support other function control options.
-  operands.push_back(static_cast<uint32_t>(spirv::FunctionControl::None));
+  operands.push_back(static_cast<uint32_t>(op.function_control()));
   operands.push_back(fnTypeID);
   encodeInstructionInto(functionHeader, spirv::Opcode::OpFunction, operands);
 
   // Add function name.
   if (failed(processName(funcID, op.getName()))) {
     return failure();
   }
 

mlir/test/Dialect/SPIRV/Serialization/module.mlir

 // RUN: mlir-translate -test-spirv-roundtrip -split-input-file %s | FileCheck %s
 
 // CHECK:      spv.module Logical GLSL450 requires #spv.vce<v1.0, [Shader], []> {
-// CHECK-NEXT:   spv.func @foo() "None" {
+// CHECK-NEXT:   spv.func @foo() "Inline" {
 // CHECK-NEXT:     spv.Return
 // CHECK-NEXT:   }
 // CHECK-NEXT: }
 
 spv.module Logical GLSL450 requires #spv.vce<v1.0, [Shader], []> {
-  spv.func @foo() -> () "None" {
+  spv.func @foo() -> () "Inline" {
      spv.Return
   }
 }
 
 // -----
 
 // CHECK: v1.5
 spv.module Logical GLSL450 requires #spv.vce<v1.5, [Shader], []> {