diff --git a/tests/matmul/bias/test_bias_c2_buffer.cpp b/tests/matmul/bias/test_bias_c2_buffer.cpp index 7b47de1a04757616fc40c7b9e7d3938680605d7d..a8de6dcba793e3cdb9a0e94eeb418e0557e5a3fa 100644 --- a/tests/matmul/bias/test_bias_c2_buffer.cpp +++ b/tests/matmul/bias/test_bias_c2_buffer.cpp @@ -54,9 +54,14 @@ public: public: MatmulImpl() { + SetGCoreType(1); InitVar(); } + ~MatmulImpl() { + SetGCoreType(0); + } + VAR_PARAMS& GetVar() { return var; } @@ -66,6 +71,10 @@ public: var.tpipe_ = &pipe; } + void DestroyTPipe() { + pipe.Destroy(); + } + private: TCubeTiling tiling; TPipe pipe; @@ -84,6 +93,7 @@ protected: mm.EnQue(); mm.DeQue(); mm.Free(); + mm.DestroyTPipe(); } private: diff --git a/tests/matmul/load_buffer/test_matmul_tbufpool_l0.cpp b/tests/matmul/load_buffer/test_matmul_tbufpool_l0.cpp index a421a1943ad3631ca30d0a5da315a9b5b4e2e388..dc6b3ff1597967f9f158bc75ff567b86f912c2c4 100644 --- a/tests/matmul/load_buffer/test_matmul_tbufpool_l0.cpp +++ b/tests/matmul/load_buffer/test_matmul_tbufpool_l0.cpp @@ -53,7 +53,10 @@ public: using IMPL = MatmulImpl; MATMUL_USE_MODULE(LoadToA2); MATMUL_USE_MODULE(LoadToB2); - MatmulImpl() {}; + MatmulImpl() { + pipe = *GetTPipePtr(); + } + TPipe pipe; void InitA(bool isATranspose, uint16_t aL1K, uint16_t aL1M) @@ -84,22 +87,22 @@ public: class test_matmul_tbufpool_l0 : public testing::Test { protected: - void SetUp() {} - void TearDown() {} - -private: - using L0cT = float; + void SetUp() { + SetGCoreType(1); + } + void TearDown() { + SetGCoreType(0); + } +}; +TEST_F(test_matmul_tbufpool_l0, case0) { + // input: M : 16, K : 16, N : 16, isATrans : false, isBTrans : false using A_TYPE = MatmulType; using B_TYPE = MatmulType; - using C_TYPE = MatmulType; + using C_TYPE = MatmulType; using BIAS_TYPE = MatmulType; MatmulImpl mm; -}; - -TEST_F(test_matmul_tbufpool_l0, case0) { - // input: M : 16, K : 16, N : 16, isATrans : false, isBTrans : false TCubeTiling tiling; mm.SetTiling(&tiling); mm.InitA(false, 16, 16); @@ -116,7 +119,7 @@ TEST_F(test_matmul_tbufpool_l0, case0) { mm.pipe.InitBuffer(l1bBuf, 65536); auto l1b = l1bBuf.Get(); mm.LoadA(l0a, l1a, 16, 16, 16, 16, 0, 0, false); - mm.LoadB(l0b, l1b, 0, 0, 16, 16, 0, 0, false); + mm.LoadB(l0b, l1b, 16, 16, 16, 16, 0, 0, false); bufferPool.EnQue(); bufferPool.DeQue(); TBuf co1BUf; @@ -128,6 +131,12 @@ TEST_F(test_matmul_tbufpool_l0, case0) { TEST_F(test_matmul_tbufpool_l0, case1) { // input: M : 16, K : 32, N : 64, isATrans : true, isBTrans : true + using A_TYPE = MatmulType; + using B_TYPE = MatmulType; + using C_TYPE = MatmulType; + using BIAS_TYPE = MatmulType; + + MatmulImpl mm; TCubeTiling tiling; mm.SetTiling(&tiling); mm.InitA(true, 32, 16); diff --git a/tests/matmul/scheduler/bias_scheduler/test_bias_scheduler_v220.cpp b/tests/matmul/scheduler/bias_scheduler/test_bias_scheduler_v220.cpp index eac35ad44512a1497fe1260d6fb3a87c38ae7893..432ea7e2001867ff97536ef73378c5b2023ec21b 100644 --- a/tests/matmul/scheduler/bias_scheduler/test_bias_scheduler_v220.cpp +++ b/tests/matmul/scheduler/bias_scheduler/test_bias_scheduler_v220.cpp @@ -68,7 +68,13 @@ public: MATMUL_USE_MODULE(NLoop); MATMUL_USE_MODULE(KLoop); MATMUL_USE_MODULE(MatmulShapeTiling); - MatmulImpl() {} + MatmulImpl() { + SetGCoreType(1); + } + + ~MatmulImpl() { + SetGCoreType(0); + } VAR_PARAMS& GetVar() { return var; @@ -117,6 +123,7 @@ public: } } MATMUL_MODULE(BiasScheduler)->End(); + pipe.Destroy(); } private: diff --git a/tests/matmul/scheduler/test_scheduler_intrablock.cpp b/tests/matmul/scheduler/test_scheduler_intrablock.cpp index d14a1890c64a5ae35aab0aebbdb48743518fbd1e..b662a500707360701d60e5f895ad9ea9d188a525 100644 --- a/tests/matmul/scheduler/test_scheduler_intrablock.cpp +++ b/tests/matmul/scheduler/test_scheduler_intrablock.cpp @@ -144,30 +144,20 @@ private: class TestSchedulerIntrablock : public testing::Test { protected: - void SetUp() {} - void TearDown() {} + void SetUp() { + SetGCoreType(1); + } + void TearDown() { + SetGCoreType(0); + } +}; -private: +TEST_F(TestSchedulerIntrablock, ScheduleOnce_FakeIntra) { using A_TYPE = MatmulType; using B_TYPE = MatmulType; using C_TYPE = MatmulType; using BIAS_TYPE = MatmulType; MatmulImpl, CustomMatmulPolicy> mm; - - constexpr static MatmulConfigMode configMode = MatmulConfigMode::CONFIG_NORM; - constexpr static MatmulShapeParams shapeParams = {32, 32, 32, 32, 32, 32}; - constexpr static MatmulQuantParams quantParams = {false, false}; - constexpr static MatmulBatchParams batchParams = {false, BatchMode::NONE}; - // Define statictiling mm obj - constexpr static MatmulFuncParams funcParams{false, false, false, false, 0, IterateOrder::UNDEF, - ScheduleType::INNER_PRODUCT, true, true}; - constexpr static MatmulConfig mmStaticConfig = GetMMConfig(shapeParams, quantParams, batchParams, funcParams); - constexpr static MatmulApiStaticTiling staticTiling = - GetMatmulApiTiling(mmStaticConfig); - MatmulImpl, CustomMatmulPolicy> mm2; -}; - -TEST_F(TestSchedulerIntrablock, ScheduleOnce_FakeIntra) { // coreNum, M, N, K, singleCoreM, singleCoreN, singleCoreK, baseM, baseN, baseK, depthA1, depthB1, stepM, stepN, stepKa, stepKb, isBias, iterateOrder TilingParams tilingParams = {1, 64, 64, 64, 64, 64, 64, 32, 32, 32, 2, 2, 1, 1, 2, 2, 1, 0}; TCubeTiling tiling; @@ -179,6 +169,11 @@ TEST_F(TestSchedulerIntrablock, ScheduleOnce_FakeIntra) { } TEST_F(TestSchedulerIntrablock, ScheduleOnce_RealIntra) { + using A_TYPE = MatmulType; + using B_TYPE = MatmulType; + using C_TYPE = MatmulType; + using BIAS_TYPE = MatmulType; + MatmulImpl, CustomMatmulPolicy> mm; // coreNum, M, N, K, singleCoreM, singleCoreN, singleCoreK, baseM, baseN, baseK, depthA1, depthB1, stepM, stepN, stepKa, stepKb, isBias, iterateOrder TilingParams tilingParams = {1, 64, 64, 64, 64, 64, 64, 32, 32, 32, 2, 2, 1, 1, 2, 2, 1, 0}; TCubeTiling tiling; diff --git a/tests/matmul/test_matmul_l0db.cpp b/tests/matmul/test_matmul_l0db.cpp index a97f1eff8ee2f491bb462aba4cacadf4312f474a..5efd545d516e9426aaef8d8c138836a7a11ffebc 100644 --- a/tests/matmul/test_matmul_l0db.cpp +++ b/tests/matmul/test_matmul_l0db.cpp @@ -228,8 +228,12 @@ __aicore__ inline void main_kernel_matmul_l0db(GM_ADDR aGM, GM_ADDR bGM, GM_ADDR class TEST_KERNEL_MATMUL_L0DB : public testing::Test { protected: - void SetUp() {} - void TearDown() {} + void SetUp() { + SetGCoreType(1); + } + void TearDown() { + SetGCoreType(0); + } }; #define KERNEL_MATMUL_TESTCASE(TEST_KERNEL_MATMUL_L0DB, tilingParams, A_Pos, B_Pos, C_Pos, BIAS_Pos, A_Format, B_Format, C_Format, BIAS_Format, \ diff --git a/tests/matmul/test_operator_matmul_v220.cpp b/tests/matmul/test_operator_matmul_v220.cpp index e10d79f25f4cb50f2b77a1b746c5f8ab606f05d8..275c214d63ab8b19ae049c05baf03ef533a0677b 100644 --- a/tests/matmul/test_operator_matmul_v220.cpp +++ b/tests/matmul/test_operator_matmul_v220.cpp @@ -487,8 +487,12 @@ __aicore__ inline void main_kernel_matmul_for_L0cBufferExtend(GM_ADDR aGM, GM_AD class TEST_KERNEL_MATMUL : public testing::Test { protected: - void SetUp() {} - void TearDown() {} + void SetUp() { + SetGCoreType(1); + } + void TearDown() { + SetGCoreType(0); + } }; #define KERNEL_MATMUL_TESTCASE(TEST_KERNEL_MATMUL, tilingParams, A_Pos, B_Pos, C_Pos, BIAS_Pos, A_Format, B_Format, C_Format, BIAS_Format, \ diff --git a/tests/matmul/test_operator_matmul_v220_batch.cpp b/tests/matmul/test_operator_matmul_v220_batch.cpp index e5e22f02b14ff5ba16ed689d7bffa038f9d99113..0b67c55ca5e031b4ab770d385efb358cd7e989ee 100644 --- a/tests/matmul/test_operator_matmul_v220_batch.cpp +++ b/tests/matmul/test_operator_matmul_v220_batch.cpp @@ -61,7 +61,6 @@ __aicore__ inline void main_kernel_matmul_batch(GM_ADDR aGM, GM_ADDR bGM, GM_ADD using BiasT = typename BIAS_TYPE::T; SetAtomicNone(); - TPipe que; TCubeTiling tiling; tilingParam.GetTiling(tiling); @@ -116,7 +115,7 @@ __aicore__ inline void main_kernel_matmul_batch(GM_ADDR aGM, GM_ADDR bGM, GM_ADD g_tPipePtr = &pipe; #endif - mm1.Init(&tiling, &que); + mm1.Init(&tiling, &pipe); int g_lay = tiling.ALayoutInfoG > tiling.BLayoutInfoG ? tiling.ALayoutInfoG : tiling.BLayoutInfoG; int for_exent = tiling.ALayoutInfoB * tiling.ALayoutInfoN * g_lay / batchC; for(int i=0; i