Skip to content
This repository was archived by the owner on May 27, 2021. It is now read-only.

Adapt to new anonymous pointers in Julia. #114

Merged
merged 1 commit into from
Sep 8, 2017
Merged

Adapt to new anonymous pointers in Julia. #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/device/intrinsics/memory_shared.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,21 @@ function emit_shmem(id, llvmtyp, len, align)
var = Symbol("@shmem", id)
jltyp = jltypes[llvmtyp]

decl = """$var = external addrspace(3) global [$len x $llvmtyp], align $align"""
if VERSION >= v"0.7.0-DEV.1704"
def = """%1 = getelementptr inbounds [$len x $llvmtyp], [$len x $llvmtyp] addrspace(3)* $var, i64 0, i64 0
%2 = addrspacecast $llvmtyp addrspace(3)* %1 to $llvmtyp addrspace(0)*
%3 = ptrtoint $llvmtyp* %2 to i64
ret i64 %3"""
else
def = """%1 = getelementptr inbounds [$len x $llvmtyp], [$len x $llvmtyp] addrspace(3)* $var, i64 0, i64 0
%2 = addrspacecast $llvmtyp addrspace(3)* %1 to $llvmtyp addrspace(0)*
ret $llvmtyp* %2"""
end

@gensym ptr
quote
$ptr = Base.llvmcall(
($"""$var = external addrspace(3) global [$len x $llvmtyp], align $align""",
$"""%1 = getelementptr inbounds [$len x $llvmtyp], [$len x $llvmtyp] addrspace(3)* $var, i64 0, i64 0
%2 = addrspacecast $llvmtyp addrspace(3)* %1 to $llvmtyp addrspace(0)*
ret $llvmtyp* %2"""),
Ptr{$jltyp}, Tuple{})
$ptr = Base.llvmcall(($decl, $def), Ptr{$jltyp}, Tuple{})
DevicePtr{$jltyp,AS.Shared}($ptr)
end
end
Expand Down
32 changes: 26 additions & 6 deletions src/pointer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,27 @@ if Base.VERSION >= v"0.6.1"
::Type{Val{align}}=Val{1}) where {T,A,align,I<:Integer}
eltyp = convert(LLVMType, T)

T_int = convert(LLVMType, Int)
T_ptr = convert(LLVMType, Ptr{T})

T_actual_ptr = LLVM.PointerType(eltyp)

# create a function
param_types = [LLVM.PointerType(eltyp),
LLVM.IntType(sizeof(Int)*8, jlctx[])]
param_types = [T_ptr, T_int]
llvmf = create_llvmf(eltyp, param_types)

# generate IR
Builder(jlctx[]) do builder
entry = BasicBlock(llvmf, "entry", jlctx[])
position!(builder, entry)

ptr = gep!(builder, parameters(llvmf)[1], [parameters(llvmf)[2]])
if VERSION >= v"0.7.0-DEV.1704"
ptr = inttoptr!(builder, parameters(llvmf)[1], T_actual_ptr)
else
ptr = parameters(llvmf)[1]
end

ptr = gep!(builder, ptr, [parameters(llvmf)[2]])
ptr_with_as = addrspacecast!(builder, ptr, LLVM.PointerType(eltyp, convert(Int, A)))
val = load!(builder, ptr_with_as)
alignment!(val, align)
Expand All @@ -129,17 +139,27 @@ if Base.VERSION >= v"0.6.1"
::Type{Val{align}}=Val{1}) where {T,A,align,I<:Integer}
eltyp = convert(LLVMType, T)

T_int = convert(LLVMType, Int)
T_ptr = convert(LLVMType, Ptr{T})

T_actual_ptr = LLVM.PointerType(eltyp)

# create a function
param_types = [LLVM.PointerType(eltyp), eltyp,
LLVM.IntType(sizeof(Int)*8, jlctx[])]
param_types = [T_ptr, eltyp, T_int]
llvmf = create_llvmf(LLVM.VoidType(jlctx[]), param_types)

# generate IR
Builder(jlctx[]) do builder
entry = BasicBlock(llvmf, "entry", jlctx[])
position!(builder, entry)

ptr = gep!(builder, parameters(llvmf)[1], [parameters(llvmf)[3]])
if VERSION >= v"0.7.0-DEV.1704"
ptr = inttoptr!(builder, parameters(llvmf)[1], T_actual_ptr)
else
ptr = parameters(llvmf)[1]
end

ptr = gep!(builder, ptr, [parameters(llvmf)[3]])
ptr_with_as = addrspacecast!(builder, ptr, LLVM.PointerType(eltyp, convert(Int, A)))
val = parameters(llvmf)[2]
inst = store!(builder, val, ptr_with_as)
Expand Down
10 changes: 8 additions & 2 deletions test/codegen.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,17 @@ end
x::Int
end

if VERSION >= v"0.7.0-DEV.1704"
typename = "{ i64 }"
else
typename = "%Aggregate(\\.\\d+)?"
end

ir = sprint(io->CUDAnative.code_llvm(io, codegen_aggregates, Tuple{Aggregate}))
@test ismatch(r"@julia_codegen_aggregates_\d+\(%Aggregate", ir)
@test ismatch(Regex("@julia_codegen_aggregates_\\d+\\($typename( addrspace\\(\\d+\\))?\\*"), ir)

ir = sprint(io->CUDAnative.code_llvm(io, codegen_aggregates, Tuple{Aggregate}; kernel=true))
@test ismatch(r"@ptxcall_codegen_aggregates_\d+\(%Aggregate", ir)
@test ismatch(Regex("@ptxcall_codegen_aggregates_\\d+\\($typename\\)"), ir)
end
end

Expand Down