Просмотр исходного кода

CUDA: fix misaligned synchronization in FA (#13469)

Johannes Gäßler 8 месяцев назад
Родитель
Сommit
95e18884fc
1 измененных файлов с 5 добавлено и 0 удалено
  1. 5 0
      ggml/src/ggml-cuda/fattn-mma-f16.cuh

+ 5 - 0
ggml/src/ggml-cuda/fattn-mma-f16.cuh

@@ -895,6 +895,11 @@ static __device__ __forceinline__ void flash_attn_ext_f16_process_tile(
             float2 * dstk_fixup_meta = dstk_fixup + (gridDim.x + blockIdx.x)*ncols;
             dstk_fixup_meta[(threadIdx.y/np)*cols_per_warp + threadIdx.x] = make_float2(KQ_cmn, KQ_crs);
         }
+    } else if (np > 1) {
+        // Warps with threadIdx.y % np == 0 execute a __syncthreads() in the if branch.
+        // Therefore, all other warps also need to execute a __syncthreads().
+        // Otherwise the points at which warps synchronize with each other would become misaligned.
+        __syncthreads();
     }
 
 #pragma unroll