From 3b64e3e78c166773fea680afb4829d886e90552d Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 28 Jul 2020 09:01:28 +0100 Subject: COMPMID-3653 CL GEMM kernel creation error on certain combinations of N and N0 * Fix invalid use of vstore_partial_1 * Add configuration tests to catch this error case Signed-off-by: SiCong Li Change-Id: I25a2b16a530992acc869a4335c48a8fffa420850 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3628 Tested-by: Arm Jenkins Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp') diff --git a/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp b/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp index c87d309ada..6a1d495576 100644 --- a/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp +++ b/tests/validation/CL/GEMMMatrixMultiplyReshapedOnlyRHS.cpp @@ -309,13 +309,14 @@ b_value, m0_value, n0_value, k0_value, broadcast_bias, input_as_3d, depth_output * - Partial blocks in x dimension * - Partial blocks in y dimension * - Partial blocks in both x and y dimensions + * - Special case: partial_n0 == 9 (vstore1 should be invoked instead of vstore_partial_1) */ DATA_TEST_CASE(ValidateZeroPadding, framework::DatasetMode::ALL, zip(zip(zip(zip( -framework::dataset::make("M", { 24, 64, 101, 1 }), -framework::dataset::make("N", { 48, 29, 16, 122 })), -framework::dataset::make("M0", { 4, 8, 7, 2 })), -framework::dataset::make("N0", { 4, 4, 16, 3 })), -framework::dataset::make("export_to_cl_image", { false, true, true, false })), +framework::dataset::make("M", { 24, 64, 101, 1, 100 }), +framework::dataset::make("N", { 48, 29, 16, 122, 41 })), +framework::dataset::make("M0", { 4, 8, 7, 2, 1 })), +framework::dataset::make("N0", { 4, 4, 16, 3, 16 })), +framework::dataset::make("export_to_cl_image", { false, true, true, false, false })), m_value, n_value, m0_value, n0_value, export_to_cl_image) { constexpr DataType dt = DataType::F32; -- cgit v1.2.1