-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Before this isn't fast, it doesn't make sense to switch to 0.4 with native tuples
- Loading branch information
1 parent
ec76c62
commit 21a2c21
Showing
1 changed file
with
152 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,152 @@ | ||
println(versioninfo()) | ||
import Base: + | ||
immutable Vec{T} | ||
x::T | ||
y::T | ||
z::T | ||
end | ||
immutable Mat{M, N,T} | ||
val::NTuple{N,NTuple{M, T}} | ||
end | ||
immutable Mat3x3v2{T} | ||
val::NTuple{9, T} | ||
end | ||
|
||
immutable Mat3x3{T} | ||
a1::T | ||
a2::T | ||
a3::T | ||
a4::T | ||
a5::T | ||
a6::T | ||
a7::T | ||
a8::T | ||
a9::T | ||
end | ||
|
||
Base.getindex{N,M,T}(A::NTuple{N,NTuple{M, T}}, i::Integer, j::Integer) = A[i][j] | ||
Base.getindex{N,M,T}(A::Mat{N,M,T}, i::Integer, j::Integer) = A.val[i][j] | ||
Base.getindex{T}(A::Mat3x3{T}, i::Integer, j::Integer) = getfield(A, sub2ind((3,3), i, j)) | ||
Base.getindex{T}(A::Mat3x3v2{T}, i::Integer, j::Integer) = getfield(A.val, sub2ind((3,3), i, j)) | ||
|
||
det{T}(A::NTuple{3, NTuple{3, T}}) = A[1,1]*(A[2,2]*A[3,3]-A[2,3]*A[3,2]) - A[1,2]*(A[2,1]*A[3,3]-A[2,3]*A[3,1]) + A[1,3]*(A[2,1]*A[3,2]-A[2,2]*A[3,1]) | ||
det{T}(A::Mat{3, 3, T}) = det(A.val) | ||
det{T}(A::Mat3x3{T}) = A[1,1]*(A[2,2]*A[3,3]-A[2,3]*A[3,2]) - A[1,2]*(A[2,1]*A[3,3]-A[2,3]*A[3,1]) + A[1,3]*(A[2,1]*A[3,2]-A[2,2]*A[3,1]) | ||
det{T}(A::Mat3x3v2{T}) = A[1,1]*(A[2,2]*A[3,3]-A[2,3]*A[3,2]) - A[1,2]*(A[2,1]*A[3,3]-A[2,3]*A[3,1]) + A[1,3]*(A[2,1]*A[3,2]-A[2,2]*A[3,1]) | ||
|
||
const a = ((1,2,3),(1,2,3), (3,2,1)) | ||
const b = Mat(a) | ||
const c = Mat3x3(1,2,3,1,2,3, 3,2,1) | ||
const d = Mat3x3v2((1,2,3,1,2,3, 3,2,1)) | ||
|
||
function test(a,b) | ||
result = det(a)+det(b) | ||
for i=1:10^6 | ||
result = det(a)+det(b) + result | ||
end | ||
result | ||
end | ||
@time test(a,a) | ||
@time test(a,a) | ||
@time test(a,a) | ||
@time test(a,a) | ||
println("############################") | ||
@time test(b,b) | ||
@time test(b,b) | ||
@time test(b,b) | ||
@time test(b,b) | ||
println("############################") | ||
@time test(c,c) | ||
@time test(c,c) | ||
@time test(c,c) | ||
@time test(c,c) | ||
println("############################") | ||
@time test(d,d) | ||
@time test(d,d) | ||
@time test(d,d) | ||
@time test(d,d) | ||
#= | ||
point{T}(a::T...) = Point(a) | ||
getindex(a::Vec, i) = getfield(a, i) | ||
getindex(a::Point, i) = a.val[i] | ||
+{N, T}(a::NTuple{N, T}, b::NTuple{N, T}) = (a[1]+b[1], a[2]+b[2], a[3]+b[3]) | ||
+{T}(a::Vec{T}, b::Vec{T}) = Vec(a[1]+b[1], a[2]+b[2], a[3]+b[3]) | ||
+{N, T}(a::Point{N, T}, b::Point{N, T}) = Point(a.val+b.val) | ||
function test(n, a,b) | ||
result = a | ||
for i=1:n | ||
result = a+b+result | ||
end | ||
result | ||
end | ||
function test2V(n) | ||
result = Vec(2,3,4) | ||
for i=1:n | ||
a,b,c = rand(Int, 3) | ||
tmp = Vec(a,b,c) | ||
result = tmp + result | ||
end | ||
result | ||
end | ||
function test2P(n) | ||
result = point(2,3,4) | ||
for i=1:n | ||
a,b,c = rand(Int, 3) | ||
tmp = point(a,b,c) | ||
result = tmp + result | ||
end | ||
result | ||
end | ||
function test2T(n) | ||
result = (2,3,4) | ||
for i=1:n | ||
a,b,c = rand(Int, 3) | ||
tmp = (a,b,c) | ||
result = tmp + result | ||
end | ||
result | ||
end | ||
@time test(1, (1,2,3), (2,3,4)) | ||
@time test(10^6, (1,2,3), (2,3,4)) | ||
@time test(10^6, (1,2,3), (2,3,4)) | ||
println("#############################") | ||
@time test(1, Vec(1,2,3), Vec(2,3,4)) | ||
@time test(10^6, Vec(1,2,3), Vec(2,3,4)) | ||
@time test(10^6, Vec(1,2,3), Vec(2,3,4)) | ||
println("#############################") | ||
@time test(1, point(1,2,3), point(2,3,4)) | ||
@time test(10^6, point(1,2,3), point(2,3,4)) | ||
@time test(10^6, point(1,2,3), point(2,3,4)) | ||
println("#############################") | ||
@time test2T(1) | ||
@time test2T(10^6) | ||
@time test2T(10^6) | ||
println("#############################") | ||
@time test2P(1) | ||
@time test2P(10^6) | ||
@time test2P(10^6) | ||
println("#############################") | ||
@time test2V(1) | ||
@time test2V(10^6) | ||
code_llvm(+, Tuple{NTuple{3, Int}, NTuple{3, Int}}) | ||
ss() = (1,2,3) | ||
code_llvm(ss, Tuple{}) | ||
#elapsed time: 0.223158449 seconds (282 MB allocated, 2.78% gc time in 13 pauses with 0 full sweep) | ||
#elapsed time: 0.223116501 seconds (282 MB allocated, 2.71% gc time in 13 pauses with 0 full sweep) | ||
#elapsed time: 0.317912366 seconds (285 MB allocated, 2.16% gc time in 13 pauses with 0 full sweep) | ||
#elapsed time: 0.220877232 seconds (282 MB allocated, 2.74% gc time in 13 pauses with 0 full sweep) | ||
#elapsed time: 0.219239059 seconds (282 MB allocated, 2.76% gc time in 13 pauses with 0 full sweep) | ||
=# |