OpenCL Winograd F(4x4, 3x3)

and OpenCL batching support.
leela-zero · Jul 23, 2018 · 6f70a99 · 6f70a99
1 parent 952fc0a
commit 6f70a99
Show file tree

Hide file tree

Showing 7 changed files with 301 additions and 186 deletions.
diff --git a/src/CPUPipe.cpp b/src/CPUPipe.cpp
@@ -35,9 +35,6 @@
 #include "Network.h"
 #include "Im2Col.h"
 
-// Square root of 2
-#define SQ2 (1.4142135623730951f)
-
 void CPUPipe::initialize(int channels) {
     m_input_channels = channels;
 }
@@ -47,8 +44,8 @@ void CPUPipe::winograd_transform_in(const std::vector<float>& in,
                                     const int C) {
     constexpr auto W = BOARD_SIZE;
     constexpr auto H = BOARD_SIZE;
-    constexpr auto WTILES = W / WINOGRAD_M + (W % WINOGRAD_M != 0);
-    constexpr auto P = WTILES * WTILES;
+    constexpr auto WTILES = WINOGRAD_WTILES;
+    constexpr auto P = WINOGRAD_P;
 
     constexpr auto Wpad = 2 + WINOGRAD_M * WTILES;
 
@@ -120,9 +117,7 @@ void CPUPipe::winograd_sgemm(const std::vector<float>& U,
                              const std::vector<float>& V,
                              std::vector<float>& M,
                              const int C, const int K) {
-    constexpr auto W = BOARD_SIZE;
-    constexpr auto WTILES = W / WINOGRAD_M + (W % WINOGRAD_M != 0);
-    constexpr auto P = WTILES * WTILES;
+    constexpr auto P = WINOGRAD_P;
 
     for (auto b = 0; b < WINOGRAD_TILE; b++) {
         const auto offset_u = b * K * C;
@@ -144,8 +139,8 @@ void CPUPipe::winograd_transform_out(const std::vector<float>& M,
                                      const int K) {
     constexpr auto W = BOARD_SIZE;
     constexpr auto H = BOARD_SIZE;
-    constexpr auto WTILES = W / WINOGRAD_M + (W % WINOGRAD_M != 0);
-    constexpr auto P = WTILES * WTILES;
+    constexpr auto WTILES = WINOGRAD_WTILES;
+    constexpr auto P = WINOGRAD_P;
 
     for (auto k = 0; k < K; k++) {
         for (auto block_x = 0; block_x < WTILES; block_x++) {
@@ -298,8 +293,7 @@ void CPUPipe::forward(const std::vector<float>& input,
                       std::vector<float>& output_pol,
                       std::vector<float>& output_val) {
     // Input convolution
-    constexpr auto WTILES = BOARD_SIZE / WINOGRAD_M + (BOARD_SIZE % WINOGRAD_M != 0);
-    constexpr auto P = WTILES * WTILES;
+    constexpr auto P = WINOGRAD_P;
     // Calculate output channels
     const auto output_channels = m_input_channels;
     // input_channels is the maximum number of input channels of any

diff --git a/src/Network.cpp b/src/Network.cpp
@@ -59,9 +59,6 @@
 #include "Timing.h"
 #include "Utils.h"
 
-// Square root of 2
-#define SQ2 (1.4142135623730951f)
-
 namespace x3 = boost::spirit::x3;
 using namespace Utils;
 

diff --git a/src/Network.h b/src/Network.h
@@ -43,7 +43,10 @@
 // Winograd filter transformation changes 3x3 filters to M + 3 - 1
 constexpr auto WINOGRAD_M = 4;
 constexpr auto WINOGRAD_ALPHA = WINOGRAD_M + 3 - 1;
+constexpr auto WINOGRAD_WTILES = BOARD_SIZE / WINOGRAD_M + (BOARD_SIZE % WINOGRAD_M != 0);
 constexpr auto WINOGRAD_TILE = WINOGRAD_ALPHA * WINOGRAD_ALPHA;
+constexpr auto WINOGRAD_P = WINOGRAD_WTILES * WINOGRAD_WTILES;
+constexpr auto SQ2 = 1.4142135623730951f; // Square root of 2
 
 class Network {
 public: