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

Merge branch 'master' of git://factorcode.org/git/factor into klazuka 

Conflicts:
	basis/math/vectors/vectors-docs.factor
db4
Doug Coleman 2009-10-02 15:59:19 -05:00
parent 67167cf9ea f93dcfc792
commit a070e9a3a9
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
basis/math/vectors/vectors-docs.factor
View File

@ -50,8 +50,20 @@ ARTICLE: "math-vectors-arithmetic" "Vector arithmetic"
v~ v~
} ; } ;
ARTICLE: "math-vectors-logic" "Vector componentwise logic" ARTICLE: "math-vectors-shuffle" "Vector shuffling, packing, and unpacking"
{ $notes
"These operations are primarily meant to be used with " { $vocab-link "math.vectors.simd" } " types. The software fallbacks for types not supported by hardware will not perform well."
}
$nl
{ $subsection vshuffle }
{ $subsection vbroadcast }
{ $subsection hlshift }
{ $subsection hrshift } ;
ARTICLE: "math-vectors-logic" "Vector component- and bit-wise logic"
{ $notes
"See " { $link "math-vectors-simd-logic" } " for notes about using comparison and logical operations with SIMD vector types." "See " { $link "math-vectors-simd-logic" } " for notes about using comparison and logical operations with SIMD vector types."
}
$nl $nl
"Element comparisons:" "Element comparisons:"
{ $subsections { $subsections
@ -77,6 +89,7 @@ $nl
vrshift vrshift
} }
"Element logical operations:" "Element logical operations:"
<<<<<<< HEAD:basis/math/vectors/vectors-docs.factor
{ $subsections { $subsections
vand vand
vandn vandn
@ -93,6 +106,18 @@ $nl
} }
"Element shuffling:" "Element shuffling:"
{ $subsections vshuffle } ; { $subsections vshuffle } ;
=======
{ $subsection vand }
{ $subsection vandn }
{ $subsection vor }
{ $subsection vxor }
{ $subsection vnot }
{ $subsection v? }
"Vector tests:"
{ $subsection vall? }
{ $subsection vany? }
{ $subsection vnone? } ;
>>>>>>> 271e6ddde513aa3de68337c67127a2a6da5ef6f4:basis/math/vectors/vectors-docs.factor
ARTICLE: "math-vectors-misc" "Miscellaneous vector functions" ARTICLE: "math-vectors-misc" "Miscellaneous vector functions"
{ $subsections { $subsections
@ -163,11 +188,18 @@ $nl
ARTICLE: "math-vectors" "Vector operations" ARTICLE: "math-vectors" "Vector operations"
"Any Factor sequence can be used to represent a mathematical vector, however for best performance, the sequences defined by the " { $vocab-link "specialized-arrays" } " and " { $vocab-link "math.vectors.simd" } " vocabularies should be used." "Any Factor sequence can be used to represent a mathematical vector, however for best performance, the sequences defined by the " { $vocab-link "specialized-arrays" } " and " { $vocab-link "math.vectors.simd" } " vocabularies should be used."
<<<<<<< HEAD:basis/math/vectors/vectors-docs.factor
{ $subsections { $subsections
"math-vectors-arithmetic" "math-vectors-arithmetic"
"math-vectors-logic" "math-vectors-logic"
"math-vectors-misc" "math-vectors-misc"
} ; } ;
=======
{ $subsection "math-vectors-arithmetic" }
{ $subsection "math-vectors-logic" }
{ $subsection "math-vectors-shuffle" }
{ $subsection "math-vectors-misc" } ;
>>>>>>> 271e6ddde513aa3de68337c67127a2a6da5ef6f4:basis/math/vectors/vectors-docs.factor
ABOUT: "math-vectors" ABOUT: "math-vectors"
@ -336,11 +368,11 @@ HELP: vrshift
HELP: hlshift HELP: hlshift
{ $values { "u" "a SIMD array" } { "n" "a non-negative integer" } { "w" "a SIMD array" } } { $values { "u" "a SIMD array" } { "n" "a non-negative integer" } { "w" "a SIMD array" } }
{ $description "Shifts the entire SIMD array to the left by " { $snippet "n" } " bytes. This word may only be used in a context where the compiler can statically infer that the input is a SIMD array." } ; { $description "Shifts the entire SIMD array to the left by " { $snippet "n" } " bytes, filling the vacated right-hand bits with zeroes. This word may only be used in a context where the compiler can statically infer that the input is a SIMD array." } ;
HELP: hrshift HELP: hrshift
{ $values { "u" "a SIMD array" } { "n" "a non-negative integer" } { "w" "a SIMD array" } } { $values { "u" "a SIMD array" } { "n" "a non-negative integer" } { "w" "a SIMD array" } }
{ $description "Shifts the entire SIMD array to the right by " { $snippet "n" } " bytes. This word may only be used in a context where the compiler can statically infer that the input is a SIMD array." } ; { $description "Shifts the entire SIMD array to the right by " { $snippet "n" } " bytes, filling the vacated left-hand bits with zeroes. This word may only be used in a context where the compiler can statically infer that the input is a SIMD array." } ;
HELP: vbroadcast HELP: vbroadcast
{ $values { "u" "a SIMD array" } { "n" "a non-negative integer" } { "v" "a SIMD array" } } { $values { "u" "a SIMD array" } { "n" "a non-negative integer" } { "v" "a SIMD array" } }