Skip to content

Commit

Permalink
+add AVX2 optimizations of class SynetDeconvolution16bNhwcGemm.
Browse files Browse the repository at this point in the history
  • Loading branch information
ermig1979 committed Sep 11, 2024
1 parent 0d7b75e commit d71b103
Show file tree
Hide file tree
Showing 16 changed files with 548 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/2024.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h4>Algorithms</h4>
<h5>New features</h5>
<ul>
<li>Base implementation of class SynetDeconvolution16bGemm.</li>
<li>Base implementation, SSE4.1 optimizations of class SynetDeconvolution16bNhwcGemm.</li>
<li>Base implementation, SSE4.1, AVX2 optimizations of class SynetDeconvolution16bNhwcGemm.</li>
</ul>

<h4>Test framework</h4>
Expand Down
3 changes: 3 additions & 0 deletions prj/vs2019/Avx2.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetConvolution8iDirect.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetConvolution8iDirect1x1.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetConvolution8iDirectAny.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution16b.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution16bNhwcGemm.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution32f.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetGridSample.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetGridSample2d32fBlZ.cpp" />
Expand Down Expand Up @@ -217,6 +219,7 @@
<ClInclude Include="..\..\src\Simd\SimdSynetConvolution8i.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetConvolution8iCommon.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetConvParam.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution16b.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution32f.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetGridSample.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetInnerProduct16b.h" />
Expand Down
9 changes: 9 additions & 0 deletions prj/vs2019/Avx2.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,12 @@
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetConvolution16bNchwGemm.cpp">
<Filter>Avx2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution16bNhwcGemm.cpp">
<Filter>Avx2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution16b.cpp">
<Filter>Avx2</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Avx2">
Expand Down Expand Up @@ -686,5 +692,8 @@
<ClInclude Include="..\..\src\Simd\SimdSynetActivation.h">
<Filter>Inc</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution16b.h">
<Filter>Inc</Filter>
</ClInclude>
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions prj/vs2019/Sse41.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@
<ClCompile Include="..\..\src\Simd\SimdSse41SynetConvolution8iNhwcDirect.cpp" />
<ClCompile Include="..\..\src\Simd\SimdSse41SynetConvolution8iNhwcDirect1x1.cpp" />
<ClCompile Include="..\..\src\Simd\SimdSse41SynetConvolution8iNhwcDirectAny.cpp" />
<ClCompile Include="..\..\src\Simd\SimdSse41SynetDeconvolution16b.cpp" />
<ClCompile Include="..\..\src\Simd\SimdSse41SynetDeconvolution16bNhwcGemm.cpp" />
<ClCompile Include="..\..\src\Simd\SimdSse41SynetDeconvolution32f.cpp" />
<ClCompile Include="..\..\src\Simd\SimdSse41SynetGridSample.cpp" />
<ClCompile Include="..\..\src\Simd\SimdSse41SynetGridSample2d32fBlZ.cpp" />
Expand Down Expand Up @@ -223,6 +225,7 @@
<ClInclude Include="..\..\src\Simd\SimdSynetConvolution8i.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetConvolution8iCommon.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetConvParam.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution16b.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution32f.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetGridSample.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetInnerProduct16b.h" />
Expand Down
9 changes: 9 additions & 0 deletions prj/vs2019/Sse41.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,12 @@
<ClCompile Include="..\..\src\Simd\SimdSse41SynetConvolution16bNchwGemm.cpp">
<Filter>Sse41</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Simd\SimdSse41SynetDeconvolution16b.cpp">
<Filter>Sse41</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Simd\SimdSse41SynetDeconvolution16bNhwcGemm.cpp">
<Filter>Sse41</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Sse41">
Expand Down Expand Up @@ -707,5 +713,8 @@
<ClInclude Include="..\..\src\Simd\SimdSynetActivation.h">
<Filter>Inc</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution16b.h">
<Filter>Inc</Filter>
</ClInclude>
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions prj/vs2022/Avx2.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetConvolution8iDirect.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetConvolution8iDirect1x1.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetConvolution8iDirectAny.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution16b.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution16bNhwcGemm.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution32f.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetGridSample.cpp" />
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetGridSample2d32fBlZ.cpp" />
Expand Down Expand Up @@ -217,6 +219,7 @@
<ClInclude Include="..\..\src\Simd\SimdSynetConvolution8i.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetConvolution8iCommon.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetConvParam.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution16b.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution32f.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetGridSample.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetInnerProduct16b.h" />
Expand Down
9 changes: 9 additions & 0 deletions prj/vs2022/Avx2.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,12 @@
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetConvolution16bNchwGemm.cpp">
<Filter>Avx2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution16bNhwcGemm.cpp">
<Filter>Avx2</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Simd\SimdAvx2SynetDeconvolution16b.cpp">
<Filter>Avx2</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="Avx2">
Expand Down Expand Up @@ -686,5 +692,8 @@
<ClInclude Include="..\..\src\Simd\SimdSynetActivation.h">
<Filter>Inc</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution16b.h">
<Filter>Inc</Filter>
</ClInclude>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions prj/vs2022/Sse41.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@
<ClInclude Include="..\..\src\Simd\SimdSynetConvolution8i.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetConvolution8iCommon.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetConvParam.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution16b.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution32f.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetGridSample.h" />
<ClInclude Include="..\..\src\Simd\SimdSynetInnerProduct16b.h" />
Expand Down
3 changes: 3 additions & 0 deletions prj/vs2022/Sse41.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -713,5 +713,8 @@
<ClInclude Include="..\..\src\Simd\SimdSynetActivation.h">
<Filter>Inc</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Simd\SimdSynetDeconvolution16b.h">
<Filter>Inc</Filter>
</ClInclude>
</ItemGroup>
</Project>
42 changes: 42 additions & 0 deletions src/Simd/SimdAvx2SynetDeconvolution16b.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Simd Library (http://ermig1979.github.io/Simd).
*
* Copyright (c) 2011-2024 Yermalayeu Ihar.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "Simd/SimdSynetDeconvolution16b.h"

namespace Simd
{
#if defined(SIMD_AVX2_ENABLE) && defined(SIMD_SYNET_ENABLE)
namespace Avx2
{
void* SynetDeconvolution16bInit(size_t batch, const SimdConvolutionParameters* conv, SimdSynetCompatibilityType compatibility)
{
DeconvParam param(batch, conv, compatibility);
if (!param.Valid(SimdTensorData32f, SimdTensorData16b))
return NULL;
if (SynetDeconvolution16bNhwcGemm::Preferable(param))
return new Avx2::SynetDeconvolution16bNhwcGemm(param);
return new Base::SynetDeconvolution16bGemm(param);
}
}
#endif
}
Loading

0 comments on commit d71b103

Please sign in to comment.