[Backport to 18][SPIR-V 1.4] Allow OpCopyMemorySized to have Memory Operands for both Source and Target (KhronosGroup#2473)

This change addresses p.4 of KhronosGroup#2460.
No changes for OpCopyMemory as we currently don't use it in translation.

Author: vmaksimo

lib/SPIRV/SPIRVReader.cpp

@@ -1889,33 +1889,20 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
     MaybeAlign Align(BC->getAlignment());
     MaybeAlign SrcAlign =
         BC->getSrcAlignment() ? MaybeAlign(BC->getSrcAlignment()) : Align;
-    Type *EltTy =
-        transType(BC->getSource()->getType()->getPointerElementType());
-    uint64_t Size = M->getDataLayout().getTypeStoreSize(EltTy).getFixedValue();
+    llvm::Value *Size = transValue(BC->getSize(), F, BB);
     bool IsVolatile = BC->SPIRVMemoryAccess::isVolatile();
     IRBuilder<> Builder(BB);
 
-    llvm::Value *Src = transValue(BC->getSource(), F, BB);
-    CallInst *CI =
-        Builder.CreateMemCpy(Dst, Align, Src, SrcAlign, Size, IsVolatile);
-    if (isFuncNoUnwind())
-      CI->getFunction()->addFnAttr(Attribute::NoUnwind);
-    return mapValue(BV, CI);
-  }
+    // A ptr.annotation may have been generated for the destination variable.
+    replaceOperandWithAnnotationIntrinsicCallResult(F, Dst);
 
-  case OpCopyMemorySized: {
-    SPIRVCopyMemorySized *BC = static_cast<SPIRVCopyMemorySized *>(BV);
-    llvm::Value *Dst = transValue(BC->getTarget(), F, BB);
-    MaybeAlign Align(BC->getAlignment());
-    MaybeAlign SrcAlign =
-        BC->getSrcAlignment() ? MaybeAlign(BC->getSrcAlignment()) : Align;
-    llvm::Value *Size = transValue(BC->getSize(), F, BB);
-    bool IsVolatile = BC->SPIRVMemoryAccess::isVolatile();
-    IRBuilder<> Builder(BB);
+    if (!CI) {
+      llvm::Value *Src = transValue(BC->getSource(), F, BB);
 
-    llvm::Value *Src = transValue(BC->getSource(), F, BB);
-    CallInst *CI =
-        Builder.CreateMemCpy(Dst, Align, Src, SrcAlign, Size, IsVolatile);
+      // A ptr.annotation may have been generated for the source variable.
+      replaceOperandWithAnnotationIntrinsicCallResult(F, Src);
+      CI = Builder.CreateMemCpy(Dst, Align, Src, SrcAlign, Size, IsVolatile);
+    }
     if (isFuncNoUnwind())
       CI->getFunction()->addFnAttr(Attribute::NoUnwind);
     return mapValue(BV, CI);

lib/SPIRV/libSPIRV/SPIRVInstruction.h

@@ -2189,10 +2189,10 @@ class SPIRVCopyMemorySized : public SPIRVInstruction, public SPIRVMemoryAccess {
     updateModuleVersion();
   }
 
-  VersionNumber getRequiredSPIRVVersion() const override {
+  SPIRVWord getRequiredSPIRVVersion() const override {
     if (getSrcAlignment())
-      return VersionNumber::SPIRV_1_4;
-    return VersionNumber::SPIRV_1_0;
+      return static_cast<SPIRVWord>(VersionNumber::SPIRV_1_4);
+    return static_cast<SPIRVWord>(VersionNumber::SPIRV_1_0);
   }
 
   SPIRVValue *getSource() { return getValue(Source); }