Skip to content

Commit

Permalink
Updates for PTC generation, and other cuda cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@kk49
kk49 committed Jun 7, 2012
1 parent 250f603 commit b3635b7
Show file tree
Hide file tree
Showing 2 changed files with 165 additions and 33 deletions.
1 change: 1 addition & 0 deletions demat_base.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ type DeOpAdd end
type DeOpSub end
type DeOpMulEle end
type DeOpDivEle end
type DeOpLShift end

const deBinOpList = (:+,:-,:.*,:./);

Expand Down
197 changes: 164 additions & 33 deletions demat_be_cuda.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type jlCUContext
end

function reset(ctxt::jlCUContext)
if ctxt.handle != 0
if ctxt.handle != convert(typeof(ctxt.handle),0)
cuCtxDestroy(ctxt.handle);
ctxt.handle = 0;
end
Expand Down Expand Up @@ -54,7 +54,8 @@ type jlCUBuffer
end

function clear(buffer::jlCUBuffer)
if buffer.ptr != 0
if buffer.ptr != convert(typeof(buffer.ptr),0)
println("CUDA Clearing $buffer");
cuMemFree(buffer.ptr);
buffer.sz = 0;
buffer.ptr = 0;
Expand All @@ -75,7 +76,7 @@ end

function copyto{T}(dst::jlCUBuffer,src::Array{T,1})
@assert numel(dst) == numel(src)*sizeof(T);
@time cuMemcpyHtoD(dst.ptr,src,dst.sz);
cuMemcpyHtoD(dst.ptr,src,dst.sz);
return dst;
end

Expand Down Expand Up @@ -119,6 +120,10 @@ type DeArrCuda{T,N} <: DeArr{DeBackEndCuda,T,N}
buffer::jlCUBuffer
end

function eltype{T,N}(arr::DeArrCuda{T,N})
return T;
end

function numel{T}(arr::DeArrCuda{T,1})
return arr.sz;
end
Expand Down Expand Up @@ -150,58 +155,184 @@ typealias DeVecCu{T} DeArrCuda{T,1}
typealias DeMatCu{T} DeArrCuda{T,2}

# DeCudaEnviroment used to count/allocate registers for PTX generation
const registerTypeToPrefix = {Float32=>"%f32_",Ptr{Float32}=>"%pf32_",Float64=>"%f64_",Ptr{Float64}=>"%pf64_",Uint32=>"%u32_",Ptr{Uint32}=>"%pu32_",Int32=>"%s32_",Ptr{Int32}=>"%ps32_"};

type DePtxEnv
function DePtxEnv()
me = new(0,0,0,0);
me = new(Dict(),Array(Any,0),Array(String,0));
return me;
end

f32Cnt::Int
pf32Cnt::Int
f64Cnt::Int
pf64Cnt::Int
registerCounter::Dict;
paramTypes::Array{Any,1};
paramNames::Array{String,1};
end

type PtxRegister{dataType}
id::String;
end

function registerAlloc!(T,env::DePtxEnv)
prefix = registerTypeToPrefix[T];

if !has(env.registerCounter,T)
env.registerCounter[T] = 0;
end

id = env.registerCounter[T];
env.registerCounter[T] += 1;

return PtxRegister{T}("$(prefix)$(id)");
end

function registerType{dataType}(reg::PtxRegister{dataType})
return dataType;
end

function paramAlloc!(T,env::DePtxEnv)
paramIndex = numel(env.paramTypes);
paramName = "%p$(paramIndex)";
push(env.paramTypes,T);
push(env.paramNames,paramName);

return (paramName,paramIndex);
end

function genRegisterF32!(env::DePtxEnv)
regStr = "%f$(env.f32Cnt)";
env.f32Cnt +=1;
return regStr;
abstract PtxOp;

type msGlobal end
type msParam end

type PtxOpLoad{memorySpace,dataType} <: PtxOp
dst::PtxRegister{dataType};
addr::Union(String,PtxRegister,(PtxRegister,Int32),Uint32); #named address, register, register+offset, absolute
end

type PtxOpStore{memorySpace,dataType} <: PtxOp
addr::Union(String,PtxRegister,(PtxRegister,Int32),Uint32); #named address, register, register+offset, absolute
src::PtxRegister{dataType};
end

type PtxOpBin{op,dataType} <: PtxOp
dst::PtxRegister{dataType};
op0::Union(Int64,Uint64,Float32,Float64,PtxRegister{dataType});
op1::Union(Int64,Uint64,Float32,Float64,PtxRegister{dataType});
end

function genRegisterPtrF32!(env::DePtxEnv)
regStr = "%pf$(env.f32Cnt)";
env.pf32Cnt +=1;
return regStr;
# (registerType,register,param setup function, IR Ops)

function de_cude_eval(a::DeConst,env,indexReg)
# allocate destination register
rType = typeof(a.p1);
r = registerAlloc!(rType,env);

# allocate space in param structure
(paramName,paramIndex) = paramAlloc!(rType,env);

paramSetupFunc = @eval function(param,v::DeConst) param[$paramIndex] = [v.p1] end

ops =
[ PtxOpLoad{msParam,rType}(r,paramName)
];

return ( rType , r , paramSetupFunc , ops );
end

function genRegisterF64!(env::DePtxEnv)
regStr = "%d$(env.f64Cnt)";
env.f64Cnt +=1;
return regStr;
function de_cuda_eval(a::DeReadOp,env,indexReg)
# allocate ptr and destination register
rType = eltype(a.p1);
r = registerAlloc!(rType,env);
srcType = Ptr{rType};
src = registerAlloc!(srcType,env);
offset = registerAlloc!(srcType,env);
srcOffset = registerAlloc!(srcType,env);

# allocate space in param structure
(paramName,paramIndex) = paramAlloc!(srcType,env);

paramSetupFunc = @eval function(param,v::DeReadOp) param[$paramIndex] = [v.p1.buffer.ptr] end

ops =
[ PtxOpLoad{msParam,srcType}(src,paramName)
PtxOpBin{DeOpLShift,srcType}(offset,indexReg,convert(Uint64,log2(sizeof(rType))))
PtxOpBin{DeOpAdd,srcType}(srcOffset,src,offset)
PtxOpLoad{msGlobal,rType}(r,srcOffset)
];

return ( rType , r , paramSetupFunc , ops );
end

function genRegisterPtrF64!(env::DePtxEnv)
regStr = "%pd$(env.pf64Cnt)";
env.pf64Cnt +=1;
return regStr;
function de_cuda_eval{OT}(v::DeBinOp{OT},env,indexReg)

p1 = de_cuda_eval(v.p1,env,indexReg)
p2 = de_cuda_eval(v.p2,env,indexReg)

rType = promote_type(p1[1],p2[1]);
r = registerAlloc!(rType,env);

paramSetupFunc = @eval function(param,v::DeBinOp{OT}) $(p1[3])(param,v.p1); $(p2[3])(param,v.p2); end

ops =
[ p1[4]
p2[4]
PtxOpBin{OT,rType}(r,p1[2],p2[2])
];

return ( rType , r , paramSetupFunc , ops );
end

# assignement
function assign(lhs::DeVecCu,rhs::DeExpr)
return lhs
buildTime = @elapsed begin
env = DePtxEnv();
indexRegister = registerAlloc!(Uint32,env);
ret = de_cuda_eval(rhs,env,indexRegister);
println(ret[1]);
println(ret[2]);
println(ret[3]);
println(ret[4]);

rhsType = typeof(rhs);

#@eval function assign1(plhs::DeVecJ,($prhs)::($rhsType))
# rhsSz = de_check_dims($prhs)
# lhsSz = size(plhs)
# if rhsSz != lhsSz
# error("src & dst size does not match. NOT IMPLEMENTED FOR SCALARS FIX")
# end

# N = size(plhs,1)
# lhsData = plhs.data
# $rhsPreamble
# for ($i) = 1:N
# $rhsKernel
# lhsData[($i)] = ($rhsResult)
# end

# return plhs
#end

#global assign
#@eval assign(lhs::DeVecJ,rhs::($rhsType)) = assign1(lhs,rhs)
end

println("DeMatJulia: Built New Assign (took $buildTime seconds) ... $rhsType");

return lhs;
end

assign(lhs::DeArrCuda,rhs::DeEle) = assign(lhs,de_promote(rhs)...)
assign(lhs::DeArrCuda,rhs::Number) = assign(lhs,de_promote(rhs)...)


#initialize cuda
cuInit();
#initialize cuda only once
if !isbound(:deCudaCtx)
cuInit();

#list cuda devices, select device zero for now
deCudaDeviceCount = jlcuDeviceList();
if deCudaDeviceCount > 1
println("More than one CUDA device found, using the first one.");
#list cuda devices, select device zero for now
deCudaDeviceCount = jlcuDeviceList();
if deCudaDeviceCount > 1
println("More than one CUDA device found, using the first one.");
end
deCudaCtx = cuCtxCreate(0,cuDeviceGet(0));
end
deCudaCtx = cuCtxCreate(0,cuDeviceGet(0));

0 comments on commit b3635b7

Please sign in to comment.