Skip to content

Commit 7515735

Browse files
authored
[Backport to 18] SPIRVReader: Add OpCopyMemory support (#2779) (#2815)
Add support for translating `OpCopyMemory` into `llvm.memcpy`. Fixes #2769 (cherry picked from commit 8dc0349)
1 parent d192485 commit 7515735

File tree

2 files changed

+76
-7
lines changed

2 files changed

+76
-7
lines changed

lib/SPIRV/SPIRVReader.cpp

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,9 +1859,28 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
18591859
return mapValue(BV, LI);
18601860
}
18611861

1862+
case OpCopyMemory: {
1863+
auto *BC = static_cast<SPIRVCopyMemory *>(BV);
1864+
llvm::Value *Dst = transValue(BC->getTarget(), F, BB);
1865+
MaybeAlign Align(BC->getAlignment());
1866+
MaybeAlign SrcAlign =
1867+
BC->getSrcAlignment() ? MaybeAlign(BC->getSrcAlignment()) : Align;
1868+
Type *EltTy =
1869+
transType(BC->getSource()->getType()->getPointerElementType());
1870+
uint64_t Size = M->getDataLayout().getTypeStoreSize(EltTy).getFixedValue();
1871+
bool IsVolatile = BC->SPIRVMemoryAccess::isVolatile();
1872+
IRBuilder<> Builder(BB);
1873+
1874+
llvm::Value *Src = transValue(BC->getSource(), F, BB);
1875+
CallInst *CI =
1876+
Builder.CreateMemCpy(Dst, Align, Src, SrcAlign, Size, IsVolatile);
1877+
if (isFuncNoUnwind())
1878+
CI->getFunction()->addFnAttr(Attribute::NoUnwind);
1879+
return mapValue(BV, CI);
1880+
}
1881+
18621882
case OpCopyMemorySized: {
18631883
SPIRVCopyMemorySized *BC = static_cast<SPIRVCopyMemorySized *>(BV);
1864-
CallInst *CI = nullptr;
18651884
llvm::Value *Dst = transValue(BC->getTarget(), F, BB);
18661885
MaybeAlign Align(BC->getAlignment());
18671886
MaybeAlign SrcAlign =
@@ -1873,13 +1892,12 @@ Value *SPIRVToLLVM::transValueWithoutDecoration(SPIRVValue *BV, Function *F,
18731892
// A ptr.annotation may have been generated for the destination variable.
18741893
replaceOperandWithAnnotationIntrinsicCallResult(F, Dst);
18751894

1876-
if (!CI) {
1877-
llvm::Value *Src = transValue(BC->getSource(), F, BB);
1895+
llvm::Value *Src = transValue(BC->getSource(), F, BB);
18781896

1879-
// A ptr.annotation may have been generated for the source variable.
1880-
replaceOperandWithAnnotationIntrinsicCallResult(F, Src);
1881-
CI = Builder.CreateMemCpy(Dst, Align, Src, SrcAlign, Size, IsVolatile);
1882-
}
1897+
// A ptr.annotation may have been generated for the source variable.
1898+
replaceOperandWithAnnotationIntrinsicCallResult(F, Src);
1899+
CallInst *CI =
1900+
Builder.CreateMemCpy(Dst, Align, Src, SrcAlign, Size, IsVolatile);
18831901
if (isFuncNoUnwind())
18841902
CI->getFunction()->addFnAttr(Attribute::NoUnwind);
18851903
return mapValue(BV, CI);

test/OpCopyMemory.spvasm

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
; Check SPIRVReader support for OpCopyMemory.
2+
3+
; REQUIRES: spirv-as
4+
; RUN: spirv-as --target-env spv1.0 -o %t.spv %s
5+
; RUN: spirv-val %t.spv
6+
; RUN: llvm-spirv -r %t.spv -o %t.rev.bc
7+
; RUN: llvm-dis %t.rev.bc -o - | FileCheck %s
8+
9+
OpCapability Addresses
10+
OpCapability Int16
11+
OpCapability Kernel
12+
OpMemoryModel Physical64 OpenCL
13+
OpEntryPoint Kernel %kernel "copymemory"
14+
OpName %pStruct "pStruct"
15+
OpName %dstStruct "dstStruct"
16+
OpName %pShort "pShort"
17+
OpName %dstShort "dstShort"
18+
OpName %pInt "pInt"
19+
OpName %dstInt "dstInt"
20+
%ushort = OpTypeInt 16 0
21+
%uint = OpTypeInt 32 0
22+
%struct = OpTypeStruct %ushort %uint %ushort
23+
%void = OpTypeVoid
24+
%gptr_struct = OpTypePointer CrossWorkgroup %struct
25+
%pptr_struct = OpTypePointer Function %struct
26+
%gptr_short = OpTypePointer CrossWorkgroup %ushort
27+
%pptr_short = OpTypePointer Function %ushort
28+
%gptr_int = OpTypePointer CrossWorkgroup %uint
29+
%pptr_int = OpTypePointer Function %uint
30+
%kernel_sig = OpTypeFunction %void %gptr_short %gptr_int %gptr_struct
31+
%ushort_42 = OpConstant %ushort 42
32+
%uint_4242 = OpConstant %uint 4242
33+
%struct_init = OpConstantComposite %struct %ushort_42 %uint_4242 %ushort_42
34+
%kernel = OpFunction %void None %kernel_sig
35+
%dstShort = OpFunctionParameter %gptr_short
36+
%dstInt = OpFunctionParameter %gptr_int
37+
%dstStruct = OpFunctionParameter %gptr_struct
38+
%entry = OpLabel
39+
%pShort = OpVariable %pptr_short Function %ushort_42
40+
%pInt = OpVariable %pptr_int Function %uint_4242
41+
%pStruct = OpVariable %pptr_struct Function %struct_init
42+
OpCopyMemory %dstShort %pShort
43+
OpCopyMemory %dstInt %pInt
44+
OpCopyMemory %dstStruct %pStruct
45+
OpReturn
46+
OpFunctionEnd
47+
48+
; CHECK-LABEL: define spir_kernel void @copymemory(ptr addrspace(1) %dstShort, ptr addrspace(1) %dstInt, ptr addrspace(1) %dstStruct)
49+
; CHECK: call void @llvm.memcpy.p1.p0.i64(ptr addrspace(1) %dstShort, ptr @pShort, i64 2, i1 false)
50+
; CHECK: call void @llvm.memcpy.p1.p0.i64(ptr addrspace(1) %dstInt, ptr @pInt, i64 4, i1 false)
51+
; CHECK: call void @llvm.memcpy.p1.p0.i64(ptr addrspace(1) %dstStruct, ptr @pStruct, i64 12, i1 false)

0 commit comments

Comments
 (0)