diff --git a/LICENSE b/LICENSE index 913f2fa..557855c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,3 @@ -MIT License - -Copyright (c) Zed A. Shaw - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +Copyright (c) Zed A. Shaw. It's not Open Source. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index bdb50bc..d6a48dc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -# sol2 testj +# bezos2 -Just a quick test of using sol2 and also how a God Object System would work as an alternative to ECS -but using sol2/lua. +Like a thing that uses lua and opengl. diff --git a/lua/bezos.lua b/lua/bezos.lua new file mode 100644 index 0000000..e223cd3 --- /dev/null +++ b/lua/bezos.lua @@ -0,0 +1,78 @@ +DECK = Deck.new(); + +function config(x) + for k,v in pairs(x) do + DECK:addConfig(k, v); + end +end + +function slide(x) + local s = Slide.new() + + for k, v in pairs(x) do + if type(k) == "string" then + s:addConfig(k, v) + else + s:addNode(v) + end + end + + DECK:addSlide(s) +end + +function makeNode(ntype, ncontent) + local n = Node.new(ntype) + + -- handle plain strings + if type(ncontent) == "string" then + n:addText(ncontent) + return n + end + + -- handle more advanced config ones + for k,v in pairs(ncontent) do + if type(k) == "string" then + n:addConfig(k, v) + else + n:addText(v) + end + end + + return n +end + +function t(content) + return makeNode(NodeType.TEXT, content) +end + +function h1(text) + return makeNode(NodeType.H1, content) +end + +function image(settings) + return makeNode(NodeType.IMAGE, content) +end + +function ul(text) + return makeNode(NodeType.UL, content) +end + +function pprint(o) + if type(o) == 'table' then + local s = '{' + for k,v in pairs(o) do + if type(k) == 'number' then + s = s .. pprint(v) .. ',' + elseif type(k) == 'string' then + s = s .. '"' .. k .. '"=' .. pprint(v) .. ',' + else + s = s .. '[' .. k .. ']=' .. pprint(v) .. ',' + end + end + return s .. '}\n' + elseif type(o) == 'string' then + return '"' .. o .. '"' + else + return tostring(o) + end +end diff --git a/lua/bezos_builder.lua b/lua/bezos_builder.lua new file mode 100644 index 0000000..2168991 --- /dev/null +++ b/lua/bezos_builder.lua @@ -0,0 +1,41 @@ +DECK = Builder.new() + +function config(x) + for k,v in pairs(x) do + DECK:config_set(k, v); + end +end + +function slide(x) + local s = DECK:slide_start() + + for k, v in pairs(x) do + if type(k) == "string" then + DECK:slide_config(s, k, v) + else + local ntype, ncontent = v[1], v[2] + + local node_id = DECK:node_add(s, ntype, ncontent) + end + end +end + +function t(content) + return {NodeType.TEXT, content} +end + +function h1(content) + return {NodeType.H1, content} +end + +function image(settings) + return {NodeType.IMAGE, settings} +end + +function ul(content) + return {NodeType.UL, content} +end + +function rgba(colors) + return Color.new(colors[1], colors[2], colors[3], colors[4]) +end diff --git a/lua/builder_test.lua b/lua/builder_test.lua new file mode 100644 index 0000000..71da81c --- /dev/null +++ b/lua/builder_test.lua @@ -0,0 +1,78 @@ +require "lua/bezos_builder" + +config{ + title="How to Mic Your Keyboard", + description="Make your programming streams sweet", + layouts="assets/layouts.json", + font_color=rgba{255, 0, 0, 255}, +} + +slide{ + layout="no_title", + font_size=200, + font_color=rgba{100, 100, 50, 100}, + t { + font_color=rgba{255, 0, 0, 255}, + "How to" + }, + t "Mic Your", + t "Keyboard", +} + +slide{ + h1 "Why Keyboard Mic", + t [[ + Makes programming content + more interesting. + ]] +} + +slide{ + h1 "Requirements", + ul "A Piezo Mic", + ul "Extra Audio Input", + ul "Expander or Gate", +} + +slide{ + h1 "1. Piezo Mic", + ul "$9USD for 4", + ul "Usually for acoustic guitars", + ul "Don't get Expensive", +} + +slide{ + h1 "Attach the Mic", + ul "It works on Vibration", + ul "Stick it to the housing.", + ul "No need for phantom power.", +} + +slide{ + h1 "Here's Mine", + image{ + src="p100101.jpg" + } +} + +slide{ + layout="no_title", + font_size=150, + bg_color=rgba{238, 44, 44, 255}, + font_color=rgba{255, 255, 255, 255}, + t [[ + Secrity + Warning!! + ]] +} + +slide{ + h1 "Supported Markdown", + ul "Simple lists with *", + ul "Images with !(file)", + t [[ + + Spaces or Newlines +Bare content + ]] +} diff --git a/lua/test.lua b/lua/test.lua new file mode 100644 index 0000000..e93fc59 --- /dev/null +++ b/lua/test.lua @@ -0,0 +1,77 @@ +require "lua/bezos" + +config{ + title="How to Mic Your Keyboard", + description="Make your programming streams sweet", + layouts="assets/layouts.json", +} + +slide{ + layout="no_title", + t { + font_color="red", + "How to", + }, + t "Mic Your", + t "Keyboard", +} + +-- slide{ +-- h1 "Why Keyboard Mic", +-- t [[ +-- Makes programming content +-- more interesting. +-- ]] +-- } +-- +-- slide{ +-- h1 "Requirements", +-- ul "A Piezo Mic", +-- ul "Extra Audio Input", +-- ul "Expander or Gate", +-- } +-- +-- slide{ +-- h1 "1. Piezo Mic", +-- ul "$9USD for 4", +-- ul "Usually for acoustic guitars", +-- ul "Don't get Expensive", +-- } +-- +-- slide{ +-- h1 "Attach the Mic", +-- ul "It works on Vibration", +-- ul "Stick it to the housing.", +-- ul "No need for phantom power.", +-- } +-- +-- slide{ +-- h1 "Here's Mine", +-- image{ +-- src="p100101.jpg" +-- } +-- } +-- +-- slide{ +-- layout="no_title", +-- font_size=150, +-- bg_color={238, 44, 44, 255}, +-- font_color={255, 255, 255, 255}, +-- t [[ +-- Secrity +-- Warning!! +-- ]] +-- } +-- +-- slide{ +-- h1 "Supported Markdown", +-- ul "Simple lists with *", +-- ul "Images with !(file)", +-- t [[ +-- +-- Spaces or Newlines +-- Bare content +-- ]] +-- } +-- +-- print(pprint(DECK)) diff --git a/meson.build b/meson.build index addbd9c..f570629 100644 --- a/meson.build +++ b/meson.build @@ -25,17 +25,17 @@ sol2 = subproject('sol2').get_variable('sol2_dep') dependencies = [fmt, fuc2, sol2] sources = [ -] - -executable('sol2_test', [ 'tests/sol2_test.cpp', - 'tests/bao_tests.cpp', - 'tests/soa_tests.cpp', - 'tests/perf_tests.cpp', - 'tests/lua_perf_tests.cpp', + 'tests/builder_test.cpp', 'src/stats.cpp', 'tests/main.cpp', - ], + 'src/dbc.cpp', + 'src/builder.cpp', + 'src/bezos.cpp', + 'src/document.cpp', +] + +executable('sol2_test', sources, cpp_args: cpp_args, link_args: link_args, include_directories: include_directories('src'), diff --git a/src/bezos.cpp b/src/bezos.cpp new file mode 100644 index 0000000..d247cad --- /dev/null +++ b/src/bezos.cpp @@ -0,0 +1,55 @@ +#include "builder.hpp" + +namespace Bezos { + Deck load(const std::string& file) { + using L = sol::lib; + sol::state lua; + lua.open_libraries( + L::base, + L::package, + L::coroutine, + L::string, + L::os, + L::math, + L::table, + L::debug, + L::io, + L::ffi, + L::jit); + + lua.new_enum("NodeType",{ + {"TEXT", NodeType::TEXT}, + {"H1", NodeType::H1}, + {"IMAGE", NodeType::IMAGE}, + {"UL", NodeType::UL}, + {"ERROR", NodeType::ERROR}, + }); + + lua.new_usertype("Color", + sol::constructors(), + "r", &Color::r, + "g", &Color::g, + "b", &Color::b, + "a", &Color::a); + + lua.new_usertype("Builder", + "slide_start", &Builder::slide_start, + "slide_config", &Builder::slide_config, + "config_set", &Builder::config_set, + "node_add", &Builder::node_add); + + lua.script_file(file); + + Builder builder = lua["DECK"]; + return builder.deck; + } + + void dump(Deck& deck) { + for(auto& slide : deck.slides) { + fmt::println("-----"); + for(auto& node : slide.content) { + fmt::println("node: {},{}", (int)node.type, node.content); + } + } + } +} diff --git a/src/bezos.hpp b/src/bezos.hpp new file mode 100644 index 0000000..c67edfe --- /dev/null +++ b/src/bezos.hpp @@ -0,0 +1,8 @@ +#pragma once +#include "document.hpp" +#include + +namespace Bezos { + Deck load(const std::string& file); + void dump(Deck& deck); +} diff --git a/src/builder.cpp b/src/builder.cpp new file mode 100644 index 0000000..6124cff --- /dev/null +++ b/src/builder.cpp @@ -0,0 +1,67 @@ +#include "builder.hpp" + +void Builder::config_set(const std::string& key, const sol::object& obj) { + deck.config.try_emplace(key, to_any(obj)); +} + +size_t Builder::slide_start() { + deck.slides.push_back({}); + return deck.slides.size() - 1; +} + +size_t Builder::node_add(size_t slide_id, NodeType nt, const sol::object& obj) { + auto& slide = deck.slides.at(slide_id); + Node node{.type=NodeType::ERROR}; // default to error then change later + + if(obj.is()) { + node.type = nt; + node.content = obj.as(); + } else if(obj.is()) { + node.type = nt; + const auto& as_table = obj.as(); + + // configured node content + for(const auto& [k, v] : as_table) { + if(k.is()) { + node.config.try_emplace(k.as(), to_any(v)); + } else if(k.is()) { + node.content += v.as(); + } else { + dbc::sentinel("Invalid key type for node."); + } + } + } else { + dbc::sentinel("Invalid object type while building node."); + } + + // some nodes won't have content (images) but if it's ERROR then add error message + if(node.type == NodeType::ERROR) { + node.content = "ERROR: This node not configured properly."; + } + + slide.content.push_back(node); + + return slide.content.size() - 1; +} + +std::any Builder::to_any(const sol::object& value) { + if(value.is()) { + return value.as(); + } else if(value.is()) { + return value.as(); + } else if(value.is()) { + return value.as(); + } else if(value.is()) { + return value.as(); + } else if(value.is()) { + assert(false && "Not supported yet."); + } else { + assert(false && "invalid type in slide_config"); + } +} + +void Builder::slide_config(size_t slide_id, const std::string& key, const sol::object& value) { + auto& slide = deck.slides.at(slide_id); + + slide.config.try_emplace(key, to_any(value)); +} diff --git a/src/builder.hpp b/src/builder.hpp new file mode 100644 index 0000000..37596ff --- /dev/null +++ b/src/builder.hpp @@ -0,0 +1,20 @@ +#pragma once +#include "document.hpp" + +#define SOL_ALL_SAFETIES_ON 1 +#include +#include "dbc.hpp" + +struct Builder { + Deck deck; + + void config_set(const std::string& key, const sol::object& obj); + + size_t slide_start(); + + size_t node_add(size_t slide_id, NodeType nt, const sol::object& obj); + + std::any to_any(const sol::object& value); + + void slide_config(size_t slide_id, const std::string& key, const sol::object& value); +}; diff --git a/src/dbc.cpp b/src/dbc.cpp new file mode 100644 index 0000000..6b17faf --- /dev/null +++ b/src/dbc.cpp @@ -0,0 +1,47 @@ +#include "dbc.hpp" +#include + +void dbc::log(const string &message, const std::source_location location) { + std::cout << '[' << location.file_name() << ':' + << location.line() << "|" + << location.function_name() << "] " + << message << std::endl; +} + +void dbc::sentinel(const string &message, const std::source_location location) { + string err = fmt::format("[SENTINEL!] {}", message); + dbc::log(err, location); + throw dbc::SentinelError{err}; +} + +void dbc::pre(const string &message, bool test, const std::source_location location) { + if(!test) { + string err = fmt::format("[PRE!] {}", message); + dbc::log(err, location); + throw dbc::PreCondError{err}; + } +} + +void dbc::pre(const string &message, std::function tester, const std::source_location location) { + dbc::pre(message, tester(), location); +} + +void dbc::post(const string &message, bool test, const std::source_location location) { + if(!test) { + string err = fmt::format("[POST!] {}", message); + dbc::log(err, location); + throw dbc::PostCondError{err}; + } +} + +void dbc::post(const string &message, std::function tester, const std::source_location location) { + dbc::post(message, tester(), location); +} + +void dbc::check(bool test, const string &message, const std::source_location location) { + if(!test) { + string err = fmt::format("[CHECK!] {}\n", message); + dbc::log(err, location); + throw dbc::CheckError{err}; + } +} diff --git a/src/dbc.hpp b/src/dbc.hpp new file mode 100644 index 0000000..d090503 --- /dev/null +++ b/src/dbc.hpp @@ -0,0 +1,51 @@ +#pragma once + +#include +#include +#include +#include + + +namespace dbc { + using std::string; + + class Error { + public: + const string message; + Error(string m) : message{m} {} + Error(const char *m) : message{m} {} + }; + + class CheckError : public Error {}; + class SentinelError : public Error {}; + class PreCondError : public Error {}; + class PostCondError : public Error {}; + + void log(const string &message, + const std::source_location location = + std::source_location::current()); + + [[noreturn]] void sentinel(const string &message, + const std::source_location location = + std::source_location::current()); + + void pre(const string &message, bool test, + const std::source_location location = + std::source_location::current()); + + void pre(const string &message, std::function tester, + const std::source_location location = + std::source_location::current()); + + void post(const string &message, bool test, + const std::source_location location = + std::source_location::current()); + + void post(const string &message, std::function tester, + const std::source_location location = + std::source_location::current()); + + void check(bool test, const string &message, + const std::source_location location = + std::source_location::current()); +} diff --git a/src/document.cpp b/src/document.cpp new file mode 100644 index 0000000..1ec547f --- /dev/null +++ b/src/document.cpp @@ -0,0 +1,2 @@ +#include "document.hpp" +#include diff --git a/src/document.hpp b/src/document.hpp new file mode 100644 index 0000000..021db7d --- /dev/null +++ b/src/document.hpp @@ -0,0 +1,41 @@ +#pragma once +#include +#include +#include +#include +#include + +enum class NodeType { + TEXT, + H1, + IMAGE, + UL, + ERROR, +}; + +struct Color { + uint8_t r; + uint8_t g; + uint8_t b; + uint8_t a; + + Color(uint8_t r, uint8_t g, uint8_t b, uint8_t a) : + r(r), g(g), b(g), a(a) + {} +}; + +struct Node { + NodeType type = NodeType::ERROR; + std::string content = ""; + std::unordered_map config{}; +}; + +struct Slide { + std::vector content{}; + std::unordered_map config{}; +}; + +struct Deck { + std::vector slides{}; + std::unordered_map config{}; +}; diff --git a/tests/bao_tests.cpp b/tests/bao_tests.cpp deleted file mode 100644 index e8c6a1c..0000000 --- a/tests/bao_tests.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include -#include -#include -#include -#define SOL_ALL_SAFETIES_ON 1 -#include - -using namespace fuc2; - -namespace bao_tests { - - struct BAEntity { - std::string name; - int hp=0; - int damage=0; - bool dead=false; - }; - - void test_bao_basics() { - std::vector entities; - - for(int i = 0; i < 10; i++) { - auto name = fmt::format("Fighter-{}", i); - entities.emplace_back(name, i+10, i+1); - } - - sol::state lua; - lua.open_libraries(sol::lib::base); - lua.new_usertype("BAEntity", - "name", &BAEntity::name, - "hp", &BAEntity::hp, - "damage", &BAEntity::damage, - "dead", &BAEntity::dead); - - lua.script_file("tests/bao_tests.lua"); - sol::function handler = lua["handler"]; - - for(auto& fighter : entities) { - handler(fighter); - } - } - - fuc2::Set TESTS{ - .name="bao", - .options={ .fail_fast=false }, - .tests={ - TEST(test_bao_basics), - } - }; -} diff --git a/tests/bao_tests.lua b/tests/bao_tests.lua deleted file mode 100644 index d8a541a..0000000 --- a/tests/bao_tests.lua +++ /dev/null @@ -1,18 +0,0 @@ -function combat(fighter) - fighter.hp = fighter.hp - fighter.damage -end - -function cull_dead(fighter) - if fighter.hp < 0 then - fighter.dead = true - end -end - - - -function handler(fighter) - combat(fighter) - cull_dead(fighter) - - print(fighter.name, "HP now", fighter.hp, "damage", fighter.damage, "dead", fighter.dead) -end diff --git a/tests/build_self_test.cpp b/tests/build_self_test.cpp new file mode 100644 index 0000000..959018a --- /dev/null +++ b/tests/build_self_test.cpp @@ -0,0 +1,109 @@ +#include +#include +#include +#include +#define SOL_ALL_SAFETIES_ON 1 +#include + +using namespace fuc2; + +enum class NodeType { + TEXT, + H1, + IMAGE, + UL +}; + +struct Node { + std::unordered_map config; + NodeType type = NodeType::TEXT; + std::string content = ""; + + Node(NodeType type) {} + + void addText(const std::string& text) { + content += text; + } + + void addConfig(const std::string& key, const std::string& val) { + config.try_emplace(key, val); + } +}; + +struct Slide { + std::unordered_map config; + std::vector content; + + void addNode(const Node& n) { + content.push_back(n); + } + + void addConfig(const std::string& key, const std::string& val) { + config.try_emplace(key, val); + } +}; + +struct Deck { + std::unordered_map config; + std::vector slides; + + void addSlide(const Slide& slide) { + slides.push_back(slide); + } + + void addConfig(const std::string& key, const std::string& val) { + config.try_emplace(key, val); + } +}; + +namespace build_self_tests { + + void test_load_slides() { + using L = sol::lib; + sol::state lua; + lua.open_libraries( + L::base, + L::package, + L::coroutine, + L::string, + L::os, + L::math, + L::table, + L::debug, + L::io, + L::ffi, + L::jit); + + lua.new_enum("NodeType",{ + {"TEXT", NodeType::TEXT}, + {"H1", NodeType::H1}, + {"IMAGE", NodeType::IMAGE}, + {"UL", NodeType::UL} + }); + + lua.new_usertype("Node", + sol::constructors(), + "type", &Node::type, + "content", &Node::content, + "addText", &Node::addText, + "addConfig", &Node::addConfig); + + lua.new_usertype("Slide", + "addConfig", &Slide::addConfig, + "addNode", &Slide::addNode); + + lua.new_usertype("Deck", + "addSlide", &Deck::addSlide, + "addConfig", &Deck::addConfig); + + lua.script_file("lua/test.lua"); + } + + fuc2::Set TESTS{ + .name="slides", + .options={ .fail_fast=false }, + .tests={ + TEST(test_load_slides), + } + }; +} diff --git a/tests/builder_test.cpp b/tests/builder_test.cpp new file mode 100644 index 0000000..0f70cb0 --- /dev/null +++ b/tests/builder_test.cpp @@ -0,0 +1,21 @@ +#include +#include +#include +#include "bezos.hpp" + +using namespace fuc2; + +namespace builder_tests { + void test_load_slides() { + Deck deck = Bezos::load("lua/builder_test.lua"); + Bezos::dump(deck); + } + + fuc2::Set TESTS{ + .name="slides", + .options={ .fail_fast=false }, + .tests={ + TEST(test_load_slides), + } + }; +} diff --git a/tests/data.hpp b/tests/data.hpp deleted file mode 100644 index bb82a38..0000000 --- a/tests/data.hpp +++ /dev/null @@ -1,150 +0,0 @@ -#pragma once - -struct LargeSOA { - std::vector a01; - std::vector a02; - std::vector a03; - std::vector a04; - std::vector a05; - std::vector a06; - std::vector a07; - std::vector a08; - std::vector a09; - std::vector a10; - std::vector a11; - std::vector a12; - std::vector a13; - std::vector a14; - std::vector a15; - std::vector a16; - std::vector a17; - std::vector a18; - std::vector a19; - std::vector a20; - - void push_back(int x) { - a01.push_back(x); - a02.push_back(x); - a03.push_back(x); - a04.push_back(x); - a05.push_back(x); - a06.push_back(x); - a07.push_back(x); - a08.push_back(x); - a09.push_back(x); - a10.push_back(x); - a11.push_back(x); - a12.push_back(x); - a13.push_back(x); - a14.push_back(x); - a15.push_back(x); - a16.push_back(x); - a17.push_back(x); - a18.push_back(x); - a19.push_back(x); - a20.push_back(x); - } -}; - -struct LargeStruct { - int a01; - int a02; - int a03; - int a04; - int a05; - int a06; - int a07; - int a08; - int a09; - int a10; - int a11; - int a12; - int a13; - int a14; - int a15; - int a16; - int a17; - int a18; - int a19; - int a20; - - LargeStruct(int x) : - a01(x), - a02(x), - a03(x), - a04(x), - a05(x), - a06(x), - a07(x), - a08(x), - a09(x), - a10(x), - a11(x), - a12(x), - a13(x), - a14(x), - a15(x), - a16(x), - a17(x), - a18(x), - a19(x), - a20(x) {} -}; - - -struct S1 { - int a01; - int a02; - int a03; - int a04; - - S1(int x) : a01(x), a02(x), a03(x), a04(x) { } -}; - -struct S2 { - int a05; - int a06; - int a07; - int a08; - S2(int x) : a05(x), a06(x), a07(x), a08(x) { } -}; - -struct S3 { - int a09; - int a10; - int a11; - int a12; - S3(int x) : a09(x), a10(x), a11(x), a12(x) { } -}; - -struct S4 { - int a13; - int a14; - int a15; - int a16; - S4(int x) : a13(x), a14(x), a15(x), a16(x) { } -}; - -struct S5 { - int a17; - int a18; - int a19; - int a20; - S5(int x) : a17(x), a18(x), a19(x), a20(x) { } -}; - -struct MultipleAOS { - std::vector s1; - std::vector s2; - std::vector s3; - std::vector s4; - std::vector s5; - - void push_back(int x) { - s1.push_back({x}); - s2.push_back({x}); - s3.push_back({x}); - s4.push_back({x}); - s5.push_back({x}); - } -}; diff --git a/tests/lua_perf_tests.cpp b/tests/lua_perf_tests.cpp deleted file mode 100644 index bca83f1..0000000 --- a/tests/lua_perf_tests.cpp +++ /dev/null @@ -1,136 +0,0 @@ -#include -#include -#include -#include "stats.hpp" -#include "data.hpp" -#define SOL_ALL_SAFETIES_ON 1 -#include - -using namespace fuc2; - -namespace lua_perf_tests { - struct Samples { - std::vector maos_many_for; - std::vector lua_many_for; - }; - - void test_maos_performance(Samples& samples, int sample_size, int sample_number) { - auto maos = new MultipleAOS(); - - for(int i = 0; i < sample_size; i++) { - maos->push_back(i); - } - - Stats maos_many_for; - for(int sample = 0; sample < sample_number; sample++) { - auto start = maos_many_for.time_start(); - - for(auto& el : maos->s1) { - el.a01 += el.a02 + sample; - el.a02 += el.a03 + sample; - el.a03 += el.a04 + sample; - } - - for(auto& el : maos->s2) { - el.a05 += el.a06 + sample; - el.a06 += el.a07 + sample; - el.a07 += el.a08 + sample; - } - - for(auto& el : maos->s3) { - el.a09 += el.a10 + sample; - el.a10 += el.a11 + sample; - el.a11 += el.a12 + sample; - } - - for(auto& el : maos->s4) { - el.a13 += el.a14 + sample; - el.a14 += el.a15 + sample; - el.a15 += el.a16 + sample; - } - - for(auto& el : maos->s5) { - el.a17 += el.a18 + sample; - el.a18 += el.a19 + sample; - el.a19 += el.a20 + sample; - } - - maos_many_for.sample_time(start); - } - - samples.maos_many_for.push_back(maos_many_for); - } - - void test_lua_maos_perf(Samples& samples, int sample_size, int sample_number) { - sol::state lua; - lua.open_libraries(sol::lib::base); - - auto maos = new MultipleAOS(); - - for(int i = 0; i < sample_size; i++) { - maos->push_back(i); - } - - // setup lua for MOAS - lua.new_usertype("S1", - "a01", &S1::a01, - "a02", &S1::a02, - "a03", &S1::a03, - "a04", &S1::a04); - - lua.script(R"( - function effed_handler(v, size, sample) - for i = 1,size,1 do - v[i].a01 = v[i].a01 + v[i].a02 + sample - v[i].a02 = v[i].a02 + v[i].a03 + sample - v[i].a03 = v[i].a03 + v[i].a04 + sample - end - end - - function handler(v, sample) - v.a01 = v.a01 + v.a02 + sample - v.a02 = v.a02 + v.a03 + sample - v.a03 = v.a03 + v.a04 + sample - end - )"); - - sol::function handler = lua["handler"]; - - Stats lua_many_for; - for(int sample = 0; sample < sample_number; sample++) { - auto start = lua_many_for.time_start(); - - for(auto& el : maos->s1) { - handler(el, sample); - } - - lua_many_for.sample_time(start); - } - - samples.lua_many_for.push_back(lua_many_for); - } - - void test_all_performance() { - Samples samples; - int sample_size = 100; - int sample_count = 100; - - for(int i = 0; i < 10; i++) { - test_maos_performance(samples, sample_size, sample_count); - test_lua_maos_perf(samples, sample_size, sample_count); - } - - for(size_t i = 0; i < samples.maos_many_for.size(); i++) { - fmt::println("{:.2f} {:.2f}", - samples.maos_many_for[i].mean(), - samples.lua_many_for[i].mean()); - } - } - - fuc2::Set TESTS{ - .name="lua_perf", - .tests={ - TEST(test_all_performance), - } - }; -} diff --git a/tests/main.cpp b/tests/main.cpp index 14e96bb..d883a0f 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -1,20 +1,14 @@ #include TEST_SET(sol2_tests); -TEST_SET(bao_tests); -TEST_SET(soa_tests); -TEST_SET(perf_tests); -TEST_SET(lua_perf_tests); +TEST_SET(builder_tests); using namespace fuc2; int main(int argc, char* argv[]) { std::vector tests{ sol2_tests::TESTS, - bao_tests::TESTS, - soa_tests::TESTS, - perf_tests::TESTS, - lua_perf_tests::TESTS, + builder_tests::TESTS, }; return run_tests(tests, argc, argv); diff --git a/tests/perf_tests.cpp b/tests/perf_tests.cpp deleted file mode 100644 index 3b7c117..0000000 --- a/tests/perf_tests.cpp +++ /dev/null @@ -1,370 +0,0 @@ -#include -#include -#include -#include "stats.hpp" -#include "data.hpp" - -using namespace fuc2; - -namespace perf_tests { - struct Samples { - std::vector soa_big_for; - std::vector soa_many_for; - std::vector ls_big_for; - std::vector ls_many_for; - std::vector maos_big_for; - std::vector maos_many_for; - std::vector maos_many_for_2; - }; - - void test_large_soa(Samples& samples, int sample_size, int sample_number) { - auto soa = new LargeSOA(); - - for(int i = 0; i < sample_size; i++) { - soa->push_back(i); - } - - Stats big_for; - for(int sample = 0; sample < sample_number; sample++) { - auto start = big_for.time_start(); - for(int i = 0; i < sample_size; i++) { - soa->a01[i] += soa->a02[i] + sample; - soa->a02[i] += soa->a03[i] + sample; - soa->a03[i] += soa->a04[i] + sample; - soa->a04[i] += soa->a05[i] + sample; - soa->a05[i] += soa->a06[i] + sample; - soa->a06[i] += soa->a07[i] + sample; - soa->a07[i] += soa->a08[i] + sample; - soa->a08[i] += soa->a09[i] + sample; - soa->a09[i] += soa->a10[i] + sample; - soa->a10[i] += soa->a11[i] + sample; - soa->a11[i] += soa->a12[i] + sample; - soa->a12[i] += soa->a13[i] + sample; - soa->a13[i] += soa->a14[i] + sample; - soa->a14[i] += soa->a15[i] + sample; - soa->a15[i] += soa->a16[i] + sample; - soa->a16[i] += soa->a17[i] + sample; - soa->a17[i] += soa->a18[i] + sample; - soa->a18[i] += soa->a19[i] + sample; - soa->a19[i] += soa->a20[i] + sample; - } - big_for.sample_time(start); - } - samples.soa_big_for.push_back(big_for); - - Stats many_for; - for(int sample = 0; sample < sample_number; sample++) { - auto start = many_for.time_start(); - for(int i = 0; i < sample_size; i++) soa->a01[i] += soa->a02[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a02[i] += soa->a03[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a03[i] += soa->a04[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a04[i] += soa->a05[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a05[i] += soa->a06[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a06[i] += soa->a07[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a07[i] += soa->a08[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a08[i] += soa->a09[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a09[i] += soa->a10[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a10[i] += soa->a11[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a11[i] += soa->a12[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a12[i] += soa->a13[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a13[i] += soa->a14[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a14[i] += soa->a15[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a15[i] += soa->a16[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a16[i] += soa->a17[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a17[i] += soa->a18[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a18[i] += soa->a19[i] + sample; - for(int i = 0; i < sample_size; i++) soa->a19[i] += soa->a20[i] + sample; - many_for.sample_time(start); - } - samples.soa_many_for.push_back(many_for); - } - - void test_large_struct(Samples& samples, int sample_size, int sample_number) { - auto ls = new std::vector; - - for(int i = 0; i < sample_size; i++) { - ls->push_back({i}); - } - - Stats ls_big_for; - for(int sample = 0; sample < sample_number; sample++) { - auto start = ls_big_for.time_start(); - for(auto& el : *ls) { - el.a01 += el.a02 + sample; - el.a02 += el.a03 + sample; - el.a03 += el.a04 + sample; - el.a04 += el.a05 + sample; - el.a05 += el.a06 + sample; - el.a06 += el.a07 + sample; - el.a07 += el.a08 + sample; - el.a08 += el.a09 + sample; - el.a09 += el.a10 + sample; - el.a10 += el.a11 + sample; - el.a11 += el.a12 + sample; - el.a12 += el.a13 + sample; - el.a13 += el.a14 + sample; - el.a14 += el.a15 + sample; - el.a15 += el.a16 + sample; - el.a16 += el.a17 + sample; - el.a17 += el.a18 + sample; - el.a18 += el.a19 + sample; - el.a19 += el.a20 + sample; - } - ls_big_for.sample_time(start); - } - - samples.ls_big_for.push_back(ls_big_for); - - Stats ls_many_for; - for(int sample = 0; sample < sample_number; sample++) { - auto start = ls_many_for.time_start(); - for(auto& el : *ls) el.a01 += el.a02 + sample; - for(auto& el : *ls) el.a02 += el.a03 + sample; - for(auto& el : *ls) el.a03 += el.a04 + sample; - for(auto& el : *ls) el.a04 += el.a05 + sample; - for(auto& el : *ls) el.a05 += el.a06 + sample; - for(auto& el : *ls) el.a06 += el.a07 + sample; - for(auto& el : *ls) el.a07 += el.a08 + sample; - for(auto& el : *ls) el.a08 += el.a09 + sample; - for(auto& el : *ls) el.a09 += el.a10 + sample; - for(auto& el : *ls) el.a10 += el.a11 + sample; - for(auto& el : *ls) el.a11 += el.a12 + sample; - for(auto& el : *ls) el.a12 += el.a13 + sample; - for(auto& el : *ls) el.a13 += el.a14 + sample; - for(auto& el : *ls) el.a14 += el.a15 + sample; - for(auto& el : *ls) el.a15 += el.a16 + sample; - for(auto& el : *ls) el.a16 += el.a17 + sample; - for(auto& el : *ls) el.a17 += el.a18 + sample; - for(auto& el : *ls) el.a18 += el.a19 + sample; - for(auto& el : *ls) el.a19 += el.a20 + sample; - ls_many_for.sample_time(start); - } - samples.ls_many_for.push_back(ls_many_for); - } - - - void test_maos_style(Samples& samples, int sample_size, int sample_number) { - auto maos = new MultipleAOS(); - - for(int i = 0; i < sample_size; i++) { - maos->push_back(i); - } - - Stats maos_big_for; - for(int sample = 0; sample < sample_number; sample++) { - auto start = maos_big_for.time_start(); - for(int i = 0; i < sample_size; i++) { - maos->s1[i].a01 += maos->s1[i].a02 + sample; - maos->s1[i].a02 += maos->s1[i].a03 + sample; - maos->s1[i].a03 += maos->s1[i].a04 + sample; - maos->s1[i].a04 += maos->s2[i].a05 + sample; - - maos->s2[i].a05 += maos->s2[i].a06 + sample; - maos->s2[i].a06 += maos->s2[i].a07 + sample; - maos->s2[i].a07 += maos->s2[i].a08 + sample; - maos->s2[i].a08 += maos->s3[i].a09 + sample; - - maos->s3[i].a09 += maos->s3[i].a10 + sample; - maos->s3[i].a10 += maos->s3[i].a11 + sample; - maos->s3[i].a11 += maos->s3[i].a12 + sample; - maos->s3[i].a12 += maos->s4[i].a13 + sample; - - maos->s4[i].a13 += maos->s4[i].a14 + sample; - maos->s4[i].a14 += maos->s4[i].a15 + sample; - maos->s4[i].a15 += maos->s4[i].a16 + sample; - maos->s4[i].a16 += maos->s5[i].a17 + sample; - - maos->s5[i].a17 += maos->s5[i].a18 + sample; - maos->s5[i].a18 += maos->s5[i].a19 + sample; - maos->s5[i].a19 += maos->s5[i].a20 + sample; - } - maos_big_for.sample_time(start); - } - samples.maos_big_for.push_back(maos_big_for); - - Stats maos_many_for; - for(int sample = 0; sample < sample_number; sample++) { - auto start = maos_many_for.time_start(); - - for(auto& el : maos->s1) { - el.a01 += el.a02 + sample; - el.a02 += el.a03 + sample; - el.a03 += el.a04 + sample; - } - - for(int i = 0; i < sample_size; i++) { - maos->s1[i].a04 += maos->s2[i].a05 + sample; - } - - for(auto& el : maos->s2) { - el.a05 += el.a06 + sample; - el.a06 += el.a07 + sample; - el.a07 += el.a08 + sample; - } - - for(int i = 0; i < sample_size; i++) { - maos->s2[i].a08 += maos->s3[i].a09 + i; - } - - for(auto& el : maos->s3) { - el.a09 += el.a10 + sample; - el.a10 += el.a11 + sample; - el.a11 += el.a12 + sample; - } - - for(int i = 0; i < sample_size; i++) { - maos->s3[i].a12 += maos->s4[i].a13 + sample; - } - - for(auto& el : maos->s4) { - el.a13 += el.a14 + sample; - el.a14 += el.a15 + sample; - el.a15 += el.a16 + sample; - } - - for(int i = 0; i < sample_size; i++) { - maos->s4[i].a16 += maos->s5[i].a17 + sample; - } - - for(auto& el : maos->s5) { - el.a17 += el.a18 + sample; - el.a18 += el.a19 + sample; - el.a19 += el.a20 + sample; - } - - maos_many_for.sample_time(start); - } - - samples.maos_many_for.push_back(maos_many_for); - - Stats maos_many_for_2; - for(int sample = 0; sample < sample_number; sample++) { - auto start = maos_many_for.time_start(); - - for(auto& el : maos->s1) { - el.a01 += el.a02 + sample; - el.a02 += el.a03 + sample; - el.a03 += el.a04 + sample; - } - - for(auto& el : maos->s2) { - el.a05 += el.a06 + sample; - el.a06 += el.a07 + sample; - el.a07 += el.a08 + sample; - } - - for(auto& el : maos->s3) { - el.a09 += el.a10 + sample; - el.a10 += el.a11 + sample; - el.a11 += el.a12 + sample; - } - - for(auto& el : maos->s4) { - el.a13 += el.a14 + sample; - el.a14 += el.a15 + sample; - el.a15 += el.a16 + sample; - } - - for(auto& el : maos->s5) { - el.a17 += el.a18 + sample; - el.a18 += el.a19 + sample; - el.a19 += el.a20 + sample; - } - - maos_many_for.sample_time(start); - } - - samples.maos_many_for_2.push_back(maos_many_for); - } - - void test_all_performance() { - Samples samples; - - int sample_size = 100; - int sample_count = 100; - - for(int i = 0; i < 10; i++) { - // quick and dirty "randomness" - if(i % 2 == 0) { - test_large_soa(samples, sample_size, sample_count); - test_large_struct(samples, sample_size, sample_count); - test_maos_style(samples, sample_count, sample_count); - } else if(i % 3 == 0) { - test_large_struct(samples, sample_size, sample_count); - test_large_soa(samples, sample_size, sample_count); - test_maos_style(samples, sample_count, sample_count); - } else { - test_maos_style(samples, sample_count, sample_count); - test_large_struct(samples, sample_size, sample_count); - test_large_soa(samples, sample_size, sample_count); - } - } - - fmt::println("soa_bf soa_mf ls_bf ls_mf maos_bf maos_mf maos_mf2"); - - Samples mofm; - - Stats soa_big_for; - Stats soa_many_for; - Stats ls_big_for; - Stats ls_many_for; - Stats maos_big_for; - Stats maos_many_for; - Stats maos_many_for_2; - - for(size_t i = 0; i < samples.soa_big_for.size(); i++) { - fmt::println("{:.2f} {:.2f} {:.2f} {:.2f} {:.2f} {:.2f} {:.2f}", - samples.soa_big_for[i].mean(), - samples.soa_many_for[i].mean(), - samples.ls_big_for[i].mean(), - samples.ls_many_for[i].mean(), - samples.maos_big_for[i].mean(), - samples.maos_many_for[i].mean(), - samples.maos_many_for_2[i].mean()); - - // this is potentially total bullshit - soa_big_for.sample(samples.soa_big_for[i].mean()); - soa_many_for.sample(samples.soa_many_for[i].mean()); - ls_big_for.sample(samples.ls_big_for[i].mean()); - ls_many_for.sample(samples.ls_many_for[i].mean()); - maos_big_for.sample(samples.maos_big_for[i].mean()); - maos_many_for.sample(samples.maos_many_for[i].mean()); - maos_many_for_2.sample(samples.maos_many_for_2[i].mean()); - } - - soa_big_for.dump("soa_big_for"); - soa_many_for.dump("soa_many_for"); - ls_big_for.dump("ls_big_for"); - ls_many_for.dump("ls_many_for"); - maos_big_for.dump("maos_big_for"); - maos_many_for.dump("maos_many_for"); - maos_many_for_2.dump("maos_many_for_2"); - - // totally not sure if this t-test is legit, must study more - soa_big_for.t_test(ls_big_for); - soa_big_for.t_test(maos_big_for); - - // soa_many_for.t_test(ls_many_for); - // soa_many_for.t_test(maos_many_for); - - // ls_many_for.t_test(maos_many_for); - // ls_big_for.t_test(maos_big_for); - - // // the most pathologic case - // fmt::println("---- {}", soa_big_for.mean() - ls_many_for.mean()); - // soa_big_for.t_test(ls_many_for); - - // fmt::println("--- MAOS many_for vs many_for_2"); - maos_many_for.t_test(maos_many_for_2); - - // fmt::println("--- MAOS big_for vs many_for_2"); - maos_big_for.t_test(maos_many_for_2); - } - - fuc2::Set TESTS{ - .name="perf", - .tests={ - TEST(test_all_performance), - } - }; -} diff --git a/tests/soa_tests.cpp b/tests/soa_tests.cpp deleted file mode 100644 index bf2d283..0000000 --- a/tests/soa_tests.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include -#include -#include -#include -#define SOL_ALL_SAFETIES_ON 1 -#include -#include "stats.hpp" - -using namespace fuc2; - -namespace soa_tests { - - struct SOAStyle { - std::vector name; - std::vector hp; - std::vector damage; - std::vector dead; - size_t count=0; - }; - - void test_soa_basics() { - SOAStyle world; - - for(int i = 0; i < 10; i++) { - auto name = fmt::format("Fighter-{}", i); - world.name.emplace_back(name); - world.hp.emplace_back(i+10); - world.damage.emplace_back(i+1); - world.dead.emplace_back(false); - world.count++; - } - - sol::state lua; - lua.open_libraries(sol::lib::base); - lua.new_usertype("SOAStyle", - "name", &SOAStyle::name, - "hp", &SOAStyle::hp, - "damage", &SOAStyle::damage, - "dead", &SOAStyle::dead, - "count", &SOAStyle::count); - - lua.script_file("tests/soa_tests.lua"); - sol::function handler = lua["handler"]; - - handler(world); - } - - fuc2::Set TESTS{ - .name="soa", - .options={ .fail_fast=false }, - .tests={ - TEST(test_soa_basics), - } - }; -} diff --git a/tests/soa_tests.lua b/tests/soa_tests.lua deleted file mode 100644 index 11366f4..0000000 --- a/tests/soa_tests.lua +++ /dev/null @@ -1,25 +0,0 @@ -function combat(world, index) - world.hp[index] = world.hp[index] - world.damage[index] -end - -function cull_dead(world, index) - if world.hp[index] < 0 then - world.dead[index] = true - end -end - - -function handler(world) - print("world count", world.count) - - for i = 1, world.count + 1, 1 - do - combat(world, i) - cull_dead(world, i) - - print(world.name[i], - "HP now", world.hp[i], - "damage", world.damage[i], - "dead", world.dead[i]) - end -end diff --git a/tests/sol2_test.cpp b/tests/sol2_test.cpp index c01bd23..43b7320 100644 --- a/tests/sol2_test.cpp +++ b/tests/sol2_test.cpp @@ -21,13 +21,13 @@ namespace sol2_tests { } struct vars { - int boop = 0; + std::string boop = ""; }; void test_big_ass_vector() { std::vector variables; for(int i = 0; i < 100; i++) { - variables.emplace_back(i); + variables.emplace_back("hi"); } sol::state lua; @@ -36,18 +36,18 @@ namespace sol2_tests { lua.new_usertype("vars", "boop", &vars::boop); lua.script(R"( function handler(v) - v.boop = v.boop + 1 + v.boop = v.boop .. "hi" end )"); sol::function handler = lua["handler"]; for(auto& v : variables) { - int boop_before = v.boop; + std::string boop_before = v.boop; handler(v); - CHECK(boop_before == v.boop - 1); + CHECK(boop_before != v.boop); } } @@ -55,9 +55,9 @@ namespace sol2_tests { sol::state lua; lua.new_usertype("vars", "boop", &vars::boop); lua.script("beep = vars.new()\n" - "beep.boop = 1"); + "beep.boop = \"hi\""); - EQUAL(lua.get("beep").boop, 1); + EQUAL(lua.get("beep").boop, "hi"); } void test_base_libraries() {