Commit 770631cc79a655bc5e21184ca15bdb6192e905de | zig

author	Michael Dusan <michael.dusan@gmail.com> 2020-02-20 02:45:58-05:00
committer	Michael Dusan <michael.dusan@gmail.com> 2020-02-20 21:05:37-05:00
log	770631cc79a655bc5e21184ca15bdb6192e905de
tree	9d9952d5e25df9891217a99f2d0f9aff2ef14caf
parent	e381a42de9c0f0c5439a926b0ac99026a0373f49
signature	Commit is signed but in an unrecognized format.

stage1: free more heap after analysis

- immediately free dangling IrInstGenConst after analysis
- fixup mem::List params `&Allocator` → `*Allocator`

3 files changed, 30 insertions(+), 8 deletions(-)

src/ir.cpp+19

 @@ -14,6 +14,7 @@
 #include "range_set.hpp"
 #include "softfloat.hpp"
 #include "util.hpp"
+#include "mem_list.hpp"
 #include <errno.h>
 @@ -28,6 +29,9 @@ struct IrBuilderGen {
     CodeGen *codegen;
     IrExecutableGen *exec;
     IrBasicBlockGen *current_basic_block;
+    // track for immediate post-analysis destruction
+    mem::List<IrInstGenConst *> constants;
 };
 struct IrAnalyze {
 @@ -741,6 +745,10 @@ static void ira_ref(IrAnalyze *ira) {
 static void ira_deref(IrAnalyze *ira) {
     if (ira->ref_count > 1) {
         ira->ref_count -= 1;
+        // immediate destruction of dangling IrInstGenConst is not possible
+        // free tracking memory because it will never be used
+        ira->new_irb.constants.deinit(&heap::c_allocator);
         return;
     }
     assert(ira->ref_count != 0);
 @@ -758,6 +766,15 @@ static void ira_deref(IrAnalyze *ira) {
     heap::c_allocator.destroy(ira->old_irb.exec);
     ira->src_implicit_return_type_list.deinit();
     ira->resume_stack.deinit();
+    // destroy dangling IrInstGenConst
+    for (size_t i = 0; i < ira->new_irb.constants.length; i += 1) {
+        auto constant = ira->new_irb.constants.items[i];
+        if (constant->base.base.ref_count == 0 && !ir_inst_gen_has_side_effects(&constant->base))
+            destroy_instruction_gen(&constant->base);
+    }
+    ira->new_irb.constants.deinit(&heap::c_allocator);
     heap::c_allocator.destroy(ira);
 }
 @@ -12746,12 +12763,14 @@ static IrInstGen *ir_const(IrAnalyze *ira, IrInst *inst, ZigType *ty) {
     IrInstGen *new_instruction = &const_instruction->base;
     new_instruction->value->type = ty;
     new_instruction->value->special = ConstValSpecialStatic;
+    ira->new_irb.constants.append(&heap::c_allocator, const_instruction);
     return new_instruction;
 }
 static IrInstGen *ir_const_noval(IrAnalyze *ira, IrInst *old_instruction) {
     IrInstGenConst *const_instruction = ir_create_inst_noval<IrInstGenConst>(&ira->new_irb,
             old_instruction->scope, old_instruction->source_node);
+    ira->new_irb.constants.append(&heap::c_allocator, const_instruction);
     return &const_instruction->base;
 }

src/mem_list.hpp+9-6

...	@@ -14,11 +14,14 @@ namespace mem {	...	@@ -14,11 +14,14 @@ namespace mem {
14		14
15	template<typename T>	15	template<typename T>
16	struct List {	16	struct List {
17	void deinit(Allocator& allocator) {	17	void deinit(Allocator *allocator) {
18	allocator.deallocate<T>(items, capacity);	18	allocator->deallocate<T>(items, capacity);
		19	items = nullptr;
		20	length = 0;
		21	capacity = 0;
19	}	22	}
20		23
21	void append(Allocator& allocator, const T& item) {	24	void append(Allocator *allocator, const T& item) {
22	ensure_capacity(allocator, length + 1);	25	ensure_capacity(allocator, length + 1);
23	items[length++] = item;	26	items[length++] = item;
24	}	27	}
...	@@ -57,7 +60,7 @@ struct List {	...	@@ -57,7 +60,7 @@ struct List {
57	return items[length - 1];	60	return items[length - 1];
58	}	61	}
59		62
60	void resize(Allocator& allocator, size_t new_length) {	63	void resize(Allocator *allocator, size_t new_length) {
61	assert(new_length != SIZE_MAX);	64	assert(new_length != SIZE_MAX);
62	ensure_capacity(allocator, new_length);	65	ensure_capacity(allocator, new_length);
63	length = new_length;	66	length = new_length;
...	@@ -67,7 +70,7 @@ struct List {	...	@@ -67,7 +70,7 @@ struct List {
67	length = 0;	70	length = 0;
68	}	71	}
69		72
70	void ensure_capacity(Allocator& allocator, size_t new_capacity) {	73	void ensure_capacity(Allocator *allocator, size_t new_capacity) {
71	if (capacity >= new_capacity)	74	if (capacity >= new_capacity)
72	return;	75	return;
73		76
...	@@ -76,7 +79,7 @@ struct List {	...	@@ -76,7 +79,7 @@ struct List {
76	better_capacity = better_capacity * 5 / 2 + 8;	79	better_capacity = better_capacity * 5 / 2 + 8;
77	} while (better_capacity < new_capacity);	80	} while (better_capacity < new_capacity);
78		81
79	items = allocator.reallocate_nonzero<T>(items, capacity, better_capacity);	82	items = allocator->reallocate_nonzero<T>(items, capacity, better_capacity);
80	capacity = better_capacity;	83	capacity = better_capacity;
81	}	84	}
82		85

src/mem_profile.cpp+2-2

...	@@ -92,7 +92,7 @@ void Profile::print_report(FILE *file) {	...	@@ -92,7 +92,7 @@ void Profile::print_report(FILE *file) {
92	auto entry = it.next();	92	auto entry = it.next();
93	if (!entry)	93	if (!entry)
94	break;	94	break;
95	list.append(heap::bootstrap_allocator, &entry->value);	95	list.append(&heap::bootstrap_allocator, &entry->value);
96	}	96	}
97		97
98	qsort(list.items, list.length, sizeof(const Entry *), entry_compare);	98	qsort(list.items, list.length, sizeof(const Entry *), entry_compare);
...	@@ -143,7 +143,7 @@ void Profile::print_report(FILE *file) {	...	@@ -143,7 +143,7 @@ void Profile::print_report(FILE *file) {
143	fprintf(file, "\n Total calls alloc: %zu, dealloc: %zu, remain: %zu\n",	143	fprintf(file, "\n Total calls alloc: %zu, dealloc: %zu, remain: %zu\n",
144	total_calls_alloc, total_calls_dealloc, (total_calls_alloc - total_calls_dealloc));	144	total_calls_alloc, total_calls_dealloc, (total_calls_alloc - total_calls_dealloc));
145		145
146	list.deinit(heap::bootstrap_allocator);	146	list.deinit(&heap::bootstrap_allocator);
147	}	147	}
148		148
149	uint32_t Profile::usage_hash(UsageKey key) {	149	uint32_t Profile::usage_hash(UsageKey key) {