[spirv] Replace initializer_list with ArrayRef in InstBuilder (#433)

tools/clang/include/clang/SPIRV/InstBuilder.h

@@ -16,12 +16,12 @@
 
 #include <deque>
 #include <functional>
-#include <initializer_list>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "spirv/1.0/spirv.hpp11"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/Optional.h"
 
 namespace clang {
@@ -101,12 +101,12 @@ public:
   InstBuilder &opExtInstImport(uint32_t result_id, std::string name);
   InstBuilder &opExtInst(uint32_t result_type, uint32_t result_id, uint32_t set,
                          uint32_t instruction,
-                         std::initializer_list<uint32_t> operand_1_operand_2_);
+                         llvm::ArrayRef<uint32_t> operand_1_operand_2_);
   InstBuilder &opMemoryModel(spv::AddressingModel addressing_model,
                              spv::MemoryModel memory_model);
   InstBuilder &opEntryPoint(spv::ExecutionModel execution_model,
                             uint32_t entry_point, std::string name,
-                            std::initializer_list<uint32_t> interface);
+                            llvm::ArrayRef<uint32_t> interface);
   InstBuilder &opExecutionMode(uint32_t entry_point, spv::ExecutionMode mode);
   InstBuilder &opCapability(spv::Capability capability);
   InstBuilder &opTypeVoid(uint32_t result_id);
@@ -130,14 +130,14 @@ public:
   InstBuilder &opTypeRuntimeArray(uint32_t result_id, uint32_t element_type);
   InstBuilder &
   opTypeStruct(uint32_t result_id,
-               std::initializer_list<uint32_t> member_0_type_member_1_type_);
+               llvm::ArrayRef<uint32_t> member_0_type_member_1_type_);
   InstBuilder &opTypeOpaque(uint32_t result_id,
                             std::string the_name_of_the_opaque_type);
   InstBuilder &opTypePointer(uint32_t result_id,
                              spv::StorageClass storage_class, uint32_t type);
-  InstBuilder &opTypeFunction(
-      uint32_t result_id, uint32_t return_type,
-      std::initializer_list<uint32_t> parameter_0_type_parameter_1_type_);
+  InstBuilder &
+  opTypeFunction(uint32_t result_id, uint32_t return_type,
+                 llvm::ArrayRef<uint32_t> parameter_0_type_parameter_1_type_);
   InstBuilder &opTypeEvent(uint32_t result_id);
   InstBuilder &opTypeDeviceEvent(uint32_t result_id);
   InstBuilder &opTypeReserveId(uint32_t result_id);
@@ -147,9 +147,8 @@ public:
                                     spv::StorageClass storage_class);
   InstBuilder &opConstantTrue(uint32_t result_type, uint32_t result_id);
   InstBuilder &opConstantFalse(uint32_t result_type, uint32_t result_id);
-  InstBuilder &
-  opConstantComposite(uint32_t result_type, uint32_t result_id,
-                      std::initializer_list<uint32_t> constituents);
+  InstBuilder &opConstantComposite(uint32_t result_type, uint32_t result_id,
+                                   llvm::ArrayRef<uint32_t> constituents);
   InstBuilder &
   opConstantSampler(uint32_t result_type, uint32_t result_id,
                     spv::SamplerAddressingMode sampler_addressing_mode,
@@ -157,9 +156,8 @@ public:
   InstBuilder &opConstantNull(uint32_t result_type, uint32_t result_id);
   InstBuilder &opSpecConstantTrue(uint32_t result_type, uint32_t result_id);
   InstBuilder &opSpecConstantFalse(uint32_t result_type, uint32_t result_id);
-  InstBuilder &
-  opSpecConstantComposite(uint32_t result_type, uint32_t result_id,
-                          std::initializer_list<uint32_t> constituents);
+  InstBuilder &opSpecConstantComposite(uint32_t result_type, uint32_t result_id,
+                                       llvm::ArrayRef<uint32_t> constituents);
   InstBuilder &opSpecConstantOp(uint32_t result_type, uint32_t result_id,
                                 spv::Op opcode);
   InstBuilder &opFunction(uint32_t result_type, uint32_t result_id,
@@ -167,9 +165,9 @@ public:
                           uint32_t function_type);
   InstBuilder &opFunctionParameter(uint32_t result_type, uint32_t result_id);
   InstBuilder &opFunctionEnd();
-  InstBuilder &
-  opFunctionCall(uint32_t result_type, uint32_t result_id, uint32_t function,
-                 std::initializer_list<uint32_t> argument_0_argument_1_);
+  InstBuilder &opFunctionCall(uint32_t result_type, uint32_t result_id,
+                              uint32_t function,
+                              llvm::ArrayRef<uint32_t> argument_0_argument_1_);
   InstBuilder &opVariable(uint32_t result_type, uint32_t result_id,
                           spv::StorageClass storage_class,
                           llvm::Optional<uint32_t> initializer);
@@ -188,31 +186,30 @@ public:
   opCopyMemorySized(uint32_t target, uint32_t source, uint32_t size,
                     llvm::Optional<spv::MemoryAccessMask> memory_access);
   InstBuilder &opAccessChain(uint32_t result_type, uint32_t result_id,
-                             uint32_t base,
-                             std::initializer_list<uint32_t> indexes);
+                             uint32_t base, llvm::ArrayRef<uint32_t> indexes);
   InstBuilder &opInBoundsAccessChain(uint32_t result_type, uint32_t result_id,
                                      uint32_t base,
-                                     std::initializer_list<uint32_t> indexes);
+                                     llvm::ArrayRef<uint32_t> indexes);
   InstBuilder &opPtrAccessChain(uint32_t result_type, uint32_t result_id,
                                 uint32_t base, uint32_t element,
-                                std::initializer_list<uint32_t> indexes);
+                                llvm::ArrayRef<uint32_t> indexes);
   InstBuilder &opArrayLength(uint32_t result_type, uint32_t result_id,
                              uint32_t structure, uint32_t array_member);
   InstBuilder &opGenericPtrMemSemantics(uint32_t result_type,
                                         uint32_t result_id, uint32_t pointer);
-  InstBuilder &
-  opInBoundsPtrAccessChain(uint32_t result_type, uint32_t result_id,
-                           uint32_t base, uint32_t element,
-                           std::initializer_list<uint32_t> indexes);
+  InstBuilder &opInBoundsPtrAccessChain(uint32_t result_type,
+                                        uint32_t result_id, uint32_t base,
+                                        uint32_t element,
+                                        llvm::ArrayRef<uint32_t> indexes);
   InstBuilder &opDecorate(uint32_t target, spv::Decoration decoration);
   InstBuilder &opMemberDecorate(uint32_t structure_type, uint32_t member,
                                 spv::Decoration decoration);
   InstBuilder &opDecorationGroup(uint32_t result_id);
   InstBuilder &opGroupDecorate(uint32_t decoration_group,
-                               std::initializer_list<uint32_t> targets);
-  InstBuilder &opGroupMemberDecorate(
-      uint32_t decoration_group,
-      std::initializer_list<std::pair<uint32_t, uint32_t>> targets);
+                               llvm::ArrayRef<uint32_t> targets);
+  InstBuilder &
+  opGroupMemberDecorate(uint32_t decoration_group,
+                        llvm::ArrayRef<std::pair<uint32_t, uint32_t>> targets);
   InstBuilder &opVectorExtractDynamic(uint32_t result_type, uint32_t result_id,
                                       uint32_t vector, uint32_t index);
   InstBuilder &opVectorInsertDynamic(uint32_t result_type, uint32_t result_id,
@@ -220,16 +217,15 @@ public:
                                      uint32_t index);
   InstBuilder &opVectorShuffle(uint32_t result_type, uint32_t result_id,
                                uint32_t vector_1, uint32_t vector_2,
-                               std::initializer_list<uint32_t> components);
-  InstBuilder &
-  opCompositeConstruct(uint32_t result_type, uint32_t result_id,
-                       std::initializer_list<uint32_t> constituents);
+                               llvm::ArrayRef<uint32_t> components);
+  InstBuilder &opCompositeConstruct(uint32_t result_type, uint32_t result_id,
+                                    llvm::ArrayRef<uint32_t> constituents);
   InstBuilder &opCompositeExtract(uint32_t result_type, uint32_t result_id,
                                   uint32_t composite,
-                                  std::initializer_list<uint32_t> indexes);
+                                  llvm::ArrayRef<uint32_t> indexes);
   InstBuilder &opCompositeInsert(uint32_t result_type, uint32_t result_id,
                                  uint32_t object, uint32_t composite,
-                                 std::initializer_list<uint32_t> indexes);
+                                 llvm::ArrayRef<uint32_t> indexes);
   InstBuilder &opCopyObject(uint32_t result_type, uint32_t result_id,
                             uint32_t operand);
   InstBuilder &opTranspose(uint32_t result_type, uint32_t result_id,
@@ -564,20 +560,18 @@ public:
                            uint32_t value);
   InstBuilder &
   opPhi(uint32_t result_type, uint32_t result_id,
-        std::initializer_list<std::pair<uint32_t, uint32_t>> variable_parent_);
+        llvm::ArrayRef<std::pair<uint32_t, uint32_t>> variable_parent_);
   InstBuilder &opLoopMerge(uint32_t merge_block, uint32_t continue_target,
                            spv::LoopControlMask loop_control);
   InstBuilder &opSelectionMerge(uint32_t merge_block,
                                 spv::SelectionControlMask selection_control);
   InstBuilder &opLabel(uint32_t result_id);
   InstBuilder &opBranch(uint32_t target_label);
-  InstBuilder &
-  opBranchConditional(uint32_t condition, uint32_t true_label,
-                      uint32_t false_label,
-                      std::initializer_list<uint32_t> branch_weights);
-  InstBuilder &
-  opSwitch(uint32_t selector, uint32_t default_target,
-           std::initializer_list<std::pair<uint32_t, uint32_t>> target);
+  InstBuilder &opBranchConditional(uint32_t condition, uint32_t true_label,
+                                   uint32_t false_label,
+                                   llvm::ArrayRef<uint32_t> branch_weights);
+  InstBuilder &opSwitch(uint32_t selector, uint32_t default_target,
+                        llvm::ArrayRef<std::pair<uint32_t, uint32_t>> target);
   InstBuilder &opKill();
   InstBuilder &opReturn();
   InstBuilder &opReturnValue(uint32_t value);
@@ -688,7 +682,7 @@ public:
                                uint32_t wait_events, uint32_t ret_event,
                                uint32_t invoke, uint32_t param,
                                uint32_t param_size, uint32_t param_align,
-                               std::initializer_list<uint32_t> local_size);
+                               llvm::ArrayRef<uint32_t> local_size);
   InstBuilder &opGetKernelNDrangeSubGroupCount(uint32_t result_type,
                                                uint32_t result_id,
                                                uint32_t nd_range,

tools/clang/lib/SPIRV/InstBuilderAuto.cpp

@@ -262,7 +262,7 @@ InstBuilder &InstBuilder::opExtInstImport(uint32_t result_id,
 InstBuilder &
 InstBuilder::opExtInst(uint32_t result_type, uint32_t result_id, uint32_t set,
                        uint32_t instruction,
-                       std::initializer_list<uint32_t> operand_1_operand_2_) {
+                       llvm::ArrayRef<uint32_t> operand_1_operand_2_) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -303,10 +303,9 @@ InstBuilder &InstBuilder::opMemoryModel(spv::AddressingModel addressing_model,
   return *this;
 }
 
-InstBuilder &
-InstBuilder::opEntryPoint(spv::ExecutionModel execution_model,
-                          uint32_t entry_point, std::string name,
-                          std::initializer_list<uint32_t> interface) {
+InstBuilder &InstBuilder::opEntryPoint(spv::ExecutionModel execution_model,
+                                       uint32_t entry_point, std::string name,
+                                       llvm::ArrayRef<uint32_t> interface) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -571,8 +570,7 @@ InstBuilder &InstBuilder::opTypeRuntimeArray(uint32_t result_id,
 }
 
 InstBuilder &InstBuilder::opTypeStruct(
-    uint32_t result_id,
-    std::initializer_list<uint32_t> member_0_type_member_1_type_) {
+    uint32_t result_id, llvm::ArrayRef<uint32_t> member_0_type_member_1_type_) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -634,7 +632,7 @@ InstBuilder &InstBuilder::opTypePointer(uint32_t result_id,
 
 InstBuilder &InstBuilder::opTypeFunction(
     uint32_t result_id, uint32_t return_type,
-    std::initializer_list<uint32_t> parameter_0_type_parameter_1_type_) {
+    llvm::ArrayRef<uint32_t> parameter_0_type_parameter_1_type_) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -805,7 +803,7 @@ InstBuilder &InstBuilder::opConstantFalse(uint32_t result_type,
 
 InstBuilder &
 InstBuilder::opConstantComposite(uint32_t result_type, uint32_t result_id,
-                                 std::initializer_list<uint32_t> constituents) {
+                                 llvm::ArrayRef<uint32_t> constituents) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -925,9 +923,9 @@ InstBuilder &InstBuilder::opSpecConstantFalse(uint32_t result_type,
   return *this;
 }
 
-InstBuilder &InstBuilder::opSpecConstantComposite(
-    uint32_t result_type, uint32_t result_id,
-    std::initializer_list<uint32_t> constituents) {
+InstBuilder &
+InstBuilder::opSpecConstantComposite(uint32_t result_type, uint32_t result_id,
+                                     llvm::ArrayRef<uint32_t> constituents) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1035,9 +1033,10 @@ InstBuilder &InstBuilder::opFunctionEnd() {
   return *this;
 }
 
-InstBuilder &InstBuilder::opFunctionCall(
-    uint32_t result_type, uint32_t result_id, uint32_t function,
-    std::initializer_list<uint32_t> argument_0_argument_1_) {
+InstBuilder &
+InstBuilder::opFunctionCall(uint32_t result_type, uint32_t result_id,
+                            uint32_t function,
+                            llvm::ArrayRef<uint32_t> argument_0_argument_1_) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1210,10 +1209,9 @@ InstBuilder &InstBuilder::opCopyMemorySized(
   return *this;
 }
 
-InstBuilder &
-InstBuilder::opAccessChain(uint32_t result_type, uint32_t result_id,
-                           uint32_t base,
-                           std::initializer_list<uint32_t> indexes) {
+InstBuilder &InstBuilder::opAccessChain(uint32_t result_type,
+                                        uint32_t result_id, uint32_t base,
+                                        llvm::ArrayRef<uint32_t> indexes) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1240,7 +1238,7 @@ InstBuilder::opAccessChain(uint32_t result_type, uint32_t result_id,
 InstBuilder &
 InstBuilder::opInBoundsAccessChain(uint32_t result_type, uint32_t result_id,
                                    uint32_t base,
-                                   std::initializer_list<uint32_t> indexes) {
+                                   llvm::ArrayRef<uint32_t> indexes) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1264,10 +1262,10 @@ InstBuilder::opInBoundsAccessChain(uint32_t result_type, uint32_t result_id,
   return *this;
 }
 
-InstBuilder &
-InstBuilder::opPtrAccessChain(uint32_t result_type, uint32_t result_id,
-                              uint32_t base, uint32_t element,
-                              std::initializer_list<uint32_t> indexes) {
+InstBuilder &InstBuilder::opPtrAccessChain(uint32_t result_type,
+                                           uint32_t result_id, uint32_t base,
+                                           uint32_t element,
+                                           llvm::ArrayRef<uint32_t> indexes) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1347,7 +1345,7 @@ InstBuilder &InstBuilder::opGenericPtrMemSemantics(uint32_t result_type,
 InstBuilder &
 InstBuilder::opInBoundsPtrAccessChain(uint32_t result_type, uint32_t result_id,
                                       uint32_t base, uint32_t element,
-                                      std::initializer_list<uint32_t> indexes) {
+                                      llvm::ArrayRef<uint32_t> indexes) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1422,9 +1420,8 @@ InstBuilder &InstBuilder::opDecorationGroup(uint32_t result_id) {
   return *this;
 }
 
-InstBuilder &
-InstBuilder::opGroupDecorate(uint32_t decoration_group,
-                             std::initializer_list<uint32_t> targets) {
+InstBuilder &InstBuilder::opGroupDecorate(uint32_t decoration_group,
+                                          llvm::ArrayRef<uint32_t> targets) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1440,7 +1437,7 @@ InstBuilder::opGroupDecorate(uint32_t decoration_group,
 
 InstBuilder &InstBuilder::opGroupMemberDecorate(
     uint32_t decoration_group,
-    std::initializer_list<std::pair<uint32_t, uint32_t>> targets) {
+    llvm::ArrayRef<std::pair<uint32_t, uint32_t>> targets) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1514,10 +1511,10 @@ InstBuilder &InstBuilder::opVectorInsertDynamic(uint32_t result_type,
   return *this;
 }
 
-InstBuilder &
-InstBuilder::opVectorShuffle(uint32_t result_type, uint32_t result_id,
-                             uint32_t vector_1, uint32_t vector_2,
-                             std::initializer_list<uint32_t> components) {
+InstBuilder &InstBuilder::opVectorShuffle(uint32_t result_type,
+                                          uint32_t result_id, uint32_t vector_1,
+                                          uint32_t vector_2,
+                                          llvm::ArrayRef<uint32_t> components) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1545,9 +1542,9 @@ InstBuilder::opVectorShuffle(uint32_t result_type, uint32_t result_id,
   return *this;
 }
 
-InstBuilder &InstBuilder::opCompositeConstruct(
-    uint32_t result_type, uint32_t result_id,
-    std::initializer_list<uint32_t> constituents) {
+InstBuilder &
+InstBuilder::opCompositeConstruct(uint32_t result_type, uint32_t result_id,
+                                  llvm::ArrayRef<uint32_t> constituents) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1570,10 +1567,10 @@ InstBuilder &InstBuilder::opCompositeConstruct(
   return *this;
 }
 
-InstBuilder &
-InstBuilder::opCompositeExtract(uint32_t result_type, uint32_t result_id,
-                                uint32_t composite,
-                                std::initializer_list<uint32_t> indexes) {
+InstBuilder &InstBuilder::opCompositeExtract(uint32_t result_type,
+                                             uint32_t result_id,
+                                             uint32_t composite,
+                                             llvm::ArrayRef<uint32_t> indexes) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -1600,10 +1597,10 @@ InstBuilder::opCompositeExtract(uint32_t result_type, uint32_t result_id,
   return *this;
 }
 
-InstBuilder &
-InstBuilder::opCompositeInsert(uint32_t result_type, uint32_t result_id,
-                               uint32_t object, uint32_t composite,
-                               std::initializer_list<uint32_t> indexes) {
+InstBuilder &InstBuilder::opCompositeInsert(uint32_t result_type,
+                                            uint32_t result_id, uint32_t object,
+                                            uint32_t composite,
+                                            llvm::ArrayRef<uint32_t> indexes) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -5409,7 +5406,7 @@ InstBuilder &InstBuilder::opAtomicXor(uint32_t result_type, uint32_t result_id,
 
 InstBuilder &InstBuilder::opPhi(
     uint32_t result_type, uint32_t result_id,
-    std::initializer_list<std::pair<uint32_t, uint32_t>> variable_parent_) {
+    llvm::ArrayRef<std::pair<uint32_t, uint32_t>> variable_parent_) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -5499,9 +5496,10 @@ InstBuilder &InstBuilder::opBranch(uint32_t target_label) {
   return *this;
 }
 
-InstBuilder &InstBuilder::opBranchConditional(
-    uint32_t condition, uint32_t true_label, uint32_t false_label,
-    std::initializer_list<uint32_t> branch_weights) {
+InstBuilder &
+InstBuilder::opBranchConditional(uint32_t condition, uint32_t true_label,
+                                 uint32_t false_label,
+                                 llvm::ArrayRef<uint32_t> branch_weights) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -5520,9 +5518,9 @@ InstBuilder &InstBuilder::opBranchConditional(
   return *this;
 }
 
-InstBuilder &InstBuilder::opSwitch(
-    uint32_t selector, uint32_t default_target,
-    std::initializer_list<std::pair<uint32_t, uint32_t>> target) {
+InstBuilder &
+InstBuilder::opSwitch(uint32_t selector, uint32_t default_target,
+                      llvm::ArrayRef<std::pair<uint32_t, uint32_t>> target) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;
@@ -6404,7 +6402,7 @@ InstBuilder &InstBuilder::opEnqueueKernel(
     uint32_t result_type, uint32_t result_id, uint32_t queue, uint32_t flags,
     uint32_t nd_range, uint32_t num_events, uint32_t wait_events,
     uint32_t ret_event, uint32_t invoke, uint32_t param, uint32_t param_size,
-    uint32_t param_align, std::initializer_list<uint32_t> local_size) {
+    uint32_t param_align, llvm::ArrayRef<uint32_t> local_size) {
   if (!TheInst.empty()) {
     TheStatus = Status::NestedInst;
     return *this;