Changes from code review.

Author: s-perron

llvm/lib/Target/SPIRV/SPIRVGlobalRegistry.cpp

@@ -757,12 +757,11 @@ static std::string GetSpirvImageTypeName(const SPIRVType *Type,
                                          const std::string &Prefix) {
   Register SampledTypeReg = Type->getOperand(1).getReg();
   auto *SampledType = MIRBuilder.getMRI()->getUniqueVRegDef(SampledTypeReg);
-  std::string TypeName =
-       Prefix + buildSpirvTypeName(SampledType, MIRBuilder);
+  std::string TypeName = Prefix + buildSpirvTypeName(SampledType, MIRBuilder);
   for (uint32_t I = 2; I < Type->getNumOperands(); ++I) {
     TypeName = (TypeName + '_' + Twine(Type->getOperand(I).getImm())).str();
   }
-    return TypeName;
+  return TypeName;
 }
 
 Register SPIRVGlobalRegistry::getOrCreateGlobalVariableWithBinding(

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

@@ -931,14 +931,15 @@ bool hasNonUniformDecoration(Register Reg, const MachineRegisterInfo &MRI) {
   }
   return false;
 }
-void addOpAccessChainReqs(const MachineInstr &instr,
-                          SPIRV::RequirementHandler &handler,
-                          const SPIRVSubtarget &subtarget) {
-  const MachineRegisterInfo &MRI = instr.getMF()->getRegInfo();
+
+void addOpAccessChainReqs(const MachineInstr &Instr,
+                          SPIRV::RequirementHandler &Handler,
+                          const SPIRVSubtarget &Subtarget) {
+  const MachineRegisterInfo &MRI = Instr.getMF()->getRegInfo();
   // Get the result type. If it is an image type, then the shader uses
   // descriptor indexing. The appropriate capabilities will be added based
   // on the specifics of the image.
-  Register ResTypeReg = instr.getOperand(1).getReg();
+  Register ResTypeReg = Instr.getOperand(1).getReg();
   MachineInstr *ResTypeInst = MRI.getUniqueVRegDef(ResTypeReg);
 
   assert(ResTypeInst->getOpcode() == SPIRV::OpTypePointer);
@@ -953,47 +954,48 @@ void addOpAccessChainReqs(const MachineInstr &instr,
   MachineInstr *PointeeType = MRI.getUniqueVRegDef(PointeeTypeReg);
   if (PointeeType->getOpcode() != SPIRV::OpTypeImage &&
       PointeeType->getOpcode() != SPIRV::OpTypeSampledImage &&
-      PointeeType->getOpcode() != SPIRV::OpTypeSampler)
+      PointeeType->getOpcode() != SPIRV::OpTypeSampler) {
     return;
+  }
 
   bool IsNonUniform =
-      hasNonUniformDecoration(instr.getOperand(0).getReg(), MRI);
+      hasNonUniformDecoration(Instr.getOperand(0).getReg(), MRI);
   if (isUniformTexelBuffer(PointeeType)) {
     if (IsNonUniform)
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::UniformTexelBufferArrayNonUniformIndexingEXT);
     else
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::UniformTexelBufferArrayDynamicIndexingEXT);
   } else if (isInputAttachment(PointeeType)) {
     if (IsNonUniform)
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::InputAttachmentArrayNonUniformIndexingEXT);
     else
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::InputAttachmentArrayDynamicIndexingEXT);
   } else if (isStorageTexelBuffer(PointeeType)) {
     if (IsNonUniform)
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::StorageTexelBufferArrayNonUniformIndexingEXT);
     else
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::StorageTexelBufferArrayDynamicIndexingEXT);
   } else if (isSampledImage(PointeeType) ||
              isCombinedImageSampler(PointeeType) ||
              PointeeType->getOpcode() == SPIRV::OpTypeSampler) {
     if (IsNonUniform)
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::SampledImageArrayNonUniformIndexingEXT);
     else
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::SampledImageArrayDynamicIndexing);
   } else if (isStorageImage(PointeeType)) {
     if (IsNonUniform)
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::StorageImageArrayNonUniformIndexingEXT);
     else
-      handler.addRequirements(
+      Handler.addRequirements(
           SPIRV::Capability::StorageImageArrayDynamicIndexing);
   }
 }
@@ -1117,14 +1119,15 @@ void addInstrRequirements(const MachineInstr &MI,
   case SPIRV::OpConstantSampler:
     Reqs.addCapability(SPIRV::Capability::LiteralSampler);
     break;
+  case SPIRV::OpInBoundsAccessChain:
   case SPIRV::OpAccessChain:
     addOpAccessChainReqs(MI, Reqs, ST);
     break;
   case SPIRV::OpTypeImage:
     addOpTypeImageReqs(MI, Reqs, ST);
     break;
   case SPIRV::OpTypeSampler:
-    if (ST.isOpenCLEnv()) {
+    if (!ST.isVulkanEnv()) {
       Reqs.addCapability(SPIRV::Capability::ImageBasic);
     }
     break;