simd [?] type fix; count recovery

src/check_expr.cpp

@@ -10688,7 +10688,25 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
 			if (count != nullptr) {
 				if (count->kind == Ast_UnaryExpr &&
 				    count->UnaryExpr.op.kind == Token_Question) {
-					type = alloc_type_array(check_type(c, type_expr->ArrayType.elem), -1);
+					Type *elem = check_type(c, type_expr->ArrayType.elem);
+
+					bool is_simd_tag = false;
+					if (type_expr->ArrayType.tag != nullptr) {
+						GB_ASSERT(type_expr->ArrayType.tag->kind == Ast_BasicDirective);
+						is_simd_tag = type_expr->ArrayType.tag->BasicDirective.name.string == "simd";
+					}
+					if (is_simd_tag) {
+						if (!is_type_valid_vector_elem(elem) && !is_type_polymorphic(elem)) {
+							gbString str = type_to_string(elem);
+							error(type_expr->ArrayType.elem, "Invalid element type for #simd, expected an integer, float, boolean, or 'rawptr' with no specific endianness, got '%s'", str);
+							gb_string_free(str);
+							type = alloc_type_array(elem, -1);
+						} else {
+							type = alloc_type_simd_vector(-1, elem);
+						}
+					} else {
+						type = alloc_type_array(elem, -1);
+					}
 					is_to_be_determined_array_count = true;
 				}
 			} else {
@@ -10912,7 +10930,9 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
 		} else if (t->kind == Type_SimdVector) {
 			elem_type = t->SimdVector.elem;
 			context_name = str_lit("simd vector literal");
-			max_type_count = t->SimdVector.count;
+			if (!is_to_be_determined_array_count) {
+				max_type_count = t->SimdVector.count;
+			}
 		} else if (t->kind == Type_Matrix) {
 			elem_type = t->Matrix.elem;
 			context_name = str_lit("matrix literal");
@@ -11088,6 +11108,16 @@ gb_internal ExprKind check_compound_literal(CheckerContext *c, Operand *o, Ast *
 					error(node, "Expected %lld values for this array literal, got %lld", cast(long long)t->Array.count, cast(long long)max);
 				}
 			}
+		} else if (t->kind == Type_SimdVector) {
+			// the length laws cannot be applied until the literal has supplied the count
+			if (is_to_be_determined_array_count) {
+				t->SimdVector.count = max;
+				if (max < 1 || !is_power_of_two(max)) {
+					error(node, "Invalid length for #simd, expected a power of two length, got '%lld'", cast(long long)max);
+				} else if (max > SIMD_ELEMENT_COUNT_MAX) {
+					error(node, "#simd support a maximum element count of %d, got %lld", SIMD_ELEMENT_COUNT_MAX, cast(long long)max);
+				}
+			}
 		} else if (t->kind == Type_Struct) {
 			GB_ASSERT(t->Struct.soa_kind == StructSoa_Fixed);
 			if (is_to_be_determined_array_count) {

src/check_type.cpp

@@ -3538,9 +3538,12 @@ gb_internal void check_array_type_internal(CheckerContext *ctx, Ast *e, Type **t
 			return;
 		}
 
+		// Track user input and recovery value seperate, since both could be '0'
+		bool count_recovered = false;
 		if (count < 0) {
 			error(at->count, "? can only be used in conjunction with compound literals");
 			count = 0;
+			count_recovered = true;
 		}
 
 
@@ -3562,7 +3565,12 @@ gb_internal void check_array_type_internal(CheckerContext *ctx, Ast *e, Type **t
 					// Ignore
 				} else if (count < 1 || !is_power_of_two(count)) {
 					*type = alloc_type_array(elem, count, generic_type);
-					if (ctx->disallow_polymorphic_return_types && count == 0) {
+					if (count_recovered) {
+						return;
+					}
+					// a polymorphic value used as the count is still unresolved while the
+					// signature is checked and reads as 0; only a written count is constant
+					if (ctx->disallow_polymorphic_return_types && o.mode != Addressing_Constant) {
 						return;
 					}
 					error(at->count, "Invalid length for #simd, expected a power of two length, got '%lld'", cast(long long)count);

tests/internal/test_simd_lane_counts.odin

@@ -0,0 +1,172 @@
+package test_internal
+
+import "base:intrinsics"
+import "core:simd"
+import "core:testing"
+
+// `simd_interleave` derives its lane count as operand width times argument count, so it is a
+// power of two only when the argument count is. The rejection of the rest cannot be asserted
+// from a test -- it is a compile error -- so what is pinned here is the other side: the widths
+// that must keep working, and the values they carry.
+
+@(test)
+simd_interleave_power_of_two_widths :: proc(t: ^testing.T) {
+	a: #simd[4]i32 = {1, 2, 3, 4}
+	b: #simd[4]i32 = {5, 6, 7, 8}
+	c: #simd[4]i32 = {9, 10, 11, 12}
+	d: #simd[4]i32 = {13, 14, 15, 16}
+
+	two := intrinsics.simd_interleave(a, b)
+	testing.expect_value(t, len(two), 8)
+	testing.expect_value(t, simd_extract_i32(two, 0), 1)
+	testing.expect_value(t, simd_extract_i32(two, 1), 5)
+	testing.expect_value(t, simd_extract_i32(two, 2), 2)
+	testing.expect_value(t, simd_extract_i32(two, 3), 6)
+
+	four := intrinsics.simd_interleave(a, b, c, d)
+	testing.expect_value(t, len(four), 16)
+	testing.expect_value(t, simd_extract_i32(four, 0), 1)
+	testing.expect_value(t, simd_extract_i32(four, 1), 5)
+	testing.expect_value(t, simd_extract_i32(four, 2), 9)
+	testing.expect_value(t, simd_extract_i32(four, 3), 13)
+
+	// a single argument is a power of two count as well, and must not be caught by the guard
+	one := intrinsics.simd_interleave(a)
+	testing.expect_value(t, len(one), 4)
+
+	x, y := intrinsics.simd_deinterleave(two, 2)
+	testing.expect_value(t, len(x), 4)
+	testing.expect_value(t, len(y), 4)
+	testing.expect_value(t, simd_extract_i32(x, 0), 1)
+	testing.expect_value(t, simd_extract_i32(y, 0), 5)
+}
+
+simd_extract_i32 :: #force_inline proc(v: $V/#simd[$N]i32, $I: int) -> i32 {
+	return intrinsics.simd_extract(v, I)
+}
+
+// `simd_shuffle` and `swizzle` size their result from the index list, which can be twice the
+// operand width, so both can construct a `#simd` wider than the syntax accepts. What is pinned
+// here is the boundary that must keep working: exactly SIMD_ELEMENT_COUNT_MAX lanes, and a
+// `swizzle` over a plain array, which is not bound by the `#simd` limit at all.
+
+@(test)
+simd_construction_at_the_element_count_max :: proc(t: ^testing.T) {
+	a: #simd[32]i32 = 1
+	at_max := intrinsics.simd_shuffle(a, a,
+		0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+		16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+		32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+		48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63)
+	testing.expect_value(t, len(at_max), 64)
+
+	b: #simd[8]i32 = {1, 2, 3, 4, 5, 6, 7, 8}
+	under := intrinsics.simd_shuffle(b, b, 0, 1, 2, 3, 8, 9, 10, 11)
+	testing.expect_value(t, len(under), 8)
+	testing.expect_value(t, simd_extract_i32(under, 4), 1)
+
+	sw := swizzle(b, 7, 6, 5, 4, 3, 2, 1, 0)
+	testing.expect_value(t, len(sw), 8)
+	testing.expect_value(t, simd_extract_i32(sw, 0), 8)
+
+	// a plain array is not a #simd vector, so the element-count limit must not reach it
+	arr: [96]i32
+	arr[95] = 7
+	asw := swizzle(arr, 95, 0, 1)
+	testing.expect_value(t, len(asw), 3)
+	testing.expect_value(t, asw[0], 7)
+
+	d, e: #simd[32]i32
+	ilv := intrinsics.simd_interleave(d, e)
+	testing.expect_value(t, len(ilv), 64)
+}
+
+// A swizzle may repeat indices to produce a result wider than its operand. `core:crypto`
+// depends on it -- chacha20's simd256 path doubles a 4-lane state with eight indices -- so
+// there is deliberately no upper bound on the index count.
+
+@(test)
+swizzle_may_widen_its_operand :: proc(t: ^testing.T) {
+	v: [2]f32 = {1, 2}
+	testing.expect_value(t, swizzle(v, 0, 0, 0, 0), [4]f32{1, 1, 1, 1})
+	testing.expect_value(t, swizzle(v, 0, 1, 0, 1), [4]f32{1, 2, 1, 2})
+
+	a: [3]i32 = {7, 8, 9}
+	testing.expect_value(t, swizzle(a, 2, 2, 2, 2, 2, 2), [6]i32{9, 9, 9, 9, 9, 9})
+
+	// the same shape on a #simd vector: four lanes widened to eight
+	q: #simd[4]u32 = {1, 2, 3, 4}
+	w := swizzle(q, 0, 1, 2, 3, 0, 1, 2, 3)
+	testing.expect_value(t, len(w), 8)
+	testing.expect_value(t, intrinsics.simd_extract(w, 4), u32(1))
+	testing.expect_value(t, intrinsics.simd_extract(w, 7), u32(4))
+}
+
+// A pairwise operation folds adjacent lanes within each operand, so it needs an even lane
+// count -- `base:intrinsics` declares `LANES % 2 == 0`. At one lane it has nothing to pair
+// with and silently switches to combining the two operands instead, which is why that width
+// is rejected rather than defined.
+
+@(test)
+simd_pairwise_folds_adjacent_lanes :: proc(t: ^testing.T) {
+	a: #simd[2]i32 = {10, 3}
+	b: #simd[2]i32 = {20, 4}
+
+	add := intrinsics.simd_pairwise_add(a, b)
+	testing.expect_value(t, intrinsics.simd_extract(add, 0), i32(13))
+	testing.expect_value(t, intrinsics.simd_extract(add, 1), i32(24))
+
+	sub := intrinsics.simd_pairwise_sub(a, b)
+	testing.expect_value(t, intrinsics.simd_extract(sub, 0), i32(7))
+	testing.expect_value(t, intrinsics.simd_extract(sub, 1), i32(16))
+
+	c: #simd[4]f32 = {1, 2, 3, 4}
+	d: #simd[4]f32 = {5, 6, 7, 8}
+	f := intrinsics.simd_pairwise_add(c, d)
+	testing.expect_value(t, intrinsics.simd_extract(f, 0), f32(3))
+	testing.expect_value(t, intrinsics.simd_extract(f, 1), f32(7))
+
+	// the other six builtins sharing this arm take a single lane, and must stay unaffected
+	o: #simd[1]i32 = 7
+	p: #simd[1]i32 = 2
+	testing.expect_value(t, intrinsics.simd_extract(intrinsics.simd_add(o, p), 0), i32(9))
+	testing.expect_value(t, intrinsics.simd_extract(intrinsics.simd_max(o, p), 0), i32(7))
+}
+
+// `#simd[?]T{...}`  The inferred form must agree with the explicit one.
+
+@(test)
+simd_inferred_length_from_a_compound_literal :: proc(t: ^testing.T) {
+	a := #simd[?]i32{1, 2, 3, 4}
+	testing.expect_value(t, len(a), 4)
+	testing.expect_value(t, intrinsics.type_is_simd_vector(type_of(a)), true)
+	testing.expect_value(t, typeid_of(type_of(a)), typeid_of(#simd[4]i32))
+	testing.expect_value(t, intrinsics.simd_extract(a, 0), i32(1))
+	testing.expect_value(t, intrinsics.simd_extract(a, 3), i32(4))
+
+	b := #simd[?]f32{1.5, 2.5}
+	testing.expect_value(t, len(b), 2)
+	testing.expect_value(t, typeid_of(type_of(b)), typeid_of(#simd[2]f32))
+	testing.expect_value(t, intrinsics.simd_extract(b, 1), f32(2.5))
+
+	// the inferred vector must work with the intrinsics, which is the point of the tag
+	testing.expect_value(t, intrinsics.simd_extract(intrinsics.simd_add(a, a), 3), i32(8))
+
+	// a plain `[?]` array is unaffected
+	c := [?]i32{1, 2, 3}
+	testing.expect_value(t, len(c), 3)
+	testing.expect_value(t, intrinsics.type_is_array(type_of(c)), true)
+}
+
+// `core:simd` aliased `pairwise_sub` to `simd_pairwise_add`, so it silently added
+@(test)
+simd_pairwise_aliases_are_distinct :: proc(t: ^testing.T) {
+	a: #simd[2]i32 = {10, 3}
+	b: #simd[2]i32 = {20, 4}
+
+	add := simd.pairwise_add(a, b)
+	sub := simd.pairwise_sub(a, b)
+	testing.expect_value(t, intrinsics.simd_extract(add, 0), i32(13))
+	testing.expect_value(t, intrinsics.simd_extract(sub, 0), i32(7))
+	testing.expect_value(t, intrinsics.simd_extract(sub, 1), i32(16))
+}