Merge pull request #3631 from martin-frbg/revertdynskx

Revert selection of a different DGEMM kernel for SkylakeX in DYNAMIC_ARCH builds
This commit is contained in:
Martin Kroeker 2022-05-20 13:47:09 +02:00 committed by GitHub
commit d0c3504255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 26 deletions

View File

@ -20,7 +20,6 @@ SGEMM_SMALL_K_B0_TN = sgemm_small_kernel_tn_skylakex.c
SGEMM_SMALL_K_TT = sgemm_small_kernel_tt_skylakex.c
SGEMM_SMALL_K_B0_TT = sgemm_small_kernel_tt_skylakex.c
ifndef DYNAMIC_ARCH
DGEMMKERNEL = dgemm_kernel_16x2_skylakex.c
DTRMMKERNEL = dgemm_kernel_16x2_skylakex.c
DGEMMINCOPY = ../generic/gemm_ncopy_16.c
@ -28,11 +27,7 @@ DGEMMITCOPY = dgemm_tcopy_16_skylakex.c
DGEMMONCOPY = ../generic/gemm_ncopy_2.c
DGEMMOTCOPY = ../generic/gemm_tcopy_2.c
DTRSMKERNEL_RN = ../generic/trsm_kernel_RN.c
else
DGEMMKERNEL = dgemm_kernel_4x8_skylakex_2.c
DGEMMONCOPY = dgemm_ncopy_8_skylakex.c
DGEMMOTCOPY = dgemm_tcopy_8_skylakex.c
endif
DGEMM_SMALL_M_PERMIT = dgemm_small_kernel_permit_skylakex.c
DGEMM_SMALL_K_NN = dgemm_small_kernel_nn_skylakex.c
DGEMM_SMALL_K_B0_NN = dgemm_small_kernel_nn_skylakex.c

20
param.h
View File

@ -1669,22 +1669,14 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#else
#define SGEMM_DEFAULT_UNROLL_M 16
#ifdef DYNAMIC_ARCH
#define DGEMM_DEFAULT_UNROLL_M 4
#else
#define DGEMM_DEFAULT_UNROLL_M 16
#endif
#define QGEMM_DEFAULT_UNROLL_M 2
#define CGEMM_DEFAULT_UNROLL_M 8
#define ZGEMM_DEFAULT_UNROLL_M 4
#define XGEMM_DEFAULT_UNROLL_M 1
#define SGEMM_DEFAULT_UNROLL_N 4
#ifdef DYNAMIC_ARCH
#define DGEMM_DEFAULT_UNROLL_N 8
#else
#define DGEMM_DEFAULT_UNROLL_N 2
#endif
#define QGEMM_DEFAULT_UNROLL_N 2
#define CGEMM_DEFAULT_UNROLL_N 2
#define ZGEMM_DEFAULT_UNROLL_N 2
@ -1718,29 +1710,17 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#else
#define SGEMM_DEFAULT_P 448
#ifndef DYNAMIC_ARCH
#define DGEMM_DEFAULT_P 192
#else
#define DGEMM_DEFAULT_P 384
#endif
#define CGEMM_DEFAULT_P 384
#define ZGEMM_DEFAULT_P 256
#define SGEMM_DEFAULT_Q 448
#ifndef DYNAMIC_ARCH
#define DGEMM_DEFAULT_Q 384
#else
#define DGEMM_DEFAULT_Q 168
#endif
#define CGEMM_DEFAULT_Q 192
#define ZGEMM_DEFAULT_Q 128
#define SGEMM_DEFAULT_R sgemm_r
#ifndef DYNAMIC_ARCH
#define DGEMM_DEFAULT_R 8640
#else
#define DGEMM_DEFAULT_R 13824
#endif
#define CGEMM_DEFAULT_R cgemm_r
#define ZGEMM_DEFAULT_R zgemm_r