From 7f77856e25aad5fc6f172ed3e57b6351804e31a4 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Tue, 12 Aug 2014 12:20:15 -0500 Subject: [PATCH] Removed unused 4m/3m-related packm macro defs. Details: - Removed unused and unneeded s- and d-flavored macro definitions for packm ukernels related to the complex 4m and 3m methods, as implemented in BLIS. --- frame/include/bli_kernel_3m_macro_defs.h | 66 +---------------------- frame/include/bli_kernel_4m_macro_defs.h | 66 +---------------------- frame/include/bli_kernel_pre_macro_defs.h | 32 ----------- 3 files changed, 2 insertions(+), 162 deletions(-) diff --git a/frame/include/bli_kernel_3m_macro_defs.h b/frame/include/bli_kernel_3m_macro_defs.h index eb3fc12ed..3e7bd738d 100644 --- a/frame/include/bli_kernel_3m_macro_defs.h +++ b/frame/include/bli_kernel_3m_macro_defs.h @@ -36,7 +36,7 @@ #define BLIS_KERNEL_3M_MACRO_DEFS_H -// -- Define datatype-agnostic base 3m kernel names ---------------------------- +// -- Define default 3m-specific kernel names ---------------------------------- // // Level-3 3m @@ -98,14 +98,6 @@ // packm_2xk_ri3 kernels -#ifndef BLIS_SPACKM_2XK_RI3_KERNEL -#define BLIS_SPACKM_2XK_RI3_KERNEL BLIS_SPACKM_2XK_RI3_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_2XK_RI3_KERNEL -#define BLIS_DPACKM_2XK_RI3_KERNEL BLIS_DPACKM_2XK_RI3_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_2XK_RI3_KERNEL #define BLIS_CPACKM_2XK_RI3_KERNEL BLIS_CPACKM_2XK_RI3_KERNEL_REF #endif @@ -116,14 +108,6 @@ // packm_4xk_ri3 kernels -#ifndef BLIS_SPACKM_4XK_RI3_KERNEL -#define BLIS_SPACKM_4XK_RI3_KERNEL BLIS_SPACKM_4XK_RI3_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_4XK_RI3_KERNEL -#define BLIS_DPACKM_4XK_RI3_KERNEL BLIS_DPACKM_4XK_RI3_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_4XK_RI3_KERNEL #define BLIS_CPACKM_4XK_RI3_KERNEL BLIS_CPACKM_4XK_RI3_KERNEL_REF #endif @@ -134,14 +118,6 @@ // packm_6xk_ri3 kernels -#ifndef BLIS_SPACKM_6XK_RI3_KERNEL -#define BLIS_SPACKM_6XK_RI3_KERNEL BLIS_SPACKM_6XK_RI3_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_6XK_RI3_KERNEL -#define BLIS_DPACKM_6XK_RI3_KERNEL BLIS_DPACKM_6XK_RI3_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_6XK_RI3_KERNEL #define BLIS_CPACKM_6XK_RI3_KERNEL BLIS_CPACKM_6XK_RI3_KERNEL_REF #endif @@ -152,14 +128,6 @@ // packm_8xk_ri3 kernels -#ifndef BLIS_SPACKM_8XK_RI3_KERNEL -#define BLIS_SPACKM_8XK_RI3_KERNEL BLIS_SPACKM_8XK_RI3_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_8XK_RI3_KERNEL -#define BLIS_DPACKM_8XK_RI3_KERNEL BLIS_DPACKM_8XK_RI3_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_8XK_RI3_KERNEL #define BLIS_CPACKM_8XK_RI3_KERNEL BLIS_CPACKM_8XK_RI3_KERNEL_REF #endif @@ -170,14 +138,6 @@ // packm_10xk_ri3 kernels -#ifndef BLIS_SPACKM_10XK_RI3_KERNEL -#define BLIS_SPACKM_10XK_RI3_KERNEL BLIS_SPACKM_10XK_RI3_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_10XK_RI3_KERNEL -#define BLIS_DPACKM_10XK_RI3_KERNEL BLIS_DPACKM_10XK_RI3_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_10XK_RI3_KERNEL #define BLIS_CPACKM_10XK_RI3_KERNEL BLIS_CPACKM_10XK_RI3_KERNEL_REF #endif @@ -188,14 +148,6 @@ // packm_12xk_ri3 kernels -#ifndef BLIS_SPACKM_12XK_RI3_KERNEL -#define BLIS_SPACKM_12XK_RI3_KERNEL BLIS_SPACKM_12XK_RI3_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_12XK_RI3_KERNEL -#define BLIS_DPACKM_12XK_RI3_KERNEL BLIS_DPACKM_12XK_RI3_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_12XK_RI3_KERNEL #define BLIS_CPACKM_12XK_RI3_KERNEL BLIS_CPACKM_12XK_RI3_KERNEL_REF #endif @@ -206,14 +158,6 @@ // packm_14xk_ri3 kernels -#ifndef BLIS_SPACKM_14XK_RI3_KERNEL -#define BLIS_SPACKM_14XK_RI3_KERNEL BLIS_SPACKM_14XK_RI3_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_14XK_RI3_KERNEL -#define BLIS_DPACKM_14XK_RI3_KERNEL BLIS_DPACKM_14XK_RI3_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_14XK_RI3_KERNEL #define BLIS_CPACKM_14XK_RI3_KERNEL BLIS_CPACKM_14XK_RI3_KERNEL_REF #endif @@ -224,14 +168,6 @@ // packm_16xk_ri3 kernels -#ifndef BLIS_SPACKM_16XK_RI3_KERNEL -#define BLIS_SPACKM_16XK_RI3_KERNEL BLIS_SPACKM_16XK_RI3_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_16XK_RI3_KERNEL -#define BLIS_DPACKM_16XK_RI3_KERNEL BLIS_DPACKM_16XK_RI3_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_16XK_RI3_KERNEL #define BLIS_CPACKM_16XK_RI3_KERNEL BLIS_CPACKM_16XK_RI3_KERNEL_REF #endif diff --git a/frame/include/bli_kernel_4m_macro_defs.h b/frame/include/bli_kernel_4m_macro_defs.h index 96e4b50c6..8789f4cb6 100644 --- a/frame/include/bli_kernel_4m_macro_defs.h +++ b/frame/include/bli_kernel_4m_macro_defs.h @@ -36,7 +36,7 @@ #define BLIS_KERNEL_4M_MACRO_DEFS_H -// -- Construct 4m kernel function names --------------------------------------- +// -- Define default 4m-specific kernel names ---------------------------------- // // Level-3 4m @@ -98,14 +98,6 @@ // packm_2xk_ri kernels -#ifndef BLIS_SPACKM_2XK_RI_KERNEL -#define BLIS_SPACKM_2XK_RI_KERNEL BLIS_SPACKM_2XK_RI_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_2XK_RI_KERNEL -#define BLIS_DPACKM_2XK_RI_KERNEL BLIS_DPACKM_2XK_RI_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_2XK_RI_KERNEL #define BLIS_CPACKM_2XK_RI_KERNEL BLIS_CPACKM_2XK_RI_KERNEL_REF #endif @@ -116,14 +108,6 @@ // packm_4xk_ri kernels -#ifndef BLIS_SPACKM_4XK_RI_KERNEL -#define BLIS_SPACKM_4XK_RI_KERNEL BLIS_SPACKM_4XK_RI_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_4XK_RI_KERNEL -#define BLIS_DPACKM_4XK_RI_KERNEL BLIS_DPACKM_4XK_RI_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_4XK_RI_KERNEL #define BLIS_CPACKM_4XK_RI_KERNEL BLIS_CPACKM_4XK_RI_KERNEL_REF #endif @@ -134,14 +118,6 @@ // packm_6xk_ri kernels -#ifndef BLIS_SPACKM_6XK_RI_KERNEL -#define BLIS_SPACKM_6XK_RI_KERNEL BLIS_SPACKM_6XK_RI_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_6XK_RI_KERNEL -#define BLIS_DPACKM_6XK_RI_KERNEL BLIS_DPACKM_6XK_RI_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_6XK_RI_KERNEL #define BLIS_CPACKM_6XK_RI_KERNEL BLIS_CPACKM_6XK_RI_KERNEL_REF #endif @@ -152,14 +128,6 @@ // packm_8xk_ri kernels -#ifndef BLIS_SPACKM_8XK_RI_KERNEL -#define BLIS_SPACKM_8XK_RI_KERNEL BLIS_SPACKM_8XK_RI_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_8XK_RI_KERNEL -#define BLIS_DPACKM_8XK_RI_KERNEL BLIS_DPACKM_8XK_RI_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_8XK_RI_KERNEL #define BLIS_CPACKM_8XK_RI_KERNEL BLIS_CPACKM_8XK_RI_KERNEL_REF #endif @@ -170,14 +138,6 @@ // packm_10xk_ri kernels -#ifndef BLIS_SPACKM_10XK_RI_KERNEL -#define BLIS_SPACKM_10XK_RI_KERNEL BLIS_SPACKM_10XK_RI_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_10XK_RI_KERNEL -#define BLIS_DPACKM_10XK_RI_KERNEL BLIS_DPACKM_10XK_RI_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_10XK_RI_KERNEL #define BLIS_CPACKM_10XK_RI_KERNEL BLIS_CPACKM_10XK_RI_KERNEL_REF #endif @@ -188,14 +148,6 @@ // packm_12xk_ri kernels -#ifndef BLIS_SPACKM_12XK_RI_KERNEL -#define BLIS_SPACKM_12XK_RI_KERNEL BLIS_SPACKM_12XK_RI_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_12XK_RI_KERNEL -#define BLIS_DPACKM_12XK_RI_KERNEL BLIS_DPACKM_12XK_RI_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_12XK_RI_KERNEL #define BLIS_CPACKM_12XK_RI_KERNEL BLIS_CPACKM_12XK_RI_KERNEL_REF #endif @@ -206,14 +158,6 @@ // packm_14xk_ri kernels -#ifndef BLIS_SPACKM_14XK_RI_KERNEL -#define BLIS_SPACKM_14XK_RI_KERNEL BLIS_SPACKM_14XK_RI_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_14XK_RI_KERNEL -#define BLIS_DPACKM_14XK_RI_KERNEL BLIS_DPACKM_14XK_RI_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_14XK_RI_KERNEL #define BLIS_CPACKM_14XK_RI_KERNEL BLIS_CPACKM_14XK_RI_KERNEL_REF #endif @@ -224,14 +168,6 @@ // packm_16xk_ri kernels -#ifndef BLIS_SPACKM_16XK_RI_KERNEL -#define BLIS_SPACKM_16XK_RI_KERNEL BLIS_SPACKM_16XK_RI_KERNEL_REF -#endif - -#ifndef BLIS_DPACKM_16XK_RI_KERNEL -#define BLIS_DPACKM_16XK_RI_KERNEL BLIS_DPACKM_16XK_RI_KERNEL_REF -#endif - #ifndef BLIS_CPACKM_16XK_RI_KERNEL #define BLIS_CPACKM_16XK_RI_KERNEL BLIS_CPACKM_16XK_RI_KERNEL_REF #endif diff --git a/frame/include/bli_kernel_pre_macro_defs.h b/frame/include/bli_kernel_pre_macro_defs.h index 9f42af9ee..9c8bcadef 100644 --- a/frame/include/bli_kernel_pre_macro_defs.h +++ b/frame/include/bli_kernel_pre_macro_defs.h @@ -196,113 +196,81 @@ // packm_2xk_ri kernels -#define BLIS_SPACKM_2XK_RI_KERNEL_REF bli_spackm_ref_2xk_ri -#define BLIS_DPACKM_2XK_RI_KERNEL_REF bli_dpackm_ref_2xk_ri #define BLIS_CPACKM_2XK_RI_KERNEL_REF bli_cpackm_ref_2xk_ri #define BLIS_ZPACKM_2XK_RI_KERNEL_REF bli_zpackm_ref_2xk_ri // packm_4xk_ri kernels -#define BLIS_SPACKM_4XK_RI_KERNEL_REF bli_spackm_ref_4xk_ri -#define BLIS_DPACKM_4XK_RI_KERNEL_REF bli_dpackm_ref_4xk_ri #define BLIS_CPACKM_4XK_RI_KERNEL_REF bli_cpackm_ref_4xk_ri #define BLIS_ZPACKM_4XK_RI_KERNEL_REF bli_zpackm_ref_4xk_ri // packm_6xk_ri kernels -#define BLIS_SPACKM_6XK_RI_KERNEL_REF bli_spackm_ref_6xk_ri -#define BLIS_DPACKM_6XK_RI_KERNEL_REF bli_dpackm_ref_6xk_ri #define BLIS_CPACKM_6XK_RI_KERNEL_REF bli_cpackm_ref_6xk_ri #define BLIS_ZPACKM_6XK_RI_KERNEL_REF bli_zpackm_ref_6xk_ri // packm_8xk_ri kernels -#define BLIS_SPACKM_8XK_RI_KERNEL_REF bli_spackm_ref_8xk_ri -#define BLIS_DPACKM_8XK_RI_KERNEL_REF bli_dpackm_ref_8xk_ri #define BLIS_CPACKM_8XK_RI_KERNEL_REF bli_cpackm_ref_8xk_ri #define BLIS_ZPACKM_8XK_RI_KERNEL_REF bli_zpackm_ref_8xk_ri // packm_10xk_ri kernels -#define BLIS_SPACKM_10XK_RI_KERNEL_REF bli_spackm_ref_10xk_ri -#define BLIS_DPACKM_10XK_RI_KERNEL_REF bli_dpackm_ref_10xk_ri #define BLIS_CPACKM_10XK_RI_KERNEL_REF bli_cpackm_ref_10xk_ri #define BLIS_ZPACKM_10XK_RI_KERNEL_REF bli_zpackm_ref_10xk_ri // packm_12xk_ri kernels -#define BLIS_SPACKM_12XK_RI_KERNEL_REF bli_spackm_ref_12xk_ri -#define BLIS_DPACKM_12XK_RI_KERNEL_REF bli_dpackm_ref_12xk_ri #define BLIS_CPACKM_12XK_RI_KERNEL_REF bli_cpackm_ref_12xk_ri #define BLIS_ZPACKM_12XK_RI_KERNEL_REF bli_zpackm_ref_12xk_ri // packm_14xk_ri kernels -#define BLIS_SPACKM_14XK_RI_KERNEL_REF bli_spackm_ref_14xk_ri -#define BLIS_DPACKM_14XK_RI_KERNEL_REF bli_dpackm_ref_14xk_ri #define BLIS_CPACKM_14XK_RI_KERNEL_REF bli_cpackm_ref_14xk_ri #define BLIS_ZPACKM_14XK_RI_KERNEL_REF bli_zpackm_ref_14xk_ri // packm_16xk_ri kernels -#define BLIS_SPACKM_16XK_RI_KERNEL_REF bli_spackm_ref_16xk_ri -#define BLIS_DPACKM_16XK_RI_KERNEL_REF bli_dpackm_ref_16xk_ri #define BLIS_CPACKM_16XK_RI_KERNEL_REF bli_cpackm_ref_16xk_ri #define BLIS_ZPACKM_16XK_RI_KERNEL_REF bli_zpackm_ref_16xk_ri // packm_2xk_ri3 kernels -#define BLIS_SPACKM_2XK_RI3_KERNEL_REF bli_spackm_ref_2xk_ri3 -#define BLIS_DPACKM_2XK_RI3_KERNEL_REF bli_dpackm_ref_2xk_ri3 #define BLIS_CPACKM_2XK_RI3_KERNEL_REF bli_cpackm_ref_2xk_ri3 #define BLIS_ZPACKM_2XK_RI3_KERNEL_REF bli_zpackm_ref_2xk_ri3 // packm_4xk_ri3 kernels -#define BLIS_SPACKM_4XK_RI3_KERNEL_REF bli_spackm_ref_4xk_ri3 -#define BLIS_DPACKM_4XK_RI3_KERNEL_REF bli_dpackm_ref_4xk_ri3 #define BLIS_CPACKM_4XK_RI3_KERNEL_REF bli_cpackm_ref_4xk_ri3 #define BLIS_ZPACKM_4XK_RI3_KERNEL_REF bli_zpackm_ref_4xk_ri3 // packm_6xk_ri3 kernels -#define BLIS_SPACKM_6XK_RI3_KERNEL_REF bli_spackm_ref_6xk_ri3 -#define BLIS_DPACKM_6XK_RI3_KERNEL_REF bli_dpackm_ref_6xk_ri3 #define BLIS_CPACKM_6XK_RI3_KERNEL_REF bli_cpackm_ref_6xk_ri3 #define BLIS_ZPACKM_6XK_RI3_KERNEL_REF bli_zpackm_ref_6xk_ri3 // packm_8xk_ri3 kernels -#define BLIS_SPACKM_8XK_RI3_KERNEL_REF bli_spackm_ref_8xk_ri3 -#define BLIS_DPACKM_8XK_RI3_KERNEL_REF bli_dpackm_ref_8xk_ri3 #define BLIS_CPACKM_8XK_RI3_KERNEL_REF bli_cpackm_ref_8xk_ri3 #define BLIS_ZPACKM_8XK_RI3_KERNEL_REF bli_zpackm_ref_8xk_ri3 // packm_10xk_ri3 kernels -#define BLIS_SPACKM_10XK_RI3_KERNEL_REF bli_spackm_ref_10xk_ri3 -#define BLIS_DPACKM_10XK_RI3_KERNEL_REF bli_dpackm_ref_10xk_ri3 #define BLIS_CPACKM_10XK_RI3_KERNEL_REF bli_cpackm_ref_10xk_ri3 #define BLIS_ZPACKM_10XK_RI3_KERNEL_REF bli_zpackm_ref_10xk_ri3 // packm_12xk_ri3 kernels -#define BLIS_SPACKM_12XK_RI3_KERNEL_REF bli_spackm_ref_12xk_ri3 -#define BLIS_DPACKM_12XK_RI3_KERNEL_REF bli_dpackm_ref_12xk_ri3 #define BLIS_CPACKM_12XK_RI3_KERNEL_REF bli_cpackm_ref_12xk_ri3 #define BLIS_ZPACKM_12XK_RI3_KERNEL_REF bli_zpackm_ref_12xk_ri3 // packm_14xk_ri3 kernels -#define BLIS_SPACKM_14XK_RI3_KERNEL_REF bli_spackm_ref_14xk_ri3 -#define BLIS_DPACKM_14XK_RI3_KERNEL_REF bli_dpackm_ref_14xk_ri3 #define BLIS_CPACKM_14XK_RI3_KERNEL_REF bli_cpackm_ref_14xk_ri3 #define BLIS_ZPACKM_14XK_RI3_KERNEL_REF bli_zpackm_ref_14xk_ri3 // packm_16xk_ri3 kernels -#define BLIS_SPACKM_16XK_RI3_KERNEL_REF bli_spackm_ref_16xk_ri3 -#define BLIS_DPACKM_16XK_RI3_KERNEL_REF bli_dpackm_ref_16xk_ri3 #define BLIS_CPACKM_16XK_RI3_KERNEL_REF bli_cpackm_ref_16xk_ri3 #define BLIS_ZPACKM_16XK_RI3_KERNEL_REF bli_zpackm_ref_16xk_ri3