diff --git a/test/tests/matmul_clamp_f32_bf16p_bf16p_test.cpp b/test/tests/matmul_clamp_f32_bf16p_bf16p_test.cpp index 7d9df33e01e4397151614036969286768222777f..7d2693d4b85eed882ff1fa7d2faa6abe26016303 100644 --- a/test/tests/matmul_clamp_f32_bf16p_bf16p_test.cpp +++ b/test/tests/matmul_clamp_f32_bf16p_bf16p_test.cpp @@ -343,7 +343,6 @@ std::map MatMulTestBf16::_ /// Tests the output. TEST_P(MatMulTestBf16, Output) { const auto& [method, info, portion] = GetParam(); - const auto& data = test_data(); if (method.fn_is_supported && !method.fn_is_supported()) { GTEST_SKIP(); @@ -353,6 +352,7 @@ TEST_P(MatMulTestBf16, Output) { GTEST_SKIP(); } + const auto& data = test_data(); const auto m_step = method.fn_get_main_m_step(); ASSERT_TRUE(m_step % method.m0 == 0); diff --git a/test/tests/matmul_test.cpp b/test/tests/matmul_test.cpp index 7a0b63afa5eaaeaaf55d8893f4df2a047e4d092c..0236b8ae00cde3bb60f01440dc073d36121b6d5f 100644 --- a/test/tests/matmul_test.cpp +++ b/test/tests/matmul_test.cpp @@ -321,7 +321,6 @@ std::map MatMulTest::_data; /// Tests the LHS packing kernel. TEST_P(MatMulTest, PackedLhs) { const auto& [method, info, portion] = GetParam(); - const auto& data = test_data(); if (method.fn_is_supported && !method.fn_is_supported()) { GTEST_SKIP(); @@ -331,6 +330,7 @@ TEST_P(MatMulTest, PackedLhs) { GTEST_SKIP(); } + const auto& data = test_data(); const auto lhs_h = info.m; const auto lhs_w = info.k; @@ -374,7 +374,6 @@ TEST_P(MatMulTest, PackedLhs) { /// Tests the RHS packing kernel. TEST_P(MatMulTest, PackedRhs) { const auto& [method, info, portion] = GetParam(); - const auto& data = test_data(); if (method.fn_is_supported && !method.fn_is_supported()) { GTEST_SKIP(); @@ -384,6 +383,7 @@ TEST_P(MatMulTest, PackedRhs) { GTEST_SKIP(); } + const auto& data = test_data(); const auto rhs_full_width = info.n; const auto rhs_full_height = info.k; @@ -446,7 +446,6 @@ TEST_P(MatMulTest, PackedRhs) { /// Tests the transposed RHS packing kernel. TEST_P(MatMulTest, PackedTransposedRhs) { const auto& [method, info, portion] = GetParam(); - const auto& data = test_data(); if (method.fn_is_supported && !method.fn_is_supported()) { GTEST_SKIP(); @@ -456,6 +455,7 @@ TEST_P(MatMulTest, PackedTransposedRhs) { GTEST_SKIP(); } + const auto& data = test_data(); const auto n_step = method.fn_pack_rhs_nxk_get_n_step(); const auto ref_n_step = method.packed_rhs_format.scheduler_block_height(info.n); ASSERT_EQ(n_step, ref_n_step); @@ -508,7 +508,6 @@ TEST_P(MatMulTest, PackedTransposedRhs) { /// Tests the output. TEST_P(MatMulTest, Output) { const auto& [method, info, portion] = GetParam(); - const auto& data = test_data(); if (method.fn_is_supported && !method.fn_is_supported()) { GTEST_SKIP(); @@ -518,6 +517,7 @@ TEST_P(MatMulTest, Output) { GTEST_SKIP(); } + const auto& data = test_data(); const auto m_step = method.fn_get_main_m_step(); ASSERT_EQ(m_step, method.m0);