ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-03 22:28:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow booleans for #simd

Browse Source
This commit is contained in:
gingerBill
2022-05-25 22:16:44 +01:00
parent 63d6c08d90
commit 808ea30b48
3 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/check_builtin.cpp
+46 -33
View File
@@ -447,7 +447,7 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
Type *elem = base_array_type(x.type); Type *elem = base_array_type(x.type);
if (!is_type_integer(elem) && !is_type_float(elem)) { if (!is_type_integer(elem) && !is_type_float(elem)) {
gbString xs = type_to_string(x.type); gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer or floating-point element, got '%s'", LIT(builtin_name), xs); error(x.expr, "'%.*s' expected a #simd type with an integer or floating point element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs); gb_string_free(xs);
return false; return false;
} }
@@ -485,11 +485,21 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
return false; return false;
} }
Type *elem = base_array_type(x.type); Type *elem = base_array_type(x.type);
if (!is_type_integer(elem)) {
gbString xs = type_to_string(x.type); if (id == BuiltinProc_simd_rem) {
error(x.expr, "'%.*s' expected a #simd type with an integer element, got '%s'", LIT(builtin_name), xs); if (!is_type_integer(elem)) {
gb_string_free(xs); gbString xs = type_to_string(x.type);
return false; error(x.expr, "'%.*s' expected a #simd type with an integer element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs);
return false;
}
} else {
if (!is_type_integer(elem) && !is_type_boolean(elem)) {
gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer or boolean element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs);
return false;
}
} }
operand->mode = Addressing_Value; operand->mode = Addressing_Value;
@@ -497,10 +507,10 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
return true; return true;
} }
case BuiltinProc_simd_shl: case BuiltinProc_simd_shl: // Odin-like
case BuiltinProc_simd_shr: case BuiltinProc_simd_shr: // Odin-like
case BuiltinProc_simd_shl_masked: case BuiltinProc_simd_shl_masked: // C-like
case BuiltinProc_simd_shr_masked: case BuiltinProc_simd_shr_masked: // C-like
{ {
Operand x = {}; Operand x = {};
Operand y = {}; Operand y = {};
@@ -561,7 +571,7 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
Type *elem = base_array_type(x.type); Type *elem = base_array_type(x.type);
if (!is_type_integer(elem) && !is_type_float(elem)) { if (!is_type_integer(elem) && !is_type_float(elem)) {
gbString xs = type_to_string(x.type); gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer or floating-point element, got '%s'", LIT(builtin_name), xs); error(x.expr, "'%.*s' expected a #simd type with an integer or floating point element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs); gb_string_free(xs);
return false; return false;
} }
@@ -592,12 +602,27 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
return false; return false;
} }
Type *elem = base_array_type(x.type); Type *elem = base_array_type(x.type);
if (!is_type_integer(elem) && !is_type_float(elem)) { switch (id) {
gbString xs = type_to_string(x.type); case BuiltinProc_simd_eq:
error(x.expr, "'%.*s' expected a #simd type with an integer or floating-point element, got '%s'", LIT(builtin_name), xs); case BuiltinProc_simd_ne:
gb_string_free(xs); if (!is_type_integer(elem) && !is_type_float(elem) && !is_type_boolean(elem)) {
return false; gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer, floating point, or boolean element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs);
return false;
}
break;
default:
if (!is_type_integer(elem) && !is_type_float(elem)) {
gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer or floating point element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs);
return false;
}
break;
} }
Type *vt = base_type(x.type); Type *vt = base_type(x.type);
GB_ASSERT(vt->kind == Type_SimdVector); GB_ASSERT(vt->kind == Type_SimdVector);
i64 count = vt->SimdVector.count; i64 count = vt->SimdVector.count;
@@ -630,12 +655,6 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
return false; return false;
} }
Type *elem = base_array_type(x.type); Type *elem = base_array_type(x.type);
if (!is_type_integer(elem) && !is_type_float(elem)) {
gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer or floating-point element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs);
return false;
}
i64 max_count = x.type->SimdVector.count; i64 max_count = x.type->SimdVector.count;
i64 value = -1; i64 value = -1;
if (!check_index_value(c, x.type, false, ce->args[1], max_count, &value)) { if (!check_index_value(c, x.type, false, ce->args[1], max_count, &value)) {
@@ -661,12 +680,6 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
return false; return false;
} }
Type *elem = base_array_type(x.type); Type *elem = base_array_type(x.type);
if (!is_type_integer(elem) && !is_type_float(elem)) {
gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer or floating-point element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs);
return false;
}
i64 max_count = x.type->SimdVector.count; i64 max_count = x.type->SimdVector.count;
i64 value = -1; i64 value = -1;
if (!check_index_value(c, x.type, false, ce->args[1], max_count, &value)) { if (!check_index_value(c, x.type, false, ce->args[1], max_count, &value)) {
@@ -710,7 +723,7 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
Type *elem = base_array_type(x.type); Type *elem = base_array_type(x.type);
if (!is_type_integer(elem) && !is_type_float(elem)) { if (!is_type_integer(elem) && !is_type_float(elem)) {
gbString xs = type_to_string(x.type); gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer or floating-point element, got '%s'", LIT(builtin_name), xs); error(x.expr, "'%.*s' expected a #simd type with an integer or floating point element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs); gb_string_free(xs);
return false; return false;
} }
@@ -732,9 +745,9 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
return false; return false;
} }
Type *elem = base_array_type(x.type); Type *elem = base_array_type(x.type);
if (!is_type_integer(elem)) { if (!is_type_integer(elem) && !is_type_boolean(elem)) {
gbString xs = type_to_string(x.type); gbString xs = type_to_string(x.type);
error(x.expr, "'%.*s' expected a #simd type with an integer element, got '%s'", LIT(builtin_name), xs); error(x.expr, "'%.*s' expected a #simd type with an integer or boolean element, got '%s'", LIT(builtin_name), xs);
gb_string_free(xs); gb_string_free(xs);
return false; return false;
} }
@@ -757,7 +770,7 @@ bool check_builtin_simd_operation(CheckerContext *c, Operand *operand, Ast *call
// Type *elem = base_array_type(x.type); // Type *elem = base_array_type(x.type);
// if (!is_type_integer(elem) && !is_type_float(elem)) { // if (!is_type_integer(elem) && !is_type_float(elem)) {
// gbString xs = type_to_string(x.type); // gbString xs = type_to_string(x.type);
// error(x.expr, "'%.*s' expected a #simd type with an integer or floating-point element, got '%s'", LIT(builtin_name), xs); // error(x.expr, "'%.*s' expected a #simd type with an integer or floating point element, got '%s'", LIT(builtin_name), xs);
// gb_string_free(xs); // gb_string_free(xs);
// return false; // return false;
// } // }
@@ -3102,7 +3115,7 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
Type *elem = y.type; Type *elem = y.type;
if (!is_type_valid_vector_elem(elem)) { if (!is_type_valid_vector_elem(elem)) {
gbString str = type_to_string(elem); gbString str = type_to_string(elem);
error(call, "Invalid element type for 'intrinsics.simd_vector', expected an integer or float with no specific endianness, got '%s'", str); error(call, "Invalid element type for 'intrinsics.simd_vector', expected an integer, float, or boolean with no specific endianness, got '%s'", str);
gb_string_free(str); gb_string_free(str);
operand->mode = Addressing_Type; operand->mode = Addressing_Type;
operand->type = t_invalid; operand->type = t_invalid;
src/check_type.cpp
+1 -1
View File
@@ -2797,7 +2797,7 @@ bool check_type_internal(CheckerContext *ctx, Ast *e, Type **type, Type *named_t
} else if (name == "simd") { } else if (name == "simd") {
if (!is_type_valid_vector_elem(elem) && !is_type_polymorphic(elem)) { if (!is_type_valid_vector_elem(elem) && !is_type_polymorphic(elem)) {
gbString str = type_to_string(elem); gbString str = type_to_string(elem);
error(at->elem, "Invalid element type for 'intrinsics.simd_vector', expected an integer or float with no specific endianness, got '%s'", str); error(at->elem, "Invalid element type for 'intrinsics.simd_vector', expected an integer, float, or boolean with no specific endianness, got '%s'", str);
gb_string_free(str); gb_string_free(str);
*type = alloc_type_array(elem, count, generic_type); *type = alloc_type_array(elem, count, generic_type);
goto array_end; goto array_end;
src/types.cpp
+3
View File
@@ -1939,6 +1939,9 @@ bool is_type_valid_vector_elem(Type *t) {
if (is_type_float(t)) { if (is_type_float(t)) {
return true; return true;
} }
if (is_type_boolean(t)) {
return true;
}
} }
return false; return false;
} }