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/GEMMMatrixMultiplyNative.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/validation/CL/GEMMMatrixMultiplyNative.cpp') diff --git a/tests/validation/CL/GEMMMatrixMultiplyNative.cpp b/tests/validation/CL/GEMMMatrixMultiplyNative.cpp index b474ea3262..cdcc1a48f0 100644 --- a/tests/validation/CL/GEMMMatrixMultiplyNative.cpp +++ b/tests/validation/CL/GEMMMatrixMultiplyNative.cpp @@ -244,12 +244,13 @@ m_value, n_value, k_value, b_value, m0_value, n0_value, k0_value, broadcast_bias * - Partial blocks in y dimension * - Partial blocks in both x and y dimensions * - No blocks in both x and y dimensions, scalar store (N0==1) + * - Special case: partial_n0 == 5 (vstore1 should be invoked instead of vstore_partial_1) */ DATA_TEST_CASE(ValidateZeroPadding, framework::DatasetMode::ALL, zip(zip(zip( -framework::dataset::make("M", { 24, 64, 101, 1, 50 }), -framework::dataset::make("N", { 48, 29, 16, 122, 20 })), -framework::dataset::make("M0", { 4, 8, 7, 2, 1 })), -framework::dataset::make("N0", { 4, 4, 16, 3, 1 })), +framework::dataset::make("M", { 24, 64, 101, 1, 50, 256, }), +framework::dataset::make("N", { 48, 29, 16, 122, 20, 21, })), +framework::dataset::make("M0", { 4, 8, 7, 2, 1, 8, })), +framework::dataset::make("N0", { 4, 4, 16, 3, 1, 8, })), m_value, n_value, m0_value, n0_value) { bool status = validate_zero_padding(m_value, n_value, 23, 1, m0_value, n0_value, 4, false, DataType::F32, ActivationLayerInfo()); -- cgit v1.2.1