Compare commits

..

9 Commits

Author SHA1 Message Date
45e3bc83a9 Update README.md 2025-05-31 03:08:38 +01:00
40b5bb1634 Add README.md 2025-05-31 03:08:26 +01:00
054a3bbdd7 Update .gitignore 2025-05-31 03:06:46 +01:00
Abdelrahman Said
f8b859b4e8 Fix submodules 2025-05-27 15:22:52 +01:00
Abdelrahman Said
d94c7f8c63 Switch to using https for submodules 2025-05-27 15:20:50 +01:00
Abdelrahman Said
cdb02bd209 Enable rendering 2025-05-27 15:06:51 +01:00
cadba71330 Add threading 2025-05-24 03:50:31 +01:00
e6d39028fb Modify run_perf 2025-05-24 03:22:48 +01:00
a9d4b4eae1 Add count 2025-05-24 03:17:25 +01:00
6 changed files with 86 additions and 25 deletions

1
.gitignore vendored
View File

@@ -8,3 +8,4 @@ raylib-build
*.data *.data
*.ods *.ods
*.dSYM *.dSYM
*.out

4
.gitmodules vendored
View File

@@ -1,6 +1,6 @@
[submodule "wapp"] [submodule "wapp"]
path = wapp path = wapp
url = git@git.thewizardapprentice.com:abdelrahman/wizapp-stdlib url = https://git.thewizardapprentice.com/abdelrahman/wizapp-stdlib
[submodule "raylib-src"] [submodule "raylib-src"]
path = raylib-src path = raylib-src
url = git@github.com:raysan5/raylib url = https://github.com/raysan5/raylib

View File

@@ -1,6 +1,6 @@
CC = clang CC = clang
CFLAGS = -g -O3 -Iraylib/include -Iwapp/src CFLAGS = -g -O3 -Iraylib/include -Iwapp/src
LDFLAGS = '-Wl,-rpath,$$ORIGIN/raylib/lib' -Lraylib/lib -lraylib -lm LDFLAGS = '-Wl,-rpath,$$ORIGIN/raylib/lib' -Lraylib/lib -lraylib -lm -lpthread
BASEDIR = $(shell realpath ./) BASEDIR = $(shell realpath ./)
RL_SRCDIR = ${BASEDIR}/raylib-src/src RL_SRCDIR = ${BASEDIR}/raylib-src/src
RL_BUILDDIR = ${BASEDIR}/raylib-build RL_BUILDDIR = ${BASEDIR}/raylib-build

3
README.md Normal file
View File

@@ -0,0 +1,3 @@
# Data-Oriented Design Test
Playing around with [DOD](https://en.wikipedia.org/wiki/Data-oriented_design) concepts and comparing performance of resulting applications.

85
dod.c
View File

@@ -6,6 +6,9 @@
#include <stdbool.h> #include <stdbool.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <pthread.h>
#define THREAD_COUNT 4
#define MOVABLE_TAG_SHIFT 0 #define MOVABLE_TAG_SHIFT 0
#define RENDERABLE_TAG_SHIFT 1 #define RENDERABLE_TAG_SHIFT 1
@@ -57,6 +60,17 @@ struct Manager {
u64 count; u64 count;
}; };
typedef struct PositionThreadArgs PositionThreadArgs;
struct PositionThreadArgs {
const Rect *zones;
Rect *rects;
Velocity *velocities;
u8 *tags;
u64 count;
f32 delta;
};
typedef void *(*PThreadRoutine)(void *);
typedef void (*ScaleInitialiser)(Scale *scale, XOR256State *state); typedef void (*ScaleInitialiser)(Scale *scale, XOR256State *state);
typedef void (*VelocityInitialiser)(Velocity *velocity, XOR256State *state); typedef void (*VelocityInitialiser)(Velocity *velocity, XOR256State *state);
typedef void (*RaylibDrawRectFunc)(int posX, int posY, int width, int height, Color color); typedef void (*RaylibDrawRectFunc)(int posX, int posY, int width, int height, Color color);
@@ -68,6 +82,7 @@ void init_scale_zone(Scale *scale, XOR256State *state);
void init_velocity(Velocity *velocity, XOR256State *state); void init_velocity(Velocity *velocity, XOR256State *state);
void zero_velocity(Velocity *velocity, XOR256State *state); void zero_velocity(Velocity *velocity, XOR256State *state);
void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f32 delta); void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f32 delta);
void *update_position_thread(PositionThreadArgs *args);
void render_entities(const u8 *tags, const Rect *rects, u64 count); void render_entities(const u8 *tags, const Rect *rects, u64 count);
u8 collides(const Rect *rect, const Rect *collider); u8 collides(const Rect *rect, const Rect *collider);
i16 get_random_velocity(XOR256State *state); i16 get_random_velocity(XOR256State *state);
@@ -77,7 +92,7 @@ int main(void) {
SetTraceLogLevel(LOG_NONE); SetTraceLogLevel(LOG_NONE);
InitWindow(WIDTH, HEIGHT, "DOD test"); InitWindow(WIDTH, HEIGHT, "DOD test");
// SetTargetFPS(target_fps); SetTargetFPS(target_fps);
Allocator arena = wapp_mem_arena_allocator_init(MB(20)); Allocator arena = wapp_mem_arena_allocator_init(MB(20));
assert(!wapp_mem_allocator_invalid(&arena)); assert(!wapp_mem_allocator_invalid(&arena));
@@ -119,7 +134,7 @@ int main(void) {
ClearBackground(BG_COLOR); ClearBackground(BG_COLOR);
// render_entities(manager.tags, manager.rects, manager.count); render_entities(manager.tags, manager.rects, manager.count);
DrawFPS(10, 10); DrawFPS(10, 10);
@@ -184,6 +199,46 @@ void zero_velocity(Velocity *velocity, XOR256State *state) {
} }
void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f32 delta) { void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f32 delta) {
persistent pthread_t threads[THREAD_COUNT] = {0};
persistent PositionThreadArgs args[THREAD_COUNT] = {0};
u64 total_entities_count = count - ZONE_COUNT;
u64 thread_entities_count = (u64)(ceil((f64)total_entities_count / THREAD_COUNT));
i32 result;
u64 start = ZONE_COUNT;
u64 end, args_count;
for (u64 i = 0; i < THREAD_COUNT; ++i) {
if (total_entities_count > thread_entities_count) {
end = start + thread_entities_count;
total_entities_count -= thread_entities_count;
} else {
end = start + total_entities_count;
total_entities_count = 0;
}
args_count = end - start;
args[i].zones = &(rects[0]);
args[i].tags = &(tags[start]);
args[i].rects = &(rects[start]);
args[i].velocities = &(velocities[start]);
args[i].count = args_count;
args[i].delta = delta;
start += args_count;
result = pthread_create(&(threads[i]), NULL, (PThreadRoutine)update_position_thread, (void *)&(args[i]));
assert(result == 0);
}
for (u64 i = 0; i < THREAD_COUNT; ++i) {
pthread_join(threads[i], NULL);
}
}
void *update_position_thread(PositionThreadArgs *args) {
persistent f32 multipliers[2] = {1.0f, 0.5f}; persistent f32 multipliers[2] = {1.0f, 0.5f};
persistent u64 inside_zone_mask = 0x7; persistent u64 inside_zone_mask = 0x7;
@@ -191,33 +246,35 @@ void update_positions(u8 *tags, Rect *rects, Velocity *velocities, u64 count, f3
f32 pos_x, pos_y; f32 pos_x, pos_y;
f32 max_x, max_y; f32 max_x, max_y;
for (u64 i = ZONE_COUNT; i < count; ++i) { for (u64 i = 0; i < args->count; ++i) {
tags[i] &= inside_zone_mask; args->tags[i] &= inside_zone_mask;
for (u64 j = 0; j < ZONE_COUNT; ++j) { for (u64 j = 0; j < ZONE_COUNT; ++j) {
tags[i] |= collides(&rects[i], &rects[j]) << INSIDE_ZONE_TAG_SHIFT; args->tags[i] |= collides(&args->rects[i], &args->zones[j]) << INSIDE_ZONE_TAG_SHIFT;
} }
index = (tags[i] & ENTITY_TAG_INSIDE_ZONE) >> INSIDE_ZONE_TAG_SHIFT; index = (args->tags[i] & ENTITY_TAG_INSIDE_ZONE) >> INSIDE_ZONE_TAG_SHIFT;
max_x = WIDTH - rects[i].scale.width; max_x = WIDTH - args->rects[i].scale.width;
max_y = HEIGHT - rects[i].scale.height; max_y = HEIGHT - args->rects[i].scale.height;
pos_x = rects[i].position.x + velocities[i].x * multipliers[index] * delta; pos_x = args->rects[i].position.x + args->velocities[i].x * multipliers[index] * args->delta;
pos_y = rects[i].position.y + velocities[i].y * multipliers[index] * delta; pos_y = args->rects[i].position.y + args->velocities[i].y * multipliers[index] * args->delta;
if (pos_x < 0 || pos_x >= max_x) { if (pos_x < 0 || pos_x >= max_x) {
pos_x = min(max(pos_x, 0), max_x); pos_x = min(max(pos_x, 0), max_x);
velocities[i].x *= -1; args->velocities[i].x *= -1;
} }
if (pos_y < 0 || pos_y >= max_y) { if (pos_y < 0 || pos_y >= max_y) {
pos_y = min(max(pos_y, 0), max_y); pos_y = min(max(pos_y, 0), max_y);
velocities[i].y *= -1; args->velocities[i].y *= -1;
} }
rects[i].position.x = roundf(pos_x); args->rects[i].position.x = roundf(pos_x);
rects[i].position.y = roundf(pos_y); args->rects[i].position.y = roundf(pos_y);
} }
return args;
} }
void render_entities(const u8 *tags, const Rect *rects, u64 count) { void render_entities(const u8 *tags, const Rect *rects, u64 count) {

View File

@@ -50,7 +50,7 @@ f32 get_random_float(XOR256State *state);
int main(void) { int main(void) {
SetTraceLogLevel(LOG_NONE); SetTraceLogLevel(LOG_NONE);
InitWindow(WIDTH, HEIGHT, "No-DOD test"); InitWindow(WIDTH, HEIGHT, "No-DOD test");
// SetTargetFPS(120); SetTargetFPS(120);
Allocator arena = wapp_mem_arena_allocator_init(MB(20)); Allocator arena = wapp_mem_arena_allocator_init(MB(20));
XOR256State state = wapp_prng_xorshift_init_state(); XOR256State state = wapp_prng_xorshift_init_state();
@@ -84,13 +84,13 @@ int main(void) {
ClearBackground(BG_COLOR); ClearBackground(BG_COLOR);
// for (u64 i = 0; i < ZONE_COUNT; ++i) { for (u64 i = 0; i < ZONE_COUNT; ++i) {
// render_slow_zone(&(zones[i])); render_slow_zone(&(zones[i]));
// } }
//
// for (u64 i = 0; i < WANDERER_COUNT; ++i) { for (u64 i = 0; i < WANDERER_COUNT; ++i) {
// render_wanderer(&(wanderers[i])); render_wanderer(&(wanderers[i]));
// } }
DrawFPS(10, 10); DrawFPS(10, 10);