steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cuda: rearrange function-launcher grid and block dim to be in the right order

db4
Joe Groff 2010-05-05 17:38:37 -07:00
parent bc210fa8d4
commit 1d916246b0
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extra/cuda/cuda.factor
View File

@ -19,7 +19,7 @@ TUPLE: launcher
swap >>device ; inline swap >>device ; inline
TUPLE: function-launcher TUPLE: function-launcher
dim-block dim-grid shared-size stream ; dim-grid dim-block shared-size stream ;
: with-cuda-context ( flags device quot -- ) : with-cuda-context ( flags device quot -- )
H{ } clone cuda-modules set-global H{ } clone cuda-modules set-global
@ -48,16 +48,23 @@ dim-block dim-grid shared-size stream ;
{ [ dup a:void* = ] [ drop 4 [ cuda-int* ] ] } { [ dup a:void* = ] [ drop 4 [ cuda-int* ] ] }
} cond ; } cond ;
<PRIVATE
: block-dim ( block -- x y z )
dup sequence? [ 3 1 pad-tail first3 ] [ 1 1 ] if ; inline
: grid-dim ( block -- x y )
dup sequence? [ 2 1 pad-tail first2 ] [ 1 ] if ; inline
PRIVATE>
: run-function-launcher ( function-launcher function -- ) : run-function-launcher ( function-launcher function -- )
swap swap
{ {
[ dim-block>> first3 function-block-shape* ] [ dim-block>> block-dim function-block-shape* ]
[ shared-size>> function-shared-size* ] [ shared-size>> function-shared-size* ]
[ [
dim-grid>> [ dim-grid>> [
launch-function* launch-function*
] [ ] [
first2 launch-function-grid* grid-dim launch-function-grid*
] if-empty ] if-empty
] ]
} 2cleave ; } 2cleave ;

2
extra/cuda/demos/hello-world/hello-world.factor
View File

@ -17,7 +17,7 @@ CUDA-FUNCTION: helloWorld ( char* string-ptr ) ;
"CUDA device " ": " surround write "CUDA device " ": " surround write
"Hello World!" >byte-array [ - ] map-index host>device &cuda-free "Hello World!" >byte-array [ - ] map-index host>device &cuda-free
[ { 6 1 1 } { 2 1 } 2<<< helloWorld ] [ { 2 1 } { 6 1 1 } 2<<< helloWorld ]
[ 12 device>host >string print ] bi [ 12 device>host >string print ] bi
] with-destructors ] with-destructors
] with-each-cuda-device ; ] with-each-cuda-device ;

6
extra/cuda/syntax/syntax.factor
View File

@ -13,11 +13,11 @@ SYNTAX: CUDA-FUNCTION:
scan [ create-in current-cuda-library get ] [ ] bi scan [ create-in current-cuda-library get ] [ ] bi
";" scan-c-args drop define-cuda-word ; ";" scan-c-args drop define-cuda-word ;
: 2<<< ( dim-block dim-grid -- function-launcher ) : 2<<< ( dim-grid dim-block -- function-launcher )
0 f function-launcher boa ; inline 0 f function-launcher boa ; inline
: 3<<< ( dim-block dim-grid shared-size -- function-launcher ) : 3<<< ( dim-grid dim-block shared-size -- function-launcher )
f function-launcher boa ; inline f function-launcher boa ; inline
: 4<<< ( dim-block dim-grid shared-size stream -- function-launcher ) : 4<<< ( dim-grid dim-block shared-size stream -- function-launcher )
function-launcher boa ; inline function-launcher boa ; inline