Add common utility function for continued instructions

Author: vmaksimo

llvm/lib/Target/SPIRV/SPIRVBuiltins.cpp

@@ -2113,31 +2113,10 @@ static bool generateSelectInst(const SPIRV::IncomingCall *Call,
 static bool generateConstructInst(const SPIRV::IncomingCall *Call,
                                   MachineIRBuilder &MIRBuilder,
                                   SPIRVGlobalRegistry *GR) {
-  auto MIB = MIRBuilder.buildInstr(SPIRV::OpCompositeConstruct)
-                 .addDef(Call->ReturnRegister)
-                 .addUse(GR->getSPIRVTypeID(Call->ReturnType));
-
-  constexpr unsigned MaxWordCount = UINT16_MAX;
-  const size_t NumElements = Call->Arguments.size();
-  size_t MaxNumElements = MaxWordCount - 3;
-  size_t SPIRVStructNumElements = NumElements;
-
-  if (NumElements > MaxNumElements) {
-    // Do adjustments for continued instructions.
-    SPIRVStructNumElements = MaxNumElements;
-    MaxNumElements = MaxWordCount - 1;
-  }
-
-  for (size_t I = 0; I < SPIRVStructNumElements; ++I)
-    MIB.addUse(Call->Arguments[I]);
-
-  for (size_t I = SPIRVStructNumElements; I < NumElements;
-       I += MaxNumElements) {
-    auto MIB = MIRBuilder.buildInstr(SPIRV::OpCompositeConstructContinuedINTEL);
-    for (size_t J = I; J < std::min(I + MaxNumElements, NumElements); ++J)
-      MIB.addUse(Call->Arguments[J]);
-  }
-
+  createContinuedInstructions(MIRBuilder, SPIRV::OpCompositeConstruct, 3,
+                              SPIRV::OpCompositeConstructContinuedINTEL,
+                              Call->Arguments, Call->ReturnRegister,
+                              GR->getSPIRVTypeID(Call->ReturnType));
   return true;
 }
 
@@ -2251,28 +2230,10 @@ static bool generateSpecConstantInst(const SPIRV::IncomingCall *Call,
     return true;
   }
   case SPIRV::OpSpecConstantComposite: {
-    auto MIB = MIRBuilder.buildInstr(Opcode)
-                   .addDef(Call->ReturnRegister)
-                   .addUse(GR->getSPIRVTypeID(Call->ReturnType));
-
-    constexpr unsigned MaxWordCount = UINT16_MAX;
-    const size_t NumElements = Call->Arguments.size();
-    size_t MaxNumElements = MaxWordCount - 3;
-    size_t SPIRVStructNumElements = NumElements;
-    if (NumElements > MaxNumElements) {
-      SPIRVStructNumElements = MaxNumElements;
-      MaxNumElements = MaxWordCount - 1;
-    }
-    for (size_t I = 0; I < SPIRVStructNumElements; ++I)
-      MIB.addUse(Call->Arguments[I]);
-
-    for (size_t I = SPIRVStructNumElements; I < NumElements;
-         I += MaxNumElements) {
-      auto MIB =
-          MIRBuilder.buildInstr(SPIRV::OpSpecConstantCompositeContinuedINTEL);
-      for (size_t J = I; J < std::min(I + MaxNumElements, NumElements); ++J)
-        MIB.addUse(Call->Arguments[J]);
-    }
+    createContinuedInstructions(MIRBuilder, Opcode, 3,
+                                SPIRV::OpSpecConstantCompositeContinuedINTEL,
+                                Call->Arguments, Call->ReturnRegister,
+                                GR->getSPIRVTypeID(Call->ReturnType));
     return true;
   }
   default:

llvm/lib/Target/SPIRV/SPIRVUtils.cpp

@@ -795,4 +795,35 @@ bool isSpvIntrinsic(const Value *Arg) {
   return false;
 }
 
+// Function to create continued instructions for SPV_INTEL_long_composites
+// extension
+void createContinuedInstructions(MachineIRBuilder &MIRBuilder, unsigned Opcode,
+                                 unsigned MinWC, unsigned ContinuedOpcode,
+                                 ArrayRef<Register> Args,
+                                 Register ReturnRegister, Register TypeID) {
+  constexpr unsigned MaxWordCount = UINT16_MAX;
+  const size_t NumElements = Args.size();
+  size_t MaxNumElements = MaxWordCount - MinWC;
+  size_t SPIRVStructNumElements = NumElements;
+
+  if (NumElements > MaxNumElements) {
+    // Do adjustments for continued instructions which always had only one
+    // minumum word count.
+    SPIRVStructNumElements = MaxNumElements;
+    MaxNumElements = MaxWordCount - 1;
+  }
+
+  auto MIB =
+      MIRBuilder.buildInstr(Opcode).addDef(ReturnRegister).addUse(TypeID);
+
+  for (size_t I = 0; I < SPIRVStructNumElements; ++I)
+    MIB.addUse(Args[I]);
+
+  for (size_t I = SPIRVStructNumElements; I < NumElements; I += MaxNumElements) {
+    auto MIB = MIRBuilder.buildInstr(ContinuedOpcode);
+    for (size_t J = I; J < std::min(I + MaxNumElements, NumElements); ++J)
+      MIB.addUse(Args[J]);
+  }
+}
+
 } // namespace llvm

llvm/lib/Target/SPIRV/SPIRVUtils.h

@@ -441,5 +441,10 @@ inline FPDecorationId demangledPostfixToDecorationId(const std::string &S) {
   return It == Mapping.end() ? FPDecorationId::NONE : It->second;
 }
 
+void createContinuedInstructions(MachineIRBuilder &MIRBuilder, unsigned Opcode,
+                                 unsigned MinWC, unsigned ContinuedOpcode,
+                                 ArrayRef<Register> Args,
+                                 Register ReturnRegister, Register TypeID);
+
 } // namespace llvm
 #endif // LLVM_LIB_TARGET_SPIRV_SPIRVUTILS_H