Deprecate S16 LPGEMM APIs.

-The following S16 APIs are removed: 1. aocl_gemm_u8s8s16os16 2. aocl_gemm_u8s8s16os8 3. aocl_gemm_u8s8s16ou8 4. aocl_gemm_s8s8s16os16 5. aocl_gemm_s8s8s16os8 along with the associated reorder APIs and corresponding framework elements. AMD-Internal: [CPUPL-6412] Change-Id: I251f8b02a4cba5110615ddeb977d86f5c949363b
2026-05-05 15:01:13 +00:00 · 2025-02-07 11:27:28 +00:00
parent 1f0fb05277
commit bffa92ec93
39 changed files with 1 additions and 22361 deletions
--- a/addon/aocl_gemm/config/lpgemm_func_map.h
+++ b/addon/aocl_gemm/config/lpgemm_func_map.h
@@ -4,7 +4,7 @@
   An object-based framework for developing high-performance BLAS-like
   libraries.

-   Copyright (C) 2023 - 2024, Advanced Micro Devices, Inc. All rights reserved.
+   Copyright (C) 2023 - 2025, Advanced Micro Devices, Inc. All rights reserved.

   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are
@@ -46,32 +46,26 @@

 // AVX512 + VNNI + BF16
 #define LPGEMM_KERN_FUNC_MAP_AVX512_VNNI_BF16 \
-	KMACRO(U8S8S16OS16, lpgemm_rowvar_u8s8s16o16_6x32) \
 	KMACRO(U8S8S32OS32, lpgemm_rowvar_u8s8s32o32_6x64) \
 	KMACRO(F32F32F32OF32, lpgemm_rowvar_f32f32f32of32_avx512_6x64m) \
 	KMACRO(BF16BF16F32OF32, lpgemm_rowvar_bf16bf16f32of32_6x64) \
 	KMACRO(BF16S4F32OF32, lpgemm_rowvar_bf16bf16f32of32_6x64) \
 	KMACRO(S8S8S32OS32, lpgemm_rowvar_s8s8s32os32_6x64) \
-	KMACRO(S8S8S16OS16, lpgemm_rowvar_s8s8s16o16_6x32) \

 #define LPGEMM_KERN_FUNC_UPD_MAP_AVX512_VNNI_BF16_TO_AVX2 \
 	KMACRO(F32F32F32OF32, lpgemm_rowvar_f32f32f32of32_6x16m) \

 #define LPGEMM_PACKA_FUNC_MAP_AVX512_VNNI_BF16 \
-	PAMACRO(U8S8S16OS16, packa_u8s8s16os16) \
 	PAMACRO(U8S8S32OS32, packa_u8s8s32os32) \
 	PAMACRO(BF16BF16F32OF32, packa_mr16_bf16bf16f32of32) \
 	PAMACRO(BF16S4F32OF32, packa_mr16_bf16bf16f32of32) \
 	PAMACRO(S8S8S32OS32, packa_u8s8s32os32) \
-	PAMACRO(S8S8S16OS16, packa_u8s8s16os16)

 #define LPGEMM_PACKB_FUNC_MAP_AVX512_VNNI_BF16 \
-	PBMACRO(U8S8S16OS16, packb_nr32_u8s8s16o16) \
 	PBMACRO(U8S8S32OS32, packb_nr64_u8s8s32o32)          \
 	PBMACRO(F32F32F32OF32, packb_nr64_f32f32f32of32)     \
 	PBMACRO(BF16BF16F32OF32, packb_nr64_bf16bf16f32of32) \
 	PBMACRO(S8S8S32OS32, packb_nr64_s8s8s32os32)         \
-	PBMACRO(S8S8S16OS16, packb_nr32_s8s8s16o16)          \
 	PBMACRO(U8S4S32OS32, packb_nr64_u8s4s32o32)          \
 	PBMACRO(BF16S4F32OF32, packb_nr64_bf16s4f32of32)

@@ -85,11 +79,9 @@
 	UBMACRO(BF16BF16F32OF32, unpackb_nr64_bf16bf16f32of32)

 #define LPGEMM_PACKSCLB_FUNC_MAP_AVX512_VNNI_BF16 \
-	PBSMACRO(U8S8S16OS16, NULL) \
 	PBSMACRO(U8S8S32OS32, NULL) \
 	PBSMACRO(BF16BF16F32OF32, NULL) \
 	PBSMACRO(S8S8S32OS32, NULL) \
-	PBSMACRO(S8S8S16OS16, NULL) \
 	PBSMACRO(U8S4S32OS32, NULL) \
 	PBSMACRO(BF16S4F32OF32, packsclb_nr64_bf16s4f32of32) \

@@ -105,35 +97,29 @@

 // AVX512 + VNNI
 #define LPGEMM_KERN_FUNC_MAP_AVX512_VNNI \
-	KMACRO(U8S8S16OS16, lpgemm_rowvar_u8s8s16o16_6x32) \
 	KMACRO(U8S8S32OS32, lpgemm_rowvar_u8s8s32o32_6x64) \
 	KMACRO(F32F32F32OF32, lpgemm_rowvar_f32f32f32of32_avx512_6x64m) \
 	KMACRO(BF16BF16F32OF32, lpgemm_rowvar_bf16bf16f32of32_6x64) \
 	KMACRO(BF16S4F32OF32, lpgemm_rowvar_bf16bf16f32of32_6x64) \
 	KMACRO(S8S8S32OS32, lpgemm_rowvar_s8s8s32os32_6x64) \
-	KMACRO(S8S8S16OS16, lpgemm_rowvar_s8s8s16o16_6x32) \

 #define LPGEMM_KERN_FUNC_UPD_MAP_AVX512_VNNI_TO_AVX2 \
 	KMACRO(F32F32F32OF32, lpgemm_rowvar_f32f32f32of32_6x16m) \

 #define LPGEMM_PACKA_FUNC_MAP_AVX512_VNNI \
-	PAMACRO(U8S8S16OS16, packa_u8s8s16os16) \
 	PAMACRO(U8S8S32OS32, packa_u8s8s32os32) \
 	PAMACRO(BF16BF16F32OF32, packa_mr16_bf16bf16f32of32) \
 	PAMACRO(BF16S4F32OF32, packa_mr16_bf16bf16f32of32) \
 	PAMACRO(S8S8S32OS32, packa_u8s8s32os32) \
-	PAMACRO(S8S8S16OS16, packa_u8s8s16os16)

 #define LPGEMM_PACKBMXP_FUNC_MAP_AVX512_VNNI \
 	PBMXPMACRO(F32OBF16, packb_mxp_nr64_f32obf16)

 #define LPGEMM_PACKB_FUNC_MAP_AVX512_VNNI \
-	PBMACRO(U8S8S16OS16, packb_nr32_u8s8s16o16) \
 	PBMACRO(U8S8S32OS32, packb_nr64_u8s8s32o32) \
 	PBMACRO(F32F32F32OF32, packb_nr64_f32f32f32of32) \
 	PBMACRO(BF16BF16F32OF32, packb_nr64_bf16bf16f32of32) \
 	PBMACRO(S8S8S32OS32, packb_nr64_s8s8s32os32) \
-	PBMACRO(S8S8S16OS16, packb_nr32_s8s8s16o16) \
 	PBMACRO(U8S4S32OS32, packb_nr64_u8s4s32o32) \
 	PBSMACRO(BF16S4F32OF32, packb_nr64_bf16s4f32of32)

@@ -148,32 +134,26 @@

 // AVX512
 #define LPGEMM_KERN_FUNC_MAP_AVX512 \
-	KMACRO(U8S8S16OS16, lpgemm_rowvar_u8s8s16o16_6x32) \
 	KMACRO(U8S8S32OS32, lpgemm_rowvar_u8s8s32o32_6x64) \
 	KMACRO(F32F32F32OF32, lpgemm_rowvar_f32f32f32of32_avx512_6x64m) \
 	KMACRO(BF16BF16F32OF32, lpgemm_rowvar_bf16bf16f32of32_6x64) \
 	KMACRO(BF16S4F32OF32, lpgemm_rowvar_bf16bf16f32of32_6x64) \
 	KMACRO(S8S8S32OS32, lpgemm_rowvar_s8s8s32os32_6x64) \
-	KMACRO(S8S8S16OS16, lpgemm_rowvar_s8s8s16o16_6x32) \

 #define LPGEMM_KERN_FUNC_UPD_MAP_AVX512_TO_AVX2 \
 	KMACRO(F32F32F32OF32, lpgemm_rowvar_f32f32f32of32_6x16m) \

 #define LPGEMM_PACKA_FUNC_MAP_AVX512 \
-	PAMACRO(U8S8S16OS16, packa_u8s8s16os16) \
 	PAMACRO(U8S8S32OS32, packa_u8s8s32os32) \
 	PAMACRO(BF16BF16F32OF32, packa_mr16_bf16bf16f32of32) \
 	PAMACRO(BF16S4F32OF32, packa_mr16_bf16bf16f32of32) \
 	PAMACRO(S8S8S32OS32, packa_u8s8s32os32) \
-	PAMACRO(S8S8S16OS16, packa_u8s8s16os16) \

 #define LPGEMM_PACKB_FUNC_MAP_AVX512 \
-	PBMACRO(U8S8S16OS16, packb_nr32_u8s8s16o16) \
 	PBMACRO(U8S8S32OS32, packb_nr64_u8s8s32o32) \
 	PBMACRO(F32F32F32OF32, packb_nr64_f32f32f32of32) \
 	PBMACRO(BF16BF16F32OF32, NULL) \
 	PBMACRO(S8S8S32OS32, packb_nr64_s8s8s32os32) \
-	PBMACRO(S8S8S16OS16, packb_nr32_s8s8s16o16) \
 	PBMACRO(U8S4S32OS32, packb_nr64_u8s4s32o32) \
 	PBMACRO(BF16S4F32OF32, NULL) \
 	PBSMACRO(BF16S4F32OF32, NULL)
@@ -189,30 +169,24 @@

 // AVX2
 #define LPGEMM_KERN_FUNC_MAP_AVX2 \
-	KMACRO(U8S8S16OS16, lpgemm_rowvar_u8s8s16o16_6x32) \
 	KMACRO(U8S8S32OS32, NULL) \
 	KMACRO(F32F32F32OF32, lpgemm_rowvar_f32f32f32of32_6x16m) \
 	KMACRO(BF16BF16F32OF32, NULL) \
 	KMACRO(BF16S4F32OF32, NULL) \
 	KMACRO(S8S8S32OS32, NULL) \
-	KMACRO(S8S8S16OS16, lpgemm_rowvar_s8s8s16o16_6x32) \

 #define LPGEMM_PACKA_FUNC_MAP_AVX2 \
-	PAMACRO(U8S8S16OS16, packa_u8s8s16os16) \
 	PAMACRO(U8S8S32OS32, NULL) \
 	PAMACRO(BF16BF16F32OF32, NULL) \
 	KMACRO(BF16S4F32OF32, NULL) \
 	PAMACRO(S8S8S32OS32, NULL) \
-	PAMACRO(S8S8S16OS16, packa_u8s8s16os16) \

 #define LPGEMM_PACKB_FUNC_MAP_AVX2 \
-	PBMACRO(U8S8S16OS16, packb_nr32_u8s8s16o16) \
 	PBMACRO(U8S8S32OS32, NULL) \
 	PBMACRO(F32F32F32OF32, packb_nr16_f32f32f32of32) \
 	PBMACRO(BF16BF16F32OF32, NULL) \
 	KMACRO(BF16S4F32OF32, NULL) \
 	PBMACRO(S8S8S32OS32, NULL) \
-	PBMACRO(S8S8S16OS16, packb_nr32_s8s8s16o16) \
 	PBMACRO(U8S4S32OS32, NULL) \
 	PBSMACRO(BF16S4F32OF32, NULL) \