Merged
fix: 清理 Math 独立实现路径的未使用 workspace #6711
fix: 清理 Math 独立实现路径的未使用 workspace #6711
Merged
zhang-song-ruiAdd on 12 days ago
Total: 10 files changed+27-41
@@ -32,7 +32,7 @@ static constexpr uint64_t INDEX_0 = 0;
32static constexpr uint64_t INDEX_1 = 1;32static constexpr uint64_t INDEX_1 = 1;
33static constexpr uint64_t INDEX_2 = 2;33static constexpr uint64_t INDEX_2 = 2;
34static constexpr uint64_t INDEX_3 = 3;34static constexpr uint64_t INDEX_3 = 3;
35-static constexpr uint64_t WORKSPACE_SIZE = 32;35+static constexpr uint64_t WORKSPACE_SIZE = 0;
36 36 
37ge::graphStatus LerpTiling::GetPlatformInfo()37ge::graphStatus LerpTiling::GetPlatformInfo()
38{38{
@@ -45,7 +45,7 @@ TEST_F(LerpTiling, lerp_test_0)
45 string expectTilingData = "1 512 1 64 1 3 0 1 16384 1 1 1 0 0 0 0 0 1 4 1 0 0 0 0 0 64 4 8 0 0 0 0 0 64 4 8 0 0 0 "45 string expectTilingData = "1 512 1 64 1 3 0 1 16384 1 1 1 0 0 0 0 0 1 4 1 0 0 0 0 0 64 4 8 0 0 0 0 0 64 4 8 0 0 0 "
46 "0 0 0 "46 "0 0 0 "
47 "0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 32 8 1 0 0 0 0 0 32 8 1 0 0 0 0 0 ";47 "0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 32 8 1 0 0 0 0 0 32 8 1 0 0 0 0 0 ";
48- std::vector<size_t> expectWorkspaces = {32};48+ std::vector<size_t> expectWorkspaces = {0};
49 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);49 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
50}50}
51 51 
@@ -67,7 +67,7 @@ TEST_F(LerpTiling, lerp_test_1)
67 string expectTilingData = "2 1 8 1 2 8 1 72 16384 9 1 1 7 1 9 1 1 1 8 1 1 1 9 6 1 9 8 7 7 2 1 6 2 9 8 7 7 2 9 6 2 "67 string expectTilingData = "2 1 8 1 2 8 1 72 16384 9 1 1 7 1 9 1 1 1 8 1 1 1 9 6 1 9 8 7 7 2 1 6 2 9 8 7 7 2 9 6 2 "
68 "63 0 0 "68 "63 0 0 "
69 "9 0 1 0 0 0 54 0 0 0 6 1 0 9408 1176 168 24 12 0 2 1 84672 10584 1512 216 108 12 2 1 ";69 "9 0 1 0 0 0 54 0 0 0 6 1 0 9408 1176 168 24 12 0 2 1 84672 10584 1512 216 108 12 2 1 ";
70- std::vector<size_t> expectWorkspaces = {32};70+ std::vector<size_t> expectWorkspaces = {0};
71 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);71 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
72}72}
73 73 
@@ -89,7 +89,7 @@ TEST_F(LerpTiling, lerp_test_2)
89 string expectTilingData = "3 2 7 2 2 4 1 140 8192 1 1 1 1 0 0 0 0 20 14 320 11 0 0 0 0 1 14 1 11 0 0 0 0 20 14 320 "89 string expectTilingData = "3 2 7 2 2 4 1 140 8192 1 1 1 1 0 0 0 0 20 14 320 11 0 0 0 0 1 14 1 11 0 0 0 0 20 14 320 "
90 "11 0 "90 "11 0 "
91 "0 0 0 0 0 0 0 0 0 0 0 49280 3520 11 1 0 0 0 0 0 11 0 1 0 0 0 0 49280 3520 11 1 0 0 0 0 ";91 "0 0 0 0 0 0 0 0 0 0 0 49280 3520 11 1 0 0 0 0 0 11 0 1 0 0 0 0 49280 3520 11 1 0 0 0 0 ";
92- std::vector<size_t> expectWorkspaces = {32};92+ std::vector<size_t> expectWorkspaces = {0};
93 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);93 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
94}94}
95 95 
@@ -111,7 +111,7 @@ TEST_F(LerpTiling, lerp_test_3)
111 string expectTilingData = "1 1 17 1 1 6 0 17 8192 1 13 2 1 1 2 0 0 17 13 2 6 16 2 0 0 1 13 1 1 16 1 0 0 17 13 2 6 "111 string expectTilingData = "1 1 17 1 1 6 0 17 8192 1 13 2 1 1 2 0 0 17 13 2 6 16 2 0 0 1 13 1 1 16 1 0 0 17 13 2 6 "
112 "16 2 0 "112 "16 2 0 "
113 "0 0 4 2 0 0 1 0 0 4992 384 192 32 2 1 0 0 0 16 0 0 1 0 0 0 4992 384 192 32 2 1 0 0 ";113 "0 0 4 2 0 0 1 0 0 4992 384 192 32 2 1 0 0 0 16 0 0 1 0 0 0 4992 384 192 32 2 1 0 0 ";
114- std::vector<size_t> expectWorkspaces = {32};114+ std::vector<size_t> expectWorkspaces = {0};
115 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);115 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
116}116}
117 117 
@@ -132,7 +132,7 @@ TEST_F(LerpTiling, lerp_test_4)
132 string expectTilingData = "1 16384 1 7 1 1 0 1 16384 7 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 7 0 0 0 0 0 0 "132 string expectTilingData = "1 16384 1 7 1 1 0 1 16384 7 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 7 0 0 0 0 0 0 "
133 "0 1 0 "133 "0 1 0 "
134 "0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 ";134 "0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 ";
135- std::vector<size_t> expectWorkspaces = {32};135+ std::vector<size_t> expectWorkspaces = {0};
136 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);136 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
137}137}
138 138 
@@ -154,7 +154,7 @@ TEST_F(LerpTiling, lerp_test_5)
154 string154 string
155 expectTilingData = "1 2 7 1 1 6 0 7 16384 1 9 6 1 7 10 0 0 1 1 6 2 7 1 0 0 13 9 6 2 7 10 0 0 13 9 6 2 7 10 0 0 "155 expectTilingData = "1 2 7 1 1 6 0 7 16384 1 9 6 1 7 10 0 0 1 1 6 2 7 1 0 0 13 9 6 2 7 10 0 0 13 9 6 2 7 10 0 0 "
156 "0 420 70 0 10 1 0 0 0 0 14 7 1 0 0 0 7560 840 140 70 10 1 0 0 7560 840 140 70 10 1 0 0 ";156 "0 420 70 0 10 1 0 0 0 0 14 7 1 0 0 0 7560 840 140 70 10 1 0 0 7560 840 140 70 10 1 0 0 ";
157- std::vector<size_t> expectWorkspaces = {32};157+ std::vector<size_t> expectWorkspaces = {0};
158 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);158 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
159}159}
160 160 
@@ -176,7 +176,7 @@ TEST_F(LerpTiling, lerp_test_6)
176 string176 string
177 expectTilingData = "1 12288 8 2688 1 1 0 8 12288 88704 0 0 0 0 0 0 0 88704 0 0 0 0 0 0 0 88704 0 0 0 0 0 0 0 "177 expectTilingData = "1 12288 8 2688 1 1 0 8 12288 88704 0 0 0 0 0 0 0 88704 0 0 0 0 0 0 0 88704 0 0 0 0 0 0 0 "
178 "88704 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 ";178 "88704 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 ";
179- std::vector<size_t> expectWorkspaces = {32};179+ std::vector<size_t> expectWorkspaces = {0};
180 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);180 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
181}181}
182 182 
@@ -198,7 +198,7 @@ TEST_F(LerpTiling, lerp_test_7)
198 string expectTilingData =198 string expectTilingData =
199 "1 1 3 1 1 7 1 9 12288 1 3 1 7 1 5 1 0 3 3 3 7 8 5 10 0 3 3 3 7 8 5 10 0 3 3 3 7 8 5 10 0 0 35 0 5 0 "199 "1 1 3 1 1 7 1 9 12288 1 3 1 7 1 5 1 0 3 3 3 7 8 5 10 0 3 3 3 7 8 5 10 0 3 3 3 7 8 5 10 0 0 35 0 5 0 "
200 "1 0 0 25200 8400 2800 400 50 10 1 0 25200 8400 2800 400 50 10 1 0 25200 8400 2800 400 50 10 1 0 ";200 "1 0 0 25200 8400 2800 400 50 10 1 0 25200 8400 2800 400 50 10 1 0 25200 8400 2800 400 50 10 1 0 ";
201- std::vector<size_t> expectWorkspaces = {32};201+ std::vector<size_t> expectWorkspaces = {0};
202 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);202 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
203}203}
204 204 
@@ -219,7 +219,7 @@ TEST_F(LerpTiling, lerp_test_8)
219 string expectTilingData = "1 12288 1 30 1 1 0 1 12288 1 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 30 0 0 0 0 "219 string expectTilingData = "1 12288 1 30 1 1 0 1 12288 1 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 30 0 0 0 0 0 0 0 30 0 0 0 0 "
220 "0 0 0 "220 "0 0 0 "
221 "0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 ";221 "0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 ";
222- std::vector<size_t> expectWorkspaces = {32};222+ std::vector<size_t> expectWorkspaces = {0};
223 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);223 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
224}224}
225 225 
@@ -241,7 +241,7 @@ TEST_F(LerpTiling, lerp_test_9)
241 string expectTilingData =241 string expectTilingData =
242 "1 4 4 3 1 6 0 4 12288 15 1 2 1 1 15 0 0 15 3 2 2 14 15 0 0 1 1 1 2 1 15 0 0 15 3 2 2 14 15 0 "242 "1 4 4 3 1 6 0 4 12288 15 1 2 1 1 15 0 0 15 3 2 2 14 15 0 0 1 1 1 2 1 15 0 0 15 3 2 2 14 15 0 "
243 "0 30 0 15 0 0 1 0 0 2520 840 420 210 15 1 0 0 0 0 0 15 0 1 0 0 2520 840 420 210 15 1 0 0 ";243 "0 30 0 15 0 0 1 0 0 2520 840 420 210 15 1 0 0 0 0 0 15 0 1 0 0 2520 840 420 210 15 1 0 0 ";
244- std::vector<size_t> expectWorkspaces = {32};244+ std::vector<size_t> expectWorkspaces = {0};
245 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);245 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
246}246}
247 247 
@@ -262,6 +262,6 @@ TEST_F(LerpTiling, lerp_test_10)
262 string expectTilingData =262 string expectTilingData =
263 "1 4 4 3 1 6 0 4 12288 15 1 2 1 1 15 0 0 15 3 2 2 14 15 0 0 1 1 1 2 1 15 0 0 15 3 2 2 14 15 0 "263 "1 4 4 3 1 6 0 4 12288 15 1 2 1 1 15 0 0 15 3 2 2 14 15 0 0 1 1 1 2 1 15 0 0 15 3 2 2 14 15 0 "
264 "0 30 0 15 0 0 1 0 0 2520 840 420 210 15 1 0 0 0 0 0 15 0 1 0 0 2520 840 420 210 15 1 0 0 ";264 "0 30 0 15 0 0 1 0 0 2520 840 420 210 15 1 0 0 0 0 0 15 0 1 0 0 2520 840 420 210 15 1 0 0 ";
265- std::vector<size_t> expectWorkspaces = {32};265+ std::vector<size_t> expectWorkspaces = {0};
266 ExecuteTestCase(tilingContextPara, ge::GRAPH_FAILED, expectTilingKey, expectTilingData, expectWorkspaces);266 ExecuteTestCase(tilingContextPara, ge::GRAPH_FAILED, expectTilingKey, expectTilingData, expectWorkspaces);
267}267}
@@ -30,7 +30,7 @@ ge::graphStatus MulsTiling::SetTilingData()
30 auto platformInfo = tilingContext->GetPlatformInfo();30 auto platformInfo = tilingContext->GetPlatformInfo();
31 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, platformInfo);31 OP_CHECK_NULL_WITH_CONTEXT(tilingContext, platformInfo);
32 auto ascendcPlatform = platform_ascendc::PlatformAscendC(platformInfo);32 auto ascendcPlatform = platform_ascendc::PlatformAscendC(platformInfo);
33- currentWorkspace[0] = ascendcPlatform.GetLibApiWorkSpaceSize();33+ currentWorkspace[0] = 0;
34 tilingContext->SetBlockDim(tiling->baseTiling.blockNum);34 tilingContext->SetBlockDim(tiling->baseTiling.blockNum);
35 return ge::GRAPH_SUCCESS;35 return ge::GRAPH_SUCCESS;
36}36}
@@ -42,7 +42,7 @@ TEST_F(MulsTilingTest, muls_test_tiling_001)
42 &compileInfo);42 &compileInfo);
43 43 
44 string expectTilingData = "4096 2 10880 2048 2 1 1 2048 2048 10880 1 ";44 string expectTilingData = "4096 2 10880 2048 2 1 1 2048 2048 10880 1 ";
45- std::vector<size_t> expectWorkspaces = {16777216};45+ std::vector<size_t> expectWorkspaces = {0};
46 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);46 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
47}47}
48 48 
@@ -64,7 +64,7 @@ TEST_F(MulsTilingTest, muls_test_tiling_002)
64 &compileInfo);64 &compileInfo);
65 65 
66 string expectTilingData = "4096 4 16384 1024 4 1 1 1024 1024 16384 1 ";66 string expectTilingData = "4096 4 16384 1024 4 1 1 1024 1024 16384 1 ";
67- std::vector<size_t> expectWorkspaces = {16777216};67+ std::vector<size_t> expectWorkspaces = {0};
68 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);68 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
69}69}
70 70 
@@ -86,7 +86,7 @@ TEST_F(MulsTilingTest, muls_test_tiling_003)
86 &compileInfo);86 &compileInfo);
87 87 
88 string expectTilingData = "4096 4 10880 1024 4 1 1 1024 1024 10880 1 ";88 string expectTilingData = "4096 4 10880 1024 4 1 1 1024 1024 10880 1 ";
89- std::vector<size_t> expectWorkspaces = {16777216};89+ std::vector<size_t> expectWorkspaces = {0};
90 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);90 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
91}91}
92 92 
@@ -108,7 +108,7 @@ TEST_F(MulsTilingTest, muls_test_tiling_004)
108 &compileInfo);108 &compileInfo);
109 109 
110 string expectTilingData = "4096 2 10880 2048 2 1 1 2048 2048 10880 1 ";110 string expectTilingData = "4096 2 10880 2048 2 1 1 2048 2048 10880 1 ";
111- std::vector<size_t> expectWorkspaces = {16777216};111+ std::vector<size_t> expectWorkspaces = {0};
112 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);112 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
113}113}
114 114 
@@ -130,7 +130,7 @@ TEST_F(MulsTilingTest, muls_test_tiling_005)
130 &compileInfo);130 &compileInfo);
131 131 
132 string expectTilingData = "4096 4 5440 1024 4 1 1 1024 1024 5440 1 ";132 string expectTilingData = "4096 4 5440 1024 4 1 1 1024 1024 5440 1 ";
133- std::vector<size_t> expectWorkspaces = {16777216};133+ std::vector<size_t> expectWorkspaces = {0};
134 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);134 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
135}135}
136 136 
@@ -152,7 +152,7 @@ TEST_F(MulsTilingTest, muls_test_tiling_006)
152 &compileInfo);152 &compileInfo);
153 153 
154 string expectTilingData = "4096 2 10880 2048 2 1 1 2048 2048 10880 1 ";154 string expectTilingData = "4096 2 10880 2048 2 1 1 2048 2048 10880 1 ";
155- std::vector<size_t> expectWorkspaces = {16777216};155+ std::vector<size_t> expectWorkspaces = {0};
156 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);156 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
157}157}
158 158 
@@ -174,7 +174,7 @@ TEST_F(MulsTilingTest, muls_test_tiling_007)
174 &compileInfo);174 &compileInfo);
175 175 
176 string expectTilingData = "4096 4 5440 1024 4 1 1 1024 1024 5440 1 ";176 string expectTilingData = "4096 4 5440 1024 4 1 1 1024 1024 5440 1 ";
177- std::vector<size_t> expectWorkspaces = {16777216};177+ std::vector<size_t> expectWorkspaces = {0};
178 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);178 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
179}179}
180 180 
@@ -196,7 +196,7 @@ TEST_F(MulsTilingTest, muls_test_tiling_008)
196 &compileInfo);196 &compileInfo);
197 197 
198 string expectTilingData = "4096 8 8192 512 8 1 1 512 512 8192 1 ";198 string expectTilingData = "4096 8 8192 512 8 1 1 512 512 8192 1 ";
199- std::vector<size_t> expectWorkspaces = {16777216};199+ std::vector<size_t> expectWorkspaces = {0};
200 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);200 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
201}201}
202 202 
@@ -218,6 +218,6 @@ TEST_F(MulsTilingTest, muls_test_tiling_009)
218 &compileInfo);218 &compileInfo);
219 219 
220 string expectTilingData = "4096 2 10880 2048 2 1 1 2048 2048 10880 1 ";220 string expectTilingData = "4096 2 10880 2048 2 1 1 2048 2048 10880 1 ";
221- std::vector<size_t> expectWorkspaces = {16777216};221+ std::vector<size_t> expectWorkspaces = {0};
222 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_FAILED, false, 0, true, expectTilingData, expectWorkspaces);222 ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_FAILED, false, 0, true, expectTilingData, expectWorkspaces);
223}223}
@@ -14,7 +14,6 @@
14 */14 */
15 15 
16#include "pow_tiling_arch35.h"16#include "pow_tiling_arch35.h"
17-#include "platform/platform_ascendc.h"
18 17 
19namespace optiling {18namespace optiling {
20using namespace Ops::Base;19using namespace Ops::Base;
@@ -98,10 +97,7 @@ ge::graphStatus PowTilingBase::GetWorkspaceSize()
98{97{
99 size_t* workspaces = context_->GetWorkspaceSizes(1);98 size_t* workspaces = context_->GetWorkspaceSizes(1);
100 OP_CHECK_IF(workspaces == nullptr, OP_LOGE("Pow", "failed to get workspace size"), return ge::GRAPH_FAILED);99 OP_CHECK_IF(workspaces == nullptr, OP_LOGE("Pow", "failed to get workspace size"), return ge::GRAPH_FAILED);
101- auto platformPtr = context_->GetPlatformInfo();100+ workspaces[0] = 0;
102- OP_CHECK_NULL_WITH_CONTEXT(context_, platformPtr);
103- auto ascendcPlatform = platform_ascendc::PlatformAscendC(platformPtr);
104- workspaces[0] = ascendcPlatform.GetLibApiWorkSpaceSize();
105 101 
106 return ge::GRAPH_SUCCESS;102 return ge::GRAPH_SUCCESS;
107}103}
@@ -71,16 +71,6 @@ using namespace Pow;
71 71 
72extern "C" __global__ __aicore__ void pow(GM_ADDR base, GM_ADDR exponent, GM_ADDR y, GM_ADDR workspace, GM_ADDR tiling)72extern "C" __global__ __aicore__ void pow(GM_ADDR base, GM_ADDR exponent, GM_ADDR y, GM_ADDR workspace, GM_ADDR tiling)
73{73{
74- if (workspace == nullptr) {
75- return;
76- }
77- 
78- SetSysWorkspace(workspace);
79- GM_ADDR userWS = GetUserWorkspace(workspace);
80- if (userWS == nullptr) {
81- return;
82- }
83- 
84 KERNEL_TASK_TYPE_DEFAULT(KERNEL_TYPE_AIV_ONLY);74 KERNEL_TASK_TYPE_DEFAULT(KERNEL_TYPE_AIV_ONLY);
85 TPipe tPipe;75 TPipe tPipe;
86 if (TILING_KEY_IS(FP16_TILING_KEY)) {76 if (TILING_KEY_IS(FP16_TILING_KEY)) {
@@ -49,7 +49,7 @@ TEST_F(PowTilingTest, test0_tiling)
49 uint64_t expectTilingKey = 5001;49 uint64_t expectTilingKey = 5001;
50 string expectTilingData =50 string expectTilingData =
51 " ";51 " ";
52- std::vector<size_t> expectWorkspaces = {16777216};52+ std::vector<size_t> expectWorkspaces = {0};
53 53 
54 // ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);54 // ExecuteTestCaseForEle(tilingContextPara, ge::GRAPH_SUCCESS, false, 0, true, expectTilingData, expectWorkspaces);
55}55}
@@ -39,7 +39,7 @@ static constexpr int32_t X1_IDX = 1;
39static constexpr int32_t X2_IDX = 2;39static constexpr int32_t X2_IDX = 2;
40static constexpr int32_t MIN_SIZE = 512;40static constexpr int32_t MIN_SIZE = 512;
41static constexpr int32_t DCACHE_SIZE = 128 * 1024;41static constexpr int32_t DCACHE_SIZE = 128 * 1024;
42-static constexpr uint64_t WORKSPACE_SIZE = 32;42+static constexpr uint64_t WORKSPACE_SIZE = 0;
43static constexpr uint64_t BLOCK_NUM = 1;43static constexpr uint64_t BLOCK_NUM = 1;
44static constexpr int64_t INPUT_DTYPE_B64 = 8;44static constexpr int64_t INPUT_DTYPE_B64 = 8;
45static constexpr int64_t INPUT_DTYPE_B32 = 4;45static constexpr int64_t INPUT_DTYPE_B32 = 4;
@@ -36,7 +36,7 @@ static constexpr uint64_t OP_KEY_9 = 9;
36static constexpr uint64_t INDEX_0 = 0;36static constexpr uint64_t INDEX_0 = 0;
37static constexpr uint64_t INDEX_1 = 1;37static constexpr uint64_t INDEX_1 = 1;
38static constexpr uint64_t INDEX_2 = 2;38static constexpr uint64_t INDEX_2 = 2;
39-static constexpr uint64_t WORKSPACE_SIZE = 32;39+static constexpr uint64_t WORKSPACE_SIZE = 0;
40 40 
41ge::graphStatus TanhGradTiling::GetPlatformInfo()41ge::graphStatus TanhGradTiling::GetPlatformInfo()
42{42{
@@ -40,6 +40,6 @@ TEST_F(TanhGradTilingTest, tanh_grad_tiling_test_001)
40 uint64_t expectTilingKey = 100000001000100;40 uint64_t expectTilingKey = 100000001000100;
41 string expectTilingData = "1 21760 1 1024 1 1 0 1 21760 1024 0 0 0 0 0 0 0 1024 0 0 0 0 0 0 0 1024 0 0 0 0 0 0 0 1 "41 string expectTilingData = "1 21760 1 1024 1 1 0 1 21760 1024 0 0 0 0 0 0 0 1024 0 0 0 0 0 0 0 1024 0 0 0 0 0 0 0 1 "
42 "0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 ";42 "0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 ";
43- std::vector<size_t> expectWorkspaces = {32};43+ std::vector<size_t> expectWorkspaces = {0};
44 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);44 ExecuteTestCase(tilingContextPara, ge::GRAPH_SUCCESS, expectTilingKey, expectTilingData, expectWorkspaces);
45}45}