mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-06-07 19:14:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow scalars with matrices

Browse Source
This commit is contained in:
gingerBill
2021-10-21 00:04:22 +01:00
parent 3b3e7550f6
commit d67d7168e2
3 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/check_expr.cpp
View File

@@ -657,6 +657,14 @@ i64 check_distance_between_types(CheckerContext *c, Operand *operand, Type *type
return distance + 6;
}
}
if (is_type_matrix(dst)) {
Type *elem = base_array_type(dst);
i64 distance = check_distance_between_types(c, operand, elem);
if (distance >= 0) {
return distance + 7;
}
}
if (is_type_any(dst)) {
if (!is_type_polymorphic(src)) {

2
src/llvm_backend_const.cpp
View File

@@ -527,7 +527,7 @@ lbValue lb_const_value(lbModule *m, Type *type, ExactValue value, bool allow_loc
i64 total_elem_count = matrix_type_total_elems(type);
LLVMValueRef *elems = gb_alloc_array(permanent_allocator(), LLVMValueRef, cast(isize)total_elem_count);
for (i64 i = 0; i < row; i++) {
elems[matrix_index_to_offset(type, i)] = single_elem.value;
elems[matrix_indices_to_offset(type, i, i)] = single_elem.value;
}
for (i64 i = 0; i < total_elem_count; i++) {
if (elems[i] == nullptr) {

32
src/llvm_backend_expr.cpp
View File

@@ -331,7 +331,7 @@ bool lb_try_direct_vector_arith(lbProcedure *p, TokenKind op, lbValue lhs, lbVal
z = LLVMBuildFRem(p->builder, x, y, "");
break;
default:
GB_PANIC("Unsupported vector operation");
GB_PANIC("Unsupported vector operation %.*s", LIT(token_strings[op]));
break;
}
@@ -918,10 +918,11 @@ lbValue lb_emit_vector_mul_matrix(lbProcedure *p, lbValue lhs, lbValue rhs, Type
lbValue lb_emit_arith_matrix(lbProcedure *p, TokenKind op, lbValue lhs, lbValue rhs, Type *type, bool component_wise=false) {
GB_ASSERT(is_type_matrix(lhs.type) || is_type_matrix(rhs.type));
Type *xt = base_type(lhs.type);
Type *yt = base_type(rhs.type);
if (op == Token_Mul && !component_wise) {
Type *xt = base_type(lhs.type);
Type *yt = base_type(rhs.type);
if (xt->kind == Type_Matrix) {
if (yt->kind == Type_Matrix) {
return lb_emit_matrix_mul(p, lhs, rhs, type);
@@ -934,21 +935,36 @@ lbValue lb_emit_arith_matrix(lbProcedure *p, TokenKind op, lbValue lhs, lbValue
}
} else {
GB_ASSERT(are_types_identical(xt, yt));
if (is_type_matrix(lhs.type)) {
rhs = lb_emit_conv(p, rhs, lhs.type);
} else {
lhs = lb_emit_conv(p, lhs, rhs.type);
}
Type *xt = base_type(lhs.type);
Type *yt = base_type(rhs.type);
GB_ASSERT_MSG(are_types_identical(xt, yt), "%s %.*s %s", type_to_string(lhs.type), LIT(token_strings[op]), type_to_string(rhs.type));
GB_ASSERT(xt->kind == Type_Matrix);
// element-wise arithmetic
// pretend it is an array
lbValue array_lhs = lhs;
lbValue array_rhs = rhs;
Type *array_type = alloc_type_array(xt->Matrix.elem, matrix_type_total_elems(xt));
GB_ASSERT(type_size_of(array_type) == type_size_of(type));
GB_ASSERT(type_size_of(array_type) == type_size_of(xt));
array_lhs.type = array_type;
array_rhs.type = array_type;
lbValue array = lb_emit_arith_array(p, op, array_lhs, array_rhs, array_type);
array.type = type;
return array;
if (token_is_comparison(op)) {
lbValue res = lb_emit_comp(p, op, array_lhs, array_rhs);
return lb_emit_conv(p, res, type);
} else {
lbValue array = lb_emit_arith(p, op, array_lhs, array_rhs, array_type);
array.type = type;
return array;
}
}
GB_PANIC("TODO: lb_emit_arith_matrix");