Changes from code review.

Author: s-perron

llvm/lib/Target/SPIRV/SPIRVLegalizePointerCast.cpp

@@ -118,18 +118,14 @@ class SPIRVLegalizePointerCast : public FunctionPass {
 
   // Loads elements from an array and constructs a vector.
   Value *loadVectorFromArray(IRBuilder<> &B, FixedVectorType *TargetType,
-                             ArrayType *SourceType, Value *Source) {
-    // Ensure the element types of the array and vector are the same.
-    assert(TargetType->getElementType() == SourceType->getElementType() &&
-           "Element types of array and vector must be the same.");
-
+                             Value *Source) {
     // Load each element of the array.
     SmallVector<Value *, 4> LoadedElements;
     for (unsigned i = 0; i < TargetType->getNumElements(); ++i) {
       // Create a GEP to access the i-th element of the array.
       SmallVector<Type *, 2> Types = {Source->getType(), Source->getType()};
       SmallVector<Value *, 4> Args;
-      Args.push_back(B.getInt1(true));
+      Args.push_back(B.getInt1(false));
       Args.push_back(Source);
       Args.push_back(B.getInt32(0));
       Args.push_back(ConstantInt::get(B.getInt32Ty(), i));
@@ -143,7 +139,7 @@ class SPIRVLegalizePointerCast : public FunctionPass {
     }
 
     // Build the vector from the loaded elements.
-    Value *NewVector = UndefValue::get(TargetType);
+    Value *NewVector = PoisonValue::get(TargetType);
     buildAssignType(B, TargetType, NewVector);
 
     for (unsigned i = 0; i < TargetType->getNumElements(); ++i) {
@@ -173,7 +169,7 @@ class SPIRVLegalizePointerCast : public FunctionPass {
       SmallVector<Type *, 2> Types = {DstArrayPtr->getType(),
                                       DstArrayPtr->getType()};
       SmallVector<Value *, 4> Args;
-      Args.push_back(B.getInt1(true));
+      Args.push_back(B.getInt1(false));
       Args.push_back(DstArrayPtr);
       Args.push_back(B.getInt32(0));
       Args.push_back(ConstantInt::get(B.getInt32Ty(), i));
@@ -234,7 +230,7 @@ class SPIRVLegalizePointerCast : public FunctionPass {
     else if (SST && SST->getTypeAtIndex(0u) == ToTy)
       Output = loadFirstValueFromAggregate(B, ToTy, OriginalOperand, LI);
     else if (SAT && DVT && SAT->getElementType() == DVT->getElementType())
-      Output = loadVectorFromArray(B, DVT, SAT, OriginalOperand);
+      Output = loadVectorFromArray(B, DVT, OriginalOperand);
     else
       llvm_unreachable("Unimplemented implicit down-cast from load.");
 

llvm/test/CodeGen/SPIRV/pointers/load-store-vec-from-array.ll

@@ -21,30 +21,30 @@
 
 define spir_func void @main() {
 entry:
-; CHECK:      [[GEP0:%[0-9]+]] = OpInBoundsAccessChain [[PTR_FLOAT]] [[G_IN]] [[UINT0]]
+; CHECK:      [[GEP0:%[0-9]+]] = OpAccessChain [[PTR_FLOAT]] [[G_IN]] [[UINT0]]
 ; CHECK-NEXT: [[LOAD0:%[0-9]+]] = OpLoad [[FLOAT]] [[GEP0]]
-; CHECK-NEXT: [[GEP1:%[0-9]+]] = OpInBoundsAccessChain [[PTR_FLOAT]] [[G_IN]] [[UINT1]]
+; CHECK-NEXT: [[GEP1:%[0-9]+]] = OpAccessChain [[PTR_FLOAT]] [[G_IN]] [[UINT1]]
 ; CHECK-NEXT: [[LOAD1:%[0-9]+]] = OpLoad [[FLOAT]] [[GEP1]]
-; CHECK-NEXT: [[GEP2:%[0-9]+]] = OpInBoundsAccessChain [[PTR_FLOAT]] [[G_IN]] [[UINT2]]
+; CHECK-NEXT: [[GEP2:%[0-9]+]] = OpAccessChain [[PTR_FLOAT]] [[G_IN]] [[UINT2]]
 ; CHECK-NEXT: [[LOAD2:%[0-9]+]] = OpLoad [[FLOAT]] [[GEP2]]
-; CHECK-NEXT: [[GEP3:%[0-9]+]] = OpInBoundsAccessChain [[PTR_FLOAT]] [[G_IN]] [[UINT3]]
+; CHECK-NEXT: [[GEP3:%[0-9]+]] = OpAccessChain [[PTR_FLOAT]] [[G_IN]] [[UINT3]]
 ; CHECK-NEXT: [[LOAD3:%[0-9]+]] = OpLoad [[FLOAT]] [[GEP3]]
 ; CHECK-NEXT: [[VEC_INSERT0:%[0-9]+]] = OpCompositeInsert [[VEC4FLOAT]] [[LOAD0]] [[UNDEF_VEC]] 0
 ; CHECK-NEXT: [[VEC_INSERT1:%[0-9]+]] = OpCompositeInsert [[VEC4FLOAT]] [[LOAD1]] [[VEC_INSERT0]] 1
 ; CHECK-NEXT: [[VEC_INSERT2:%[0-9]+]] = OpCompositeInsert [[VEC4FLOAT]] [[LOAD2]] [[VEC_INSERT1]] 2
 ; CHECK-NEXT: [[VEC:%[0-9]+]] = OpCompositeInsert [[VEC4FLOAT]] [[LOAD3]] [[VEC_INSERT2]] 3
   %0 = load <4 x float>, ptr addrspace(10) @G_in, align 64
 
-; CHECK-NEXT: [[GEP_OUT0:%[0-9]+]] = OpInBoundsAccessChain [[PTR_FLOAT]] [[G_OUT]] [[UINT0]]
+; CHECK-NEXT: [[GEP_OUT0:%[0-9]+]] = OpAccessChain [[PTR_FLOAT]] [[G_OUT]] [[UINT0]]
 ; CHECK-NEXT: [[VEC_EXTRACT0:%[0-9]+]] = OpCompositeExtract [[FLOAT]] [[VEC]] 0
 ; CHECK-NEXT: OpStore [[GEP_OUT0]] [[VEC_EXTRACT0]]
-; CHECK-NEXT: [[GEP_OUT1:%[0-9]+]] = OpInBoundsAccessChain [[PTR_FLOAT]] [[G_OUT]] [[UINT1]]
+; CHECK-NEXT: [[GEP_OUT1:%[0-9]+]] = OpAccessChain [[PTR_FLOAT]] [[G_OUT]] [[UINT1]]
 ; CHECK-NEXT: [[VEC_EXTRACT1:%[0-9]+]] = OpCompositeExtract [[FLOAT]] [[VEC]] 1
 ; CHECK-NEXT: OpStore [[GEP_OUT1]] [[VEC_EXTRACT1]]
-; CHECK-NEXT: [[GEP_OUT2:%[0-9]+]] = OpInBoundsAccessChain [[PTR_FLOAT]] [[G_OUT]] [[UINT2]]
+; CHECK-NEXT: [[GEP_OUT2:%[0-9]+]] = OpAccessChain [[PTR_FLOAT]] [[G_OUT]] [[UINT2]]
 ; CHECK-NEXT: [[VEC_EXTRACT2:%[0-9]+]] = OpCompositeExtract [[FLOAT]] [[VEC]] 2
 ; CHECK-NEXT: OpStore [[GEP_OUT2]] [[VEC_EXTRACT2]]
-; CHECK-NEXT: [[GEP_OUT3:%[0-9]+]] = OpInBoundsAccessChain [[PTR_FLOAT]] [[G_OUT]] [[UINT3]]
+; CHECK-NEXT: [[GEP_OUT3:%[0-9]+]] = OpAccessChain [[PTR_FLOAT]] [[G_OUT]] [[UINT3]]
 ; CHECK-NEXT: [[VEC_EXTRACT3:%[0-9]+]] = OpCompositeExtract [[FLOAT]] [[VEC]] 3
 ; CHECK-NEXT: OpStore [[GEP_OUT3]] [[VEC_EXTRACT3]]
   store <4 x float> %0, ptr addrspace(10) @G_out, align 64