experimental scheme creation

develop/all.lua

@@ -8,6 +8,7 @@ require 'develop.testing.system_as_query_tests'
 
 require 'develop.benchmarks.multi_clone_bmarks'
 require 'develop.benchmarks.multi_spawn_bmarks'
+require 'develop.benchmarks.scheme_bmarks'
 
 require 'develop.untests'
 

develop/benchmarks/scheme_bmarks.lua

@@ -0,0 +1,201 @@
+local evo = require 'evolved'
+local basics = require 'develop.basics'
+
+evo.debug_mode(false)
+
+local N = 10000
+
+print '----------------------------------------'
+
+basics.describe_bench(string.format('Scheme Benchmarks: Evolved AoS | %d entities', N),
+    function(w)
+        evo.process(w)
+    end,
+
+    function()
+        local wf = evo.builder()
+            :set(evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_DESTROY_ENTITY)
+            :spawn()
+
+        local pf = evo.builder():set(wf):spawn()
+        local vf = evo.builder():set(wf):spawn()
+
+        for _ = 1, N do
+            evo.spawn {
+                [wf] = true,
+                [pf] = { x = 0, y = 0, z = 0, w = 0 },
+                [vf] = { x = 0, y = 0, z = 0, w = 0 },
+            }
+        end
+
+        evo.builder()
+            :set(wf)
+            :set(evo.GROUP, wf)
+            :set(evo.QUERY, evo.builder():set(wf):include(pf, vf):spawn())
+            :set(evo.EXECUTE, function(chunk, _, entity_count)
+                local ps, vs = chunk:components(pf, vf)
+
+                for i = 1, entity_count do
+                    local p, s = ps[i], vs[i]
+                    p.x = p.x + s.x
+                    p.y = p.y + s.y
+                end
+            end)
+            :spawn()
+
+        return wf
+    end,
+
+    function(w)
+        evo.destroy(w)
+    end)
+
+basics.describe_bench(string.format('Scheme Benchmarks: Evolved SoA | %d entities', N),
+    function(w)
+        evo.process(w)
+    end,
+
+    function()
+        local wf = evo.builder()
+            :set(evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_DESTROY_ENTITY)
+            :spawn()
+
+        local pxf = evo.builder():set(wf):spawn()
+        local pyf = evo.builder():set(wf):spawn()
+        local pzf = evo.builder():set(wf):spawn()
+        local pwf = evo.builder():set(wf):spawn()
+        local vxf = evo.builder():set(wf):spawn()
+        local vyf = evo.builder():set(wf):spawn()
+        local vzf = evo.builder():set(wf):spawn()
+        local vwf = evo.builder():set(wf):spawn()
+
+        for _ = 1, N do
+            evo.spawn {
+                [wf] = true,
+                [pxf] = 0, [pyf] = 0, [pzf] = 0, [pwf] = 0,
+                [vxf] = 0, [vyf] = 0, [vzf] = 0, [vwf] = 0,
+            }
+        end
+
+        evo.builder()
+            :set(wf)
+            :set(evo.GROUP, wf)
+            :set(evo.QUERY, evo.builder():set(wf):include(pxf, pyf, vxf, vyf):spawn())
+            :set(evo.EXECUTE, function(chunk, _, entity_count)
+                local pxs, pys = chunk:components(pxf, pyf)
+                local vxs, vys = chunk:components(vxf, vyf)
+
+                for i = 1, entity_count do
+                    pxs[i] = pxs[i] + vxs[i]
+                    pys[i] = pys[i] + vys[i]
+                end
+            end)
+            :spawn()
+
+        return wf
+    end,
+
+    function(w)
+        evo.destroy(w)
+    end)
+
+print '----------------------------------------'
+
+basics.describe_bench(string.format('Scheme Benchmarks: Evolved-FFI AoS | %d entities', N),
+    function(w)
+        evo.process(w)
+    end,
+
+    function()
+        local wf = evo.builder()
+            :set(evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_DESTROY_ENTITY)
+            :spawn()
+
+        local vector4 = evo.scheme_record {
+            x = evo.scheme_number(),
+            y = evo.scheme_number(),
+            z = evo.scheme_number(),
+            w = evo.scheme_number(),
+        }
+
+        local pf = evo.builder():set(wf):set(evo.SCHEME, vector4):spawn()
+        local vf = evo.builder():set(wf):set(evo.SCHEME, vector4):spawn()
+
+        for _ = 1, N do
+            evo.spawn {
+                [wf] = true,
+                [pf] = { x = 0, y = 0, z = 0, w = 0 },
+                [vf] = { x = 0, y = 0, z = 0, w = 0 },
+            }
+        end
+
+        evo.builder()
+            :set(wf)
+            :set(evo.GROUP, wf)
+            :set(evo.QUERY, evo.builder():set(wf):include(pf, vf):spawn())
+            :set(evo.EXECUTE, function(chunk, _, entity_count)
+                local ps, vs = chunk:components(pf, vf)
+
+                for i = 1, entity_count do
+                    local p, s = ps[i], vs[i]
+                    p.x = p.x + s.x
+                    p.y = p.y + s.y
+                end
+            end)
+            :spawn()
+
+        return wf
+    end,
+
+    function(w)
+        evo.destroy(w)
+    end)
+
+basics.describe_bench(string.format('Scheme Benchmarks: Evolved-FFI SoA | %d entities', N),
+    function(w)
+        evo.process(w)
+    end,
+
+    function()
+        local wf = evo.builder()
+            :set(evo.DESTRUCTION_POLICY, evo.DESTRUCTION_POLICY_DESTROY_ENTITY)
+            :spawn()
+
+        local pxf = evo.builder():set(wf):set(evo.SCHEME, evo.scheme_number()):spawn()
+        local pyf = evo.builder():set(wf):set(evo.SCHEME, evo.scheme_number()):spawn()
+        local pzf = evo.builder():set(wf):set(evo.SCHEME, evo.scheme_number()):spawn()
+        local pwf = evo.builder():set(wf):set(evo.SCHEME, evo.scheme_number()):spawn()
+        local vxf = evo.builder():set(wf):set(evo.SCHEME, evo.scheme_number()):spawn()
+        local vyf = evo.builder():set(wf):set(evo.SCHEME, evo.scheme_number()):spawn()
+        local vzf = evo.builder():set(wf):set(evo.SCHEME, evo.scheme_number()):spawn()
+        local vwf = evo.builder():set(wf):set(evo.SCHEME, evo.scheme_number()):spawn()
+
+        for _ = 1, N do
+            evo.spawn {
+                [wf] = true,
+                [pxf] = 0, [pyf] = 0, [pzf] = 0, [pwf] = 0,
+                [vxf] = 0, [vyf] = 0, [vzf] = 0, [vwf] = 0,
+            }
+        end
+
+        evo.builder()
+            :set(wf)
+            :set(evo.GROUP, wf)
+            :set(evo.QUERY, evo.builder():set(wf):include(pxf, pyf, vxf, vyf):spawn())
+            :set(evo.EXECUTE, function(chunk, _, entity_count)
+                local pxs, pys = chunk:components(pxf, pyf)
+                local vxs, vys = chunk:components(vxf, vyf)
+
+                for i = 1, entity_count do
+                    pxs[i] = pxs[i] + vxs[i]
+                    pys[i] = pys[i] + vys[i]
+                end
+            end)
+            :spawn()
+
+        return wf
+    end,
+
+    function(w)
+        evo.destroy(w)
+    end)

develop/testing/scheme_tests.lua

@@ -1 +1,66 @@
 local evo = require 'evolved'
+
+do
+    local ns1 = evo.scheme_number()
+    local ns2 = evo.scheme_number()
+
+    local f1 = evo.builder():scheme(ns1):spawn()
+    local f2 = evo.builder():scheme(ns2):spawn()
+
+    local e1 = evo.builder():set(f1, 1):spawn()
+    local e2 = evo.builder():set(f1, 3):set(f2, 4):spawn()
+
+    do
+        assert(evo.get(e1, f1) == 1 and evo.get(e1, f2) == nil)
+        assert(evo.get(e2, f1) == 3 and evo.get(e2, f2) == 4)
+    end
+
+    evo.set(e1, f2, 2)
+
+    do
+        assert(evo.get(e1, f1) == 1 and evo.get(e1, f2) == 2)
+        assert(evo.get(e2, f1) == 3 and evo.get(e2, f2) == 4)
+    end
+
+    local es = evo.builder():set(f1, 5):set(f2, 6):multi_spawn(40)
+    for _, e in ipairs(es) do assert(evo.get(e, f1) == 5 and evo.get(e, f2) == 6) end
+end
+
+do
+    local ls1 = evo.scheme_list(evo.scheme_number(), 3)
+    local ls2 = evo.scheme_list(evo.scheme_boolean(), 2)
+
+    local f1 = evo.builder():scheme(ls1):spawn()
+    local f2 = evo.builder():scheme(ls2):spawn()
+
+    local e1 = evo.builder():set(f1, { 1, 2, 3 }):spawn()
+    local e2 = evo.builder():set(f2, { true, false }):spawn()
+
+    do
+        local v = evo.get(e1, f1)
+        assert(#v == 3 and v[1] == 1 and v[2] == 2 and v[3] == 3)
+    end
+
+    do
+        local v = evo.get(e2, f2)
+        assert(#v == 2 and v[1] == true and v[2] == false)
+    end
+end
+
+do
+    local rs1 = evo.scheme_record { v = evo.scheme_number() }
+    local rs2 = evo.scheme_record { v1 = evo.scheme_number(), v2 = evo.scheme_number() }
+    local rs3 = evo.scheme_record { n1 = rs2, n2 = rs1 }
+
+    local f1 = evo.builder():scheme(rs1):spawn()
+    local f2 = evo.builder():scheme(rs2):spawn()
+    local f3 = evo.builder():scheme(rs3):spawn()
+
+    local e1 = evo.builder():set(f1, { v = 42 }):spawn()
+    local e2 = evo.builder():set(f2, { v1 = 21, v2 = 84 }):spawn()
+    local e3 = evo.builder():set(f3, { n1 = { v1 = 1, v2 = 2 }, n2 = { v = 3 } }):spawn()
+
+    assert(evo.get(e1, f1).v == 42)
+    assert(evo.get(e2, f2).v1 == 21 and evo.get(e2, f2).v2 == 84)
+    assert(evo.get(e3, f3).n1.v1 == 1 and evo.get(e3, f3).n1.v2 == 2 and evo.get(e3, f3).n2.v == 3)
+end