fix gemm arm int8 scales descales offset

Tencent · Oct 21, 2024 · 302be4b · 302be4b
1 parent 8fe6281
commit 302be4b
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 79 deletions.
diff --git a/src/layer/arm/gemm_arm.cpp b/src/layer/arm/gemm_arm.cpp
@@ -4404,7 +4404,6 @@ int Gemm_arm::forward(const std::vector<Mat>& bottom_blobs, std::vector<Mat>& to
     if (int8_scale_term)
     {
         return forward_int8(bottom_blobs, top_blobs, opt);
-        // return Gemm::forward_int8(bottom_blobs, top_blobs, opt);
     }
 #endif
 

diff --git a/src/layer/arm/gemm_int8.h b/src/layer/arm/gemm_int8.h
@@ -1897,8 +1897,8 @@ static void pack_A_tile_fp32_to_int8(const Mat& A, Mat& AT, int i, int max_ii, i
     {
         const float* p0 = (const float*)A + (i + ii) * A_hstep + k * elempack;
 
-        float32x4_t _scale0 = vld1q_f32((const float*)scales + ii);
-        float32x4_t _scale1 = vld1q_f32((const float*)scales + ii + 4);
+        float32x4_t _scale0 = vld1q_f32((const float*)scales + i + ii);
+        float32x4_t _scale1 = vld1q_f32((const float*)scales + i + ii + 4);
 
         if (elempack == 4)
         {
@@ -2314,7 +2314,7 @@ static void pack_A_tile_fp32_to_int8(const Mat& A, Mat& AT, int i, int max_ii, i
     {
         const float* p0 = (const float*)A + (i + ii) * A_hstep + k * elempack;
 
-        float32x4_t _scale = vld1q_f32((const float*)scales + ii);
+        float32x4_t _scale = vld1q_f32((const float*)scales + i + ii);
 
         if (elempack == 4)
         {
@@ -2592,8 +2592,8 @@ static void pack_A_tile_fp32_to_int8(const Mat& A, Mat& AT, int i, int max_ii, i
     {
         const float* p0 = (const float*)A + (i + ii) * A_hstep + k;
 
-        const float scale0 = scales[ii];
-        const float scale1 = scales[ii + 1];
+        const float scale0 = scales[i + ii];
+        const float scale1 = scales[i + ii + 1];
 
         // if (elempack == 1)
         {
@@ -2680,7 +2680,7 @@ static void pack_A_tile_fp32_to_int8(const Mat& A, Mat& AT, int i, int max_ii, i
     {
         const float* p0 = (const float*)A + (i + ii) * A_hstep + k;
 
-        const float scale = scales[ii];
+        const float scale = scales[i + ii];
 
         // if (elempack == 1)
         {
@@ -3055,8 +3055,8 @@ static void transpose_pack_A_tile_fp32_to_int8(const Mat& A, Mat& AT, int i, int
     {
         const float* p0 = (const float*)A + k * A_hstep + (i + ii) * elempack;
 
-        float32x4_t _scale0 = vld1q_f32((const float*)scales + ii);
-        float32x4_t _scale1 = vld1q_f32((const float*)scales + ii + 4);
+        float32x4_t _scale0 = vld1q_f32((const float*)scales + i + ii);
+        float32x4_t _scale1 = vld1q_f32((const float*)scales + i + ii + 4);
 
         if (elempack == 4)
         {
@@ -3396,7 +3396,7 @@ static void transpose_pack_A_tile_fp32_to_int8(const Mat& A, Mat& AT, int i, int
     {
         const float* p0 = (const float*)A + k * A_hstep + (i + ii) * elempack;
 
-        float32x4_t _scale = vld1q_f32((const float*)scales + ii);
+        float32x4_t _scale = vld1q_f32((const float*)scales + i + ii);
 
         if (elempack == 4)
         {
@@ -3622,8 +3622,8 @@ static void transpose_pack_A_tile_fp32_to_int8(const Mat& A, Mat& AT, int i, int
     {
         const float* p0 = (const float*)A + k * A_hstep + (i + ii) * elempack;
 
-        const float scale0 = scales[ii];
-        const float scale1 = scales[ii + 1];
+        const float scale0 = scales[i + ii];
+        const float scale1 = scales[i + ii + 1];
 
 #if __ARM_NEON
         float32x4_t _scale0 = vdupq_n_f32(scale0);
@@ -3805,7 +3805,7 @@ static void transpose_pack_A_tile_fp32_to_int8(const Mat& A, Mat& AT, int i, int
     {
         const float* p0 = (const float*)A + k * A_hstep + (i + ii) * elempack;
 
-        const float scale = scales[ii];
+        const float scale = scales[i + ii];
 
 #if __ARM_NEON
         float32x4_t _scale = vdupq_n_f32(scale);
@@ -5646,8 +5646,8 @@ static void unpack_output_tile_int32_to_fp32(const Mat& topT, const Mat& C, Mat&
     {
         float* p0 = (float*)top_blob + (i + ii) * out_hstep + j * out_elempack;
 
-        float32x4_t _descale0 = vld1q_f32((const float*)descales + ii);
-        float32x4_t _descale1 = vld1q_f32((const float*)descales + ii + 4);
+        float32x4_t _descale0 = vld1q_f32((const float*)descales + i + ii);
+        float32x4_t _descale1 = vld1q_f32((const float*)descales + i + ii + 4);
 
         float32x4_t _c0;
         float32x4_t _c1;
@@ -6593,7 +6593,7 @@ static void unpack_output_tile_int32_to_fp32(const Mat& topT, const Mat& C, Mat&
     {
         float* p0 = (float*)top_blob + (i + ii) * out_hstep + j * out_elempack;
 
-        float32x4_t _descale = vld1q_f32((const float*)descales + ii);
+        float32x4_t _descale = vld1q_f32((const float*)descales + i + ii);
 
         float32x4_t _c0;
         if (pC)
@@ -7181,10 +7181,10 @@ static void unpack_output_tile_int32_to_fp32(const Mat& topT, const Mat& C, Mat&
         // out_elempack == 1
         float* p0 = (float*)top_blob + (i + ii) * out_hstep + j;
 
-        const float descale0 = descales[ii];
-        const float descale1 = descales[ii + 1];
+        const float descale0 = descales[i + ii];
+        const float descale1 = descales[i + ii + 1];
 #if __ARM_NEON
-        float32x2_t _descale = vld1_f32((const float*)descales + ii);
+        float32x2_t _descale = vld1_f32((const float*)descales + i + ii);
 #endif
 
         float c0;
@@ -7467,7 +7467,7 @@ static void unpack_output_tile_int32_to_fp32(const Mat& topT, const Mat& C, Mat&
         // out_elempack == 1
         float* p0 = (float*)top_blob + (i + ii) * out_hstep + j;
 
-        const float descale = descales[ii];
+        const float descale = descales[i + ii];
 #if __ARM_NEON
         float32x4_t _descale = vdupq_n_f32(descale);
 #endif
@@ -7726,8 +7726,8 @@ static void transpose_unpack_output_tile_int32_to_fp32(const Mat& topT, const Ma
     {
         float* p0 = (float*)top_blob + j * out_hstep + (i + ii) * out_elempack;
 
-        float32x4_t _descale0 = vld1q_f32((const float*)descales + ii);
-        float32x4_t _descale1 = vld1q_f32((const float*)descales + ii + 4);
+        float32x4_t _descale0 = vld1q_f32((const float*)descales + i + ii);
+        float32x4_t _descale1 = vld1q_f32((const float*)descales + i + ii + 4);
 
         float32x4_t _c0;
         float32x4_t _c1;
@@ -8673,7 +8673,7 @@ static void transpose_unpack_output_tile_int32_to_fp32(const Mat& topT, const Ma
     {
         float* p0 = (float*)top_blob + j * out_hstep + (i + ii) * out_elempack;
 
-        float32x4_t _descale = vld1q_f32((const float*)descales + ii);
+        float32x4_t _descale = vld1q_f32((const float*)descales + i + ii);
 
         float32x4_t _c0;
         if (pC)
@@ -9237,10 +9237,10 @@ static void transpose_unpack_output_tile_int32_to_fp32(const Mat& topT, const Ma
     {
         float* p0 = (float*)top_blob + j * out_hstep + (i + ii) * out_elempack;
 
-        const float descale0 = descales[ii];
-        const float descale1 = descales[ii + 1];
+        const float descale0 = descales[i + ii];
+        const float descale1 = descales[i + ii + 1];
 #if __ARM_NEON
-        float32x2_t _descale01 = vld1_f32((const float*)descales + ii);
+        float32x2_t _descale01 = vld1_f32((const float*)descales + i + ii);
 #endif
 
         float c0;
@@ -9556,7 +9556,7 @@ static void transpose_unpack_output_tile_int32_to_fp32(const Mat& topT, const Ma
     {
         float* p0 = (float*)top_blob + j * out_hstep + (i + ii) * out_elempack;
 
-        const float descale = descales[ii];
+        const float descale = descales[i + ii];
 #if __ARM_NEON
         float32x4_t _descale = vdupq_n_f32(descale);
 #endif

diff --git a/src/layer/arm/gemm_int8_bf16s.h b/src/layer/arm/gemm_int8_bf16s.h
@@ -217,8 +217,8 @@ static void pack_A_tile_bf16_to_int8(const Mat& A, Mat& AT, int i, int max_ii, i
     {
         const unsigned short* p0 = (const unsigned short*)A + (i + ii) * A_hstep + k * elempack;
 
-        float32x4_t _scale0 = vld1q_f32((const float*)scales + ii);
-        float32x4_t _scale1 = vld1q_f32((const float*)scales + ii + 4);
+        float32x4_t _scale0 = vld1q_f32((const float*)scales + i + ii);
+        float32x4_t _scale1 = vld1q_f32((const float*)scales + i + ii + 4);
 
         if (elempack == 4)
         {
@@ -665,7 +665,7 @@ static void pack_A_tile_bf16_to_int8(const Mat& A, Mat& AT, int i, int max_ii, i
     {
         const unsigned short* p0 = (const unsigned short*)A + (i + ii) * A_hstep + k * elempack;
 
-        float32x4_t _scale = vld1q_f32((const float*)scales + ii);
+        float32x4_t _scale = vld1q_f32((const float*)scales + i + ii);
 
         if (elempack == 4)
         {
@@ -958,8 +958,8 @@ static void pack_A_tile_bf16_to_int8(const Mat& A, Mat& AT, int i, int max_ii, i
     {
         const unsigned short* p0 = (const unsigned short*)A + (i + ii) * A_hstep + k;
 
-        const float scale0 = scales[ii];
-        const float scale1 = scales[ii + 1];
+        const float scale0 = scales[i + ii];
+        const float scale1 = scales[i + ii + 1];
 
         // if (elempack == 1)
         {
@@ -1048,7 +1048,7 @@ static void pack_A_tile_bf16_to_int8(const Mat& A, Mat& AT, int i, int max_ii, i
     {
         const unsigned short* p0 = (const unsigned short*)A + (i + ii) * A_hstep + k;
 
-        const float scale = scales[ii];
+        const float scale = scales[i + ii];
 
         // if (elempack == 1)
         {
@@ -1362,8 +1362,8 @@ static void transpose_pack_A_tile_bf16_to_int8(const Mat& A, Mat& AT, int i, int
     {
         const unsigned short* p0 = (const unsigned short*)A + k * A_hstep + (i + ii) * elempack;
 
-        float32x4_t _scale0 = vld1q_f32((const float*)scales + ii);
-        float32x4_t _scale1 = vld1q_f32((const float*)scales + ii + 4);
+        float32x4_t _scale0 = vld1q_f32((const float*)scales + i + ii);
+        float32x4_t _scale1 = vld1q_f32((const float*)scales + i + ii + 4);
 
         if (elempack == 4)
         {
@@ -1731,7 +1731,7 @@ static void transpose_pack_A_tile_bf16_to_int8(const Mat& A, Mat& AT, int i, int
     {
         const unsigned short* p0 = (const unsigned short*)A + k * A_hstep + (i + ii) * elempack;
 
-        float32x4_t _scale = vld1q_f32((const float*)scales + ii);
+        float32x4_t _scale = vld1q_f32((const float*)scales + i + ii);
 
         if (elempack == 4)
         {
@@ -1963,8 +1963,8 @@ static void transpose_pack_A_tile_bf16_to_int8(const Mat& A, Mat& AT, int i, int
     {
         const unsigned short* p0 = (const unsigned short*)A + k * A_hstep + (i + ii) * elempack;
 
-        const float scale0 = scales[ii];
-        const float scale1 = scales[ii + 1];
+        const float scale0 = scales[i + ii];
+        const float scale1 = scales[i + ii + 1];
 
 #if __ARM_NEON
         float32x4_t _scale0 = vdupq_n_f32(scale0);
@@ -2187,7 +2187,7 @@ static void transpose_pack_A_tile_bf16_to_int8(const Mat& A, Mat& AT, int i, int
     {
         const unsigned short* p0 = (const unsigned short*)A + k * A_hstep + (i + ii) * elempack;
 
-        const float scale = scales[ii];
+        const float scale = scales[i + ii];
 
 #if __ARM_NEON
         float32x4_t _scale = vdupq_n_f32(scale);
@@ -4169,8 +4169,8 @@ static void unpack_output_tile_int32_to_bf16(const Mat& topT, const Mat& C, Mat&
     {
         unsigned short* p0 = (unsigned short*)top_blob + (i + ii) * out_hstep + j * out_elempack;
 
-        float32x4_t _descale0 = vld1q_f32((const float*)descales + ii);
-        float32x4_t _descale1 = vld1q_f32((const float*)descales + ii + 4);
+        float32x4_t _descale0 = vld1q_f32((const float*)descales + i + ii);
+        float32x4_t _descale1 = vld1q_f32((const float*)descales + i + ii + 4);
 
         float32x4_t _c0;
         float32x4_t _c1;
@@ -5189,7 +5189,7 @@ static void unpack_output_tile_int32_to_bf16(const Mat& topT, const Mat& C, Mat&
     {
         unsigned short* p0 = (unsigned short*)top_blob + (i + ii) * out_hstep + j * out_elempack;
 
-        float32x4_t _descale = vld1q_f32((const float*)descales + ii);
+        float32x4_t _descale = vld1q_f32((const float*)descales + i + ii);
 
         float32x4_t _c0;
         if (pC)
@@ -5794,10 +5794,10 @@ static void unpack_output_tile_int32_to_bf16(const Mat& topT, const Mat& C, Mat&
         // out_elempack == 1
         unsigned short* p0 = (unsigned short*)top_blob + (i + ii) * out_hstep + j;
 
-        const float descale0 = descales[ii];
-        const float descale1 = descales[ii + 1];
+        const float descale0 = descales[i + ii];
+        const float descale1 = descales[i + ii + 1];
 #if __ARM_NEON
-        float32x2_t _descale = vld1_f32((const float*)descales + ii);
+        float32x2_t _descale = vld1_f32((const float*)descales + i + ii);
 #endif
 
         float c0;
@@ -6097,7 +6097,7 @@ static void unpack_output_tile_int32_to_bf16(const Mat& topT, const Mat& C, Mat&
         // out_elempack == 1
         unsigned short* p0 = (unsigned short*)top_blob + (i + ii) * out_hstep + j;
 
-        const float descale = descales[ii];
+        const float descale = descales[i + ii];
 #if __ARM_NEON
         float32x4_t _descale = vdupq_n_f32(descale);
 #endif
@@ -6359,8 +6359,8 @@ static void transpose_unpack_output_tile_int32_to_bf16(const Mat& topT, const Ma
     {
         unsigned short* p0 = (unsigned short*)top_blob + j * out_hstep + (i + ii) * out_elempack;
 
-        float32x4_t _descale0 = vld1q_f32((const float*)descales + ii);
-        float32x4_t _descale1 = vld1q_f32((const float*)descales + ii + 4);
+        float32x4_t _descale0 = vld1q_f32((const float*)descales + i + ii);
+        float32x4_t _descale1 = vld1q_f32((const float*)descales + i + ii + 4);
 
         float32x4_t _c0;
         float32x4_t _c1;
@@ -7318,7 +7318,7 @@ static void transpose_unpack_output_tile_int32_to_bf16(const Mat& topT, const Ma
     {
         unsigned short* p0 = (unsigned short*)top_blob + j * out_hstep + (i + ii) * out_elempack;
 
-        float32x4_t _descale = vld1q_f32((const float*)descales + ii);
+        float32x4_t _descale = vld1q_f32((const float*)descales + i + ii);
 
         float32x4_t _c0;
         if (pC)
@@ -7902,10 +7902,10 @@ static void transpose_unpack_output_tile_int32_to_bf16(const Mat& topT, const Ma
     {
         unsigned short* p0 = (unsigned short*)top_blob + j * out_hstep + (i + ii) * out_elempack;
 
-        const float descale0 = descales[ii];
-        const float descale1 = descales[ii + 1];
+        const float descale0 = descales[i + ii];
+        const float descale1 = descales[i + ii + 1];
 #if __ARM_NEON
-        float32x2_t _descale01 = vld1_f32((const float*)descales + ii);
+        float32x2_t _descale01 = vld1_f32((const float*)descales + i + ii);
 #endif
 
         float c0;
@@ -8250,7 +8250,7 @@ static void transpose_unpack_output_tile_int32_to_bf16(const Mat& topT, const Ma
     {
         unsigned short* p0 = (unsigned short*)top_blob + j * out_hstep + (i + ii) * out_elempack;
 
-        const float descale = descales[ii];
+        const float descale = descales[i + ii];
 #if __ARM_NEON
         float32x4_t _descale = vdupq_n_f32(descale);
 #endif