rpuzonas/boids-playground
1
0
Fork 0
generated from rpuzonas/raylib-cpp-template
Code Releases Activity

reduce memory footprint

Browse Source
This commit is contained in:
Rokas Puzonas 2023-07-20 23:23:19 +03:00
parent 2184918195
commit 7e1bb9daec
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -14,7 +14,7 @@ WEB_HEAP_SIZE := 1105199104
WEB_STACK_SIZE := 262144 WEB_STACK_SIZE := 262144
WEB_SHELL := src/shell.html WEB_SHELL := src/shell.html
COMPILER_FLAGS := -std=c++17 -Wno-enum-compare -s -O0 COMPILER_FLAGS := -std=c++17 -Wno-enum-compare -s -O1
LINKER_FLAGS := -lraylib LINKER_FLAGS := -lraylib
# SOURCES := $(wildcard src/*.cpp) # SOURCES := $(wildcard src/*.cpp)

63
src/main.cpp
View File

@ -209,6 +209,26 @@ static bool boid_list_iterator_next(BoidsListNodeIterator *iterator, uint16_t *v
return true; return true;
} }
static void boid_list_append(MemoryArena *arena, BoidsListNode *node, uint16_t *count, uint16_t new_boid) {
int left_count = *count;
BoidsListNode *prev = node;
BoidsListNode *curr = node;
while (left_count > BOIDS_PER_NODE && curr) {
prev = curr;
curr = curr->next;
left_count -= BOIDS_PER_NODE;
}
if (curr == NULL) {
curr = (BoidsListNode*)arena_malloc(arena, sizeof(BoidsListNode));
curr->next = NULL;
prev->next = curr;
}
prev->boid_ids[left_count] = new_boid;
(*count)++;
}
static void boid_list_append_unique(MemoryArena *arena, BoidsListNode *local_boids, uint16_t *count, uint16_t new_boid) { static void boid_list_append_unique(MemoryArena *arena, BoidsListNode *local_boids, uint16_t *count, uint16_t new_boid) {
int left_count = *count; int left_count = *count;
BoidsListNode *last = local_boids; BoidsListNode *last = local_boids;
@ -261,11 +281,9 @@ static void world_update(World *world, float dt) {
assert(boid_count <= MAX_BOIDS); assert(boid_count <= MAX_BOIDS);
RPROF_START("Alloc groups"); RPROF_START("Alloc groups");
// LocalBoidsListNode all_local_boids[boid_count];
BoidsListNode *all_local_boids = (BoidsListNode*)arena_malloc(&world->frame_arena, boid_count * sizeof(BoidsListNode)); BoidsListNode *all_local_boids = (BoidsListNode*)arena_malloc(&world->frame_arena, boid_count * sizeof(BoidsListNode));
uint16_t all_local_boid_counts[boid_count]; uint16_t all_local_boid_counts[boid_count];
for (int i = 0; i < boid_count; i++) { for (int i = 0; i < boid_count; i++) {
// all_local_boids[i] = (uint16_t *)arena_malloc(&world->frame_arena, boid_count * sizeof(uint16_t));
all_local_boids[i].next = NULL; all_local_boids[i].next = NULL;
all_local_boid_counts[i] = 0; all_local_boid_counts[i] = 0;
} }
@ -276,11 +294,12 @@ static void world_update(World *world, float dt) {
int chunks_wide = std::ceil(world->size.x / chunk_size) + 1; int chunks_wide = std::ceil(world->size.x / chunk_size) + 1;
int chunks_high = std::ceil(world->size.y / chunk_size) + 1; int chunks_high = std::ceil(world->size.y / chunk_size) + 1;
RPROF_START("Alloc chunks"); RPROF_START("Alloc chunks");
uint16_t *chunks[chunks_high][chunks_wide]; BoidsListNode *chunks[chunks_high][chunks_wide];
uint16_t chunk_boid_counts[chunks_high][chunks_wide]; uint16_t chunk_boid_counts[chunks_high][chunks_wide];
for (int y = 0; y < chunks_high; y++) { for (int y = 0; y < chunks_high; y++) {
for (int x = 0; x < chunks_wide; x++) { for (int x = 0; x < chunks_wide; x++) {
chunks[y][x] = (uint16_t*)arena_malloc(&world->frame_arena, boid_count * sizeof(uint16_t)); chunks[y][x] = (BoidsListNode*)arena_malloc(&world->frame_arena, sizeof(BoidsListNode));
chunks[y][x]->next = NULL;
chunk_boid_counts[y][x] = 0; chunk_boid_counts[y][x] = 0;
} }
} }
@ -291,17 +310,13 @@ static void world_update(World *world, float dt) {
Boid *boid = &boids[i]; Boid *boid = &boids[i];
int chunk_x = boid->pos.x / chunk_size; int chunk_x = boid->pos.x / chunk_size;
int chunk_y = boid->pos.y / chunk_size; int chunk_y = boid->pos.y / chunk_size;
uint16_t *count = &chunk_boid_counts[chunk_y][chunk_x];
chunks[chunk_y][chunk_x][*count] = i;
(*count)++;
} }
RPROF_STOP(); RPROF_STOP();
RPROF_START("Calc dot products and ranges (chunked)"); RPROF_START("Calc dot products and ranges (chunked)");
for (int y = 0; y < chunks_high; y++) { for (int y = 0; y < chunks_high; y++) {
for (int x = 0; x < chunks_high; x++) { for (int x = 0; x < chunks_high; x++) {
uint16_t *chunk = chunks[y][x]; BoidsListNode *chunk = chunks[y][x];
size_t chunk_boid_count = chunk_boid_counts[y][x]; size_t chunk_boid_count = chunk_boid_counts[y][x];
for (int oy = -1; oy <= 1; oy++) { for (int oy = -1; oy <= 1; oy++) {
@ -312,30 +327,20 @@ static void world_update(World *world, float dt) {
int chunk_x = y + ox; int chunk_x = y + ox;
if (chunk_x < 0 || chunk_x >= chunks_wide) continue; if (chunk_x < 0 || chunk_x >= chunks_wide) continue;
uint16_t *neighbour_chunk = chunks[chunk_y][chunk_x]; BoidsListNode *neighbour_chunk = chunks[chunk_y][chunk_x];
size_t neighbour_chunk_boid_count = chunk_boid_counts[chunk_y][chunk_x]; size_t neighbour_chunk_boid_count = chunk_boid_counts[chunk_y][chunk_x];
for (int i = 0; i < chunk_boid_count; i++) { uint16_t boid1;
int boid1 = chunk[i]; BoidsListNodeIterator it1 = boid_list_get_iterator(chunk, chunk_boid_count);
for (int j = 0; j < neighbour_chunk_boid_count; j++) { while (boid_list_iterator_next(&it1, &boid1)) {
int boid2 = chunk[j]; uint16_t boid2;
BoidsListNodeIterator it2 = boid_list_get_iterator(neighbour_chunk, neighbour_chunk_boid_count);
while (boid_list_iterator_next(&it2, &boid2)) {
if (boid1 == boid2) continue; if (boid1 == boid2) continue;
assign_local_boids(world, all_local_boids, all_local_boid_counts, boids, boid1, boid2); assign_local_boids(world, all_local_boids, all_local_boid_counts, boids, boid1, boid2);
} }
} }
// uint16_t boid1;
// BoidsListNodeIterator it1 = boid_list_get_iterator(chunk, chunk_boid_count);
// while (boid_list_iterator_next(&it1, &boid1)) {
// uint16_t boid2;
// BoidsListNodeIterator it2 = boid_list_get_iterator(neighbour_chunk, neighbour_chunk_boid_count);
// while (boid_list_iterator_next(&it2, &boid2)) {
// if (boid1 == boid2) continue;
//
// assign_local_boids(world, all_local_boids, all_local_boid_counts, boids, boid1, boid2);
// }
// }
} }
} }
} }
@ -669,7 +674,7 @@ int estimate_maximum_boid_count(World *world) {
return boid_count; return boid_count;
} }
int main() { int foo_main() {
rprof_init(); rprof_init();
world_init(&g_world, 1280, 720); world_init(&g_world, 1280, 720);
@ -695,7 +700,7 @@ int main() {
return 0; return 0;
} }
int foo_main() { int main() {
SetTraceLogLevel(LOG_TRACE); SetTraceLogLevel(LOG_TRACE);
int screen_width = 1280; int screen_width = 1280;
@ -712,7 +717,7 @@ int foo_main() {
world_init(&g_world, screen_width, screen_height); world_init(&g_world, screen_width, screen_height);
float border = g_world.collision_avoidance_distance; float border = g_world.collision_avoidance_distance;
for (int i = 0; i < 50000; i++) { for (int i = 0; i < MAX_BOIDS; i++) {
Boid boid; Boid boid;
boid_rand_init(&g_world, &boid, border); boid_rand_init(&g_world, &boid, border);
g_world.boids.push_back(boid); g_world.boids.push_back(boid);