Daniel/master-thesis
1
0
Fork 0
Code Issues 3 Pull Requests Actions 1 Packages Projects 1 Releases Wiki Activity

added more unit tests. Conversion to postfix not working
Some checks failed
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, 1.6) (push) Has been cancelled
Details
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, pre) (push) Has been cancelled
Details
CI / Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }} (x64, ubuntu-latest, 1.10) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Daniel
2024-09-01 12:09:29 +02:00
parent 6a1811ae6b
commit c608abfb17
3 changed files with 55 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
package/src/Interpreter.jl
View File

@ -22,6 +22,12 @@ function interpret(expressions::Vector{ExpressionProcessing.PostfixType}, variab
# each expression has nr. of variable sets (nr. of columns of the variables) results and there are n expressions
cudaResults = CuArray{Float64}(undef, variableCols, length(expressions))
# println("cudaVars")
# println(cudaVars)
# println("cudaParams")
# println(cudaParams)
# println("cudaExprs")
# println(cudaExprs)
# Start kernel for each expression to ensure that no warp is working on different expressions
for i in eachindex(expressions)
kernel = @cuda launch=false interpret_expression(cudaExprs, cudaVars, cudaParams, cudaResults, cudaStepsize, i)
@ -32,7 +38,6 @@ function interpret(expressions::Vector{ExpressionProcessing.PostfixType}, variab
kernel(cudaExprs, cudaVars, cudaParams, cudaResults, cudaStepsize, i; threads, blocks)
end
# TODO: Wait for all the kernels to finish to return the result
return cudaResults
end
@ -51,9 +56,9 @@ function interpret_expression(expressions::CuDeviceArray{ExpressionElement}, var
operationStack = MVector{MAX_STACK_SIZE, Float64}(undef) # Try to get this to function with variable size too, to allow better memory usage
operationStackTop = 0 # stores index of the last defined/valid value
for setIndex in index:stride
firstVariableIndex = ((setIndex - 1) * stepsize[3]) # Exclusive
for varSetIndex in index:stride
firstVariableIndex = ((varSetIndex - 1) * stepsize[3]) # Exclusive
for i in firstExprIndex:lastExprIndex
if expressions[i].Type == EMPTY
break
@ -64,14 +69,13 @@ function interpret_expression(expressions::CuDeviceArray{ExpressionElement}, var
if val > 0
operationStack[operationStackTop] = variables[firstVariableIndex + val]
else
val = abs(val)
val = -val
operationStack[operationStackTop] = parameters[firstParamIndex + val]
end
elseif expressions[i].Type == FLOAT64
operationStackTop += 1
operationStack[operationStackTop] = reinterpret(Float64, expressions[i].Value)
elseif expressions[i].Type == OPERATOR
# TODO Maybe put this in seperate function
type = reinterpret(Operator, expressions[i].Value)
if type == ADD
operationStackTop -= 1
@ -103,8 +107,8 @@ function interpret_expression(expressions::CuDeviceArray{ExpressionElement}, var
end
end
# "(exprIndex - 1) * variableCols" -> calculates the column in which to insert the result (expression = column)
# "+ setIndex" -> to get the row inside the column at which to insert the result of the variable set (variable set = row)
resultIndex = convert(Int, (exprIndex - 1) * variableCols + setIndex) # Inclusive
# "+ varSetIndex" -> to get the row inside the column at which to insert the result of the variable set (variable set = row)
resultIndex = convert(Int, (exprIndex - 1) * variableCols + varSetIndex) # Inclusive
results[resultIndex] = operationStack[operationStackTop]
end