Merge branch 'master' into convgemm_multi_kernel

2 files changed, 14 insertions, 2 deletions

diff --git a/test/correctness/misc/preprocessor.cpp b/test/correctness/misc/preprocessor.cpp
index c5d115d3..4d6fa114 100644
--- a/test/correctness/misc/preprocessor.cpp
+++ b/test/correctness/misc/preprocessor.cpp
@@ -221,7 +221,7 @@ size_t RunPreprocessor(int argc, char *argv[], const bool silent, const Precisio
   ;
   if (TestKernel(device, context, "TransposePadMatrix", transpose_pad_sources, precision)) { passed++; } else { errors++; }
 
-  // GEMM (in-direct)
+  // GEMM (in-direct) GEMMK==0
   const auto gemm_sources =
     "#define KWI 2\n"
     "#define MWG 16\n"
@@ -234,6 +234,18 @@ size_t RunPreprocessor(int argc, char *argv[], const bool silent, const Precisio
   ;
   if (TestKernel(device, context, "Xgemm", gemm_sources, precision)) { passed++; } else { errors++; }
 
+  // GEMM (in-direct) GEMMK==1
+  const auto gemm_sources_gemmk1 =
+    "#define MWG 16\n"
+    "#define NWG 16\n"
+    "#define GEMMK 1\n"
+    #include "../src/kernels/level3/xgemm_part1.opencl"
+    #include "../src/kernels/level3/xgemm_part2.opencl"
+    #include "../src/kernels/level3/xgemm_part3.opencl"
+    #include "../src/kernels/level3/xgemm_part4.opencl"
+  ;
+  if (TestKernel(device, context, "Xgemm", gemm_sources_gemmk1, precision)) { passed++; } else { errors++; }
+
   // GEMM (direct)
   const auto gemm_direct_sources =
     "#define KWID 2\n"
diff --git a/test/correctness/testblas.cpp b/test/correctness/testblas.cpp
index 3c92565e..d28aba40 100644
--- a/test/correctness/testblas.cpp
+++ b/test/correctness/testblas.cpp
@@ -239,7 +239,7 @@ void TestBlas<T,U>::TestRegular(std::vector<Arguments<U>> &test_vector, const st
     }
 
     // Tests the error count (should be zero)
-    TestErrorCount(errors, get_id1_(args)*get_id2_(args), args);
+    TestErrorCount(errors, get_id1_(args)*get_id2_(args) + kCanarySize, args);
   }
   TestEnd();
 }