ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-14 07:01:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into file-tags-without-comments

Browse Source
This commit is contained in:
Karl Zylinski
2024-09-08 11:29:21 +02:00
parent 73e4954346 300b01d77d
commit f3a2b625ae
15 changed files with 237 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build_settings.cpp
+4 -3
View File
@@ -2048,10 +2048,11 @@ gb_internal bool init_build_paths(String init_filename) {
gbFile output_file_test;
const char* output_file_name = (const char*)output_file.text;
gbFileError output_test_err = gb_file_open_mode(&output_file_test, gbFileMode_Append | gbFileMode_Rw, output_file_name);
gb_file_close(&output_file_test);
gb_file_remove(output_file_name);
if (output_test_err != 0) {
if (output_test_err == 0) {
gb_file_close(&output_file_test);
gb_file_remove(output_file_name);
} else {
String output_file = path_to_string(ha, bc->build_paths[BuildPath_Output]);
defer (gb_free(ha, output_file.text));
gb_printf_err("No write permissions for output path: %.*s\n", LIT(output_file));
src/check_builtin.cpp
+10
View File
@@ -5203,6 +5203,16 @@ gb_internal bool check_builtin_procedure(CheckerContext *c, Operand *operand, As
return false;
}
if (sz >= 64) {
if (is_type_unsigned(x.type)) {
add_package_dependency(c, "runtime", "umodti3", true);
add_package_dependency(c, "runtime", "udivti3", true);
} else {
add_package_dependency(c, "runtime", "modti3", true);
add_package_dependency(c, "runtime", "divti3", true);
}
}
operand->type = x.type;
operand->mode = Addressing_Value;
}
src/llvm_backend_debug.cpp
+46 -9
View File
@@ -82,13 +82,36 @@ gb_internal LLVMMetadataRef lb_debug_type_internal_proc(lbModule *m, Type *type)
parameter_count += 1;
}
}
LLVMMetadataRef *parameters = gb_alloc_array(permanent_allocator(), LLVMMetadataRef, parameter_count);
unsigned param_index = 0;
if (type->Proc.result_count == 0) {
parameters[param_index++] = nullptr;
} else {
parameters[param_index++] = lb_debug_procedure_parameters(m, type->Proc.results);
auto parameters = array_make<LLVMMetadataRef>(permanent_allocator(), 0, type->Proc.param_count+type->Proc.result_count+2);
array_add(&parameters, cast(LLVMMetadataRef)nullptr);
bool return_is_tuple = false;
if (type->Proc.result_count != 0) {
Type *single_ret = reduce_tuple_to_single_type(type->Proc.results);
if (is_type_proc(single_ret)) {
single_ret = t_rawptr;
}
if (is_type_tuple(single_ret) && is_calling_convention_odin(type->Proc.calling_convention)) {
LLVMTypeRef actual = lb_type_internal_for_procedures_raw(m, type);
actual = LLVMGetReturnType(actual);
if (actual == nullptr) {
// results were passed as a single pointer
parameters[0] = lb_debug_procedure_parameters(m, single_ret);
} else {
LLVMTypeRef possible = lb_type(m, type->Proc.results);
if (possible == actual) {
// results were returned directly
parameters[0] = lb_debug_procedure_parameters(m, single_ret);
} else {
// resulsts were returned separately
return_is_tuple = true;
}
}
} else {
parameters[0] = lb_debug_procedure_parameters(m, single_ret);
}
}
LLVMMetadataRef file = nullptr;
@@ -98,8 +121,22 @@ gb_internal LLVMMetadataRef lb_debug_type_internal_proc(lbModule *m, Type *type)
if (e->kind != Entity_Variable) {
continue;
}
parameters[param_index] = lb_debug_procedure_parameters(m, e->type);
param_index += 1;
array_add(&parameters, lb_debug_procedure_parameters(m, e->type));
}
if (return_is_tuple) {
Type *results = type->Proc.results;
GB_ASSERT(results != nullptr && results->kind == Type_Tuple);
isize count = results->Tuple.variables.count;
parameters[0] = lb_debug_procedure_parameters(m, results->Tuple.variables[count-1]->type);
for (isize i = 0; i < count-1; i++) {
array_add(&parameters, lb_debug_procedure_parameters(m, results->Tuple.variables[i]->type));
}
}
if (type->Proc.calling_convention == ProcCC_Odin) {
array_add(&parameters, lb_debug_type(m, t_context_ptr));
}
LLVMDIFlags flags = LLVMDIFlagZero;
@@ -107,7 +144,7 @@ gb_internal LLVMMetadataRef lb_debug_type_internal_proc(lbModule *m, Type *type)
flags = LLVMDIFlagNoReturn;
}
return LLVMDIBuilderCreateSubroutineType(m->debug_builder, file, parameters, parameter_count, flags);
return LLVMDIBuilderCreateSubroutineType(m->debug_builder, file, parameters.data, cast(unsigned)parameters.count, flags);
}
gb_internal LLVMMetadataRef lb_debug_struct_field(lbModule *m, String const &name, Type *type, u64 offset_in_bits) {
src/llvm_backend_expr.cpp
+27 -21
View File
@@ -705,31 +705,37 @@ gb_internal lbValue lb_emit_matrix_flatten(lbProcedure *p, lbValue m, Type *type
lbAddr res = lb_add_local_generated(p, type, true);
i64 row_count = mt->Matrix.row_count;
i64 column_count = mt->Matrix.column_count;
TEMPORARY_ALLOCATOR_GUARD();
GB_ASSERT(type_size_of(type) == type_size_of(m.type));
auto srcs = array_make<lbValue>(temporary_allocator(), 0, row_count*column_count);
auto dsts = array_make<lbValue>(temporary_allocator(), 0, row_count*column_count);
lbValue m_ptr = lb_address_from_load_or_generate_local(p, m);
lbValue n = lb_const_int(p->module, t_int, type_size_of(type));
lb_mem_copy_non_overlapping(p, res.addr, m_ptr, n);
for (i64 j = 0; j < column_count; j++) {
for (i64 i = 0; i < row_count; i++) {
lbValue src = lb_emit_matrix_ev(p, m, i, j);
array_add(&srcs, src);
}
}
// i64 row_count = mt->Matrix.row_count;
// i64 column_count = mt->Matrix.column_count;
// TEMPORARY_ALLOCATOR_GUARD();
for (i64 j = 0; j < column_count; j++) {
for (i64 i = 0; i < row_count; i++) {
lbValue dst = lb_emit_array_epi(p, res.addr, i + j*row_count);
array_add(&dsts, dst);
}
}
// auto srcs = array_make<lbValue>(temporary_allocator(), 0, row_count*column_count);
// auto dsts = array_make<lbValue>(temporary_allocator(), 0, row_count*column_count);
GB_ASSERT(srcs.count == dsts.count);
for_array(i, srcs) {
lb_emit_store(p, dsts[i], srcs[i]);
}
// for (i64 j = 0; j < column_count; j++) {
// for (i64 i = 0; i < row_count; i++) {
// lbValue src = lb_emit_matrix_ev(p, m, i, j);
// array_add(&srcs, src);
// }
// }
// for (i64 j = 0; j < column_count; j++) {
// for (i64 i = 0; i < row_count; i++) {
// lbValue dst = lb_emit_array_epi(p, res.addr, i + j*row_count);
// array_add(&dsts, dst);
// }
// }
// GB_ASSERT(srcs.count == dsts.count);
// for_array(i, srcs) {
// lb_emit_store(p, dsts[i], srcs[i]);
// }
return lb_addr_load(p, res);
}
src/types.cpp
+14 -6
View File
@@ -1474,6 +1474,7 @@ gb_internal i64 matrix_align_of(Type *t, struct TypePath *tp) {
Type *elem = t->Matrix.elem;
i64 row_count = gb_max(t->Matrix.row_count, 1);
i64 column_count = gb_max(t->Matrix.column_count, 1);
bool pop = type_path_push(tp, elem);
if (tp->failure) {
@@ -1491,7 +1492,7 @@ gb_internal i64 matrix_align_of(Type *t, struct TypePath *tp) {
// could be maximally aligned but as a compromise, having no padding will be
// beneficial to third libraries that assume no padding
i64 total_expected_size = row_count*t->Matrix.column_count*elem_size;
i64 total_expected_size = row_count*column_count*elem_size;
// i64 min_alignment = prev_pow2(elem_align * row_count);
i64 min_alignment = prev_pow2(total_expected_size);
while (total_expected_size != 0 && (total_expected_size % min_alignment) != 0) {
@@ -1523,12 +1524,15 @@ gb_internal i64 matrix_type_stride_in_bytes(Type *t, struct TypePath *tp) {
i64 stride_in_bytes = 0;
// NOTE(bill, 2021-10-25): The alignment strategy here is to have zero padding
// It would be better for performance to pad each column so that each column
// It would be better for performance to pad each column/row so that each column/row
// could be maximally aligned but as a compromise, having no padding will be
// beneficial to third libraries that assume no padding
i64 row_count = t->Matrix.row_count;
stride_in_bytes = elem_size*row_count;
if (t->Matrix.is_row_major) {
stride_in_bytes = elem_size*t->Matrix.column_count;
} else {
stride_in_bytes = elem_size*t->Matrix.row_count;
}
t->Matrix.stride_in_bytes = stride_in_bytes;
return stride_in_bytes;
}
@@ -4217,7 +4221,11 @@ gb_internal i64 type_size_of_internal(Type *t, TypePath *path) {
case Type_Matrix: {
i64 stride_in_bytes = matrix_type_stride_in_bytes(t, path);
return stride_in_bytes * t->Matrix.column_count;
if (t->Matrix.is_row_major) {
return stride_in_bytes * t->Matrix.row_count;
} else {
return stride_in_bytes * t->Matrix.column_count;
}
}
case Type_BitField: