Unifying BLIS Windows and Linux codebase

1. Removed dependency on bli_config.h inclusion in blis.h
 2. Provided AOCL DYNAMIC / TRSM PRE INVERSION / COMPLEX RETURN configuration flags.
 3. CMAKE changes to incorporate new changes as per 3.1 code base.
 4. Removed zen2 folder from Windows directory.

AMD Internal : [CPUPL-1532]

Change-Id: I9261851087d10f73ab563d466fa3f7bb72ddee47

CMakeLists.txt

@@ -85,20 +85,33 @@ option(ENABLE_MEMKIND "libmemkind for manage memory pools" OFF)
 option(ENABLE_PRAGMA_OMP_SIMD "pragma openmp simd" ON)
 option(ENABLE_SANDBOX "Sandbox implementation for gemm" OFF)
 option(BLIS_ENABLE_ILP64 "ENABLE BLIS ILP64" OFF)
-option(ENABLE_INT_TYPE_SIZE "Integer size type" OFF)
+option(ENABLE_INT_TYPE_SIZE " Internal BLIS integers ,used in native BLIS interfaces based on architecture dependent " ON)
 option(ENABLE_BLASTEST "Enable the blastest" OFF)
 option(ENABLE_TESTCPP_TESTING "Enabling testcpp" OFF)
 option (ENABLE_NO_UNDERSCORE_API "export APIs without underscore" ON)
 option (ENABLE_UPPERCASE "export APIs with uppercase" OFF)
+option (ENABLE_COMPLEX_RETURN_INTEL "Enable complex_return_intel" OFF)
+option (ENABLE_TRSM_PREINVERSION "Enable TRSM preinversion" ON)
+option (ENABLE_AOCL_DYNAMIC "Enable Dynamic Multi-threading" OFF)
 
 if(ENABLE_NO_UNDERSCORE_API)
     add_definitions(-DBLIS_ENABLE_NO_UNDERSCORE_API)
 endif()
 
+if(ENABLE_COMPLEX_RETURN_INTEL)
+    set(BLIS_ENABLE_COMPLEX_RETURN_INTEL TRUE)
+else()
+    set(BLIS_DISABLE_COMPLEX_RETURN_INTEL TRUE)
+endif()
+
 if(ENABLE_UPPERCASE)
      add_definitions(-DBLIS_ENABLE_UPPERCASE)
 endif()
 
+if(ENABLE_AOCL_DYNAMIC)
+     set(AOCL_DYNAMIC TRUE)
+endif()
+
 if (BUILD_SHARED_LIBS)
     set(BLIS_ENABLE_SHARED TRUE)
     if(ENABLE_BLASTEST)
@@ -117,9 +130,9 @@ else ()
 endif ()
 
 if (ENABLE_TRSM_PREINVERSION)
-  add_definitions(-DBLIS_ENABLE_TRSM_PREINVERSION)
+  set(BLIS_ENABLE_TRSM_PREINVERSION TRUE)
 else()
-  add_definitions(-DBLIS_DISABLE_TRSM_PREINVERSION)
+  set(BLIS_DISABLE_TRSM_PREINVERSION TRUE)
 endif()
 
 if (ENABLE_INT_TYPE_SIZE)
@@ -131,8 +144,7 @@ else ()
 endif ()
 
 if (BLIS_ENABLE_ILP64 AND NOT ENABLE_INT_TYPE_SIZE)
-    message(FATAL_ERROR "To avoid the possibility of truncation, we do not allow use of 64-bit integers"
-        "in the BLAS API with 32-bit integers in BLIS. Please use a different configuration of integers")
+    message(FATAL_ERROR "for ILP64 we must enable ENABLE_INT_TYPE_SIZE with BLIS_INT_TYPE_SIZE = 64 ")
 endif ()
 
 if (ENABLE_VERBOSE)
@@ -288,7 +300,7 @@ add_definitions(-D_MSC_VER)
 add_definitions(-DBLIS_CNAME=${TARGET_ARCH})
 
 # Generate the bli_config.h header file
-configure_file (build/bli_win_config.h.in ${CMAKE_SOURCE_DIR}/include/${TARGET_ARCH}/bli_config.h @ONLY)
+configure_file (build/bli_win_config.h.in ${CMAKE_SOURCE_DIR}/bli_config.h @ONLY)
 
 include_directories(${CMAKE_SOURCE_DIR}/aocl_dtl)
 include_directories(${CMAKE_SOURCE_DIR}/.)
@@ -373,6 +385,7 @@ include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/1m)
 include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/2)
 include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/3)
 include_directories(${CMAKE_SOURCE_DIR}/kernels/zen/3/sup)
+include_directories(${CMAKE_SOURCE_DIR}/kernels/zen2)
 
 file(GLOB headers ${CMAKE_SOURCE_DIR}/*.h)
 
@@ -462,6 +475,7 @@ endif ()
     " ${CMAKE_CURRENT_SOURCE_DIR}/frame/thread/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/frame/util/"
     " ${CMAKE_CURRENT_SOURCE_DIR}/aocl_dtl/"
+    " ${CMAKE_CURRENT_SOURCE_DIR}/"
 )
 
 file(MAKE_DIRECTORY ${CMAKE_SOURCE_DIR}/include/${TARGET_ARCH})
@@ -491,14 +505,14 @@ set(BLIS_VERSION_STRING ${BLIS_VERSION})
 add_definitions(-DBLIS_VERSION_STRING="${BLIS_VERSION_STRING}")
 
 if(BUILD_SHARED_LIBS)
-    add_library("${PROJECT_NAME}" SHARED ${CMAKE_SOURCE_DIR}/include/${TARGET_ARCH}/bli_config.h
+    add_library("${PROJECT_NAME}" SHARED ${CMAKE_SOURCE_DIR}/bli_config.h
                          ${CMAKE_SOURCE_DIR}/include/${TARGET_ARCH}/blis.h
                          ${headers})
     target_compile_definitions("${PROJECT_NAME}" PUBLIC -DBLIS_IS_BUILDING_LIBRARY)
     set_target_properties("${PROJECT_NAME}" PROPERTIES LINKER_LANGUAGE C OUTPUT_NAME "${LIB_NAME}")
 endif()
 if(NOT BUILD_SHARED_LIBS)
-    add_library("${PROJECT_NAME}" STATIC ${CMAKE_SOURCE_DIR}/include/${TARGET_ARCH}/bli_config.h
+    add_library("${PROJECT_NAME}" STATIC ${CMAKE_SOURCE_DIR}/bli_config.h
                          ${CMAKE_SOURCE_DIR}/include/${TARGET_ARCH}/blis.h
                          ${headers})
     set_target_properties("${PROJECT_NAME}" PROPERTIES LINKER_LANGUAGE C OUTPUT_NAME "${LIB_NAME}")

build/bli_win_config.h.in

@@ -1,10 +1,12 @@
 /*
-
+
  * Copyright (C) 2020-2021, Advanced Micro Devices, Inc. All Rights Reserved
 
  */
 
 
+
+#ifndef BLIS_CONFIG_H
 
 #define BLIS_CONFIG_H
 
@@ -35,10 +37,14 @@
 
 
 #cmakedefine BLIS_ENABLE_SBA_POOLS
+
+
 
 #cmakedefine BLIS_ENABLE_MEM_TRACING
 
 
 
 #cmakedefine BLIS_INT_TYPE_SIZE @INT_TYPE_SIZE@
+
+
 

frame/include/bli_macro_defs.h

@@ -5,8 +5,7 @@
    libraries.
 
    Copyright (C) 2014, The University of Texas at Austin
-   Copyright (C) 2018 - 2020, Advanced Micro Devices, Inc.
-   Copyright (C) 2021, Advanced Micro Devices, Inc. All rights reserved.
+   Copyright (C) 2018-2021, 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
@@ -207,7 +206,11 @@
 #define ccopy_  ccopy 
 #define zcopy_  zcopy 
 #define sdot_   sdot 
-#define ddot_   ddot 
+#define ddot_   ddot
+#define cdotc_  cdotc
+#define zdotc_  zdotc
+#define cdotu_  cdotu
+#define zdotu_  zdotu
 #define snrm2_  snrm2
 #define dnrm2_  dnrm2
 #define scnrm2_ scnrm2
@@ -264,7 +267,11 @@
 #define cgemm_  cgemm 
 #define zgemm_  zgemm 
 #define chemm_  chemm 
-#define zhemm_  zhemm 
+#define zhemm_  zhemm
+#define dgemmt_ dgemmt
+#define sgemmt_ sgemmt
+#define zgemmt_ zgemmt
+#define cgemmt_ cgemmt
 #define cher2k_ cher2k
 #define zher2k_ zher2k
 #define cherk_  cherk

kernels/haswell/1m/CMakeLists.txt

@@ -0,0 +1,13 @@
+##Copyright (C) 2020-2021, Advanced Micro Devices, Inc. All rights reserved.##
+
+target_sources("${PROJECT_NAME}" 
+     PRIVATE
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_c3xk.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_c8xk.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_d6xk.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_d8xk.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_s16xk.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_s6xk.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_z3xk.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_z4xk.c
+ )

kernels/haswell/3/sup/CMakeLists.txt

@@ -1,11 +1,16 @@
-##Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.##
+##Copyright (C) 2020-2021, Advanced Micro Devices, Inc. All rights reserved.##
 
 target_sources("${PROJECT_NAME}" 
      PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_d6x8m.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_d6x8n.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_d6x8m.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_d6x8n.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_d6x8m.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_d6x8n.c
+     #${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_s6x16m.c
+     #${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_s6x16n.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_d6x8m.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_d6x8n.c
+     #${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_s6x16m.c
+     #${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_s6x16n.c
     )
 add_subdirectory(d6x8)
+#add_subdirectory(s6x16)
 

kernels/haswell/3/sup/d6x8/CMakeLists.txt

@@ -1,18 +1,16 @@
-##Copyright (C) 2020, Advanced Micro Devices, Inc.## 
+##Copyright (C) 2020-2021, Advanced Micro Devices, Inc. All rights reserved.## 
 
 target_sources("${PROJECT_NAME}" 
      PRIVATE
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_r_haswell_ref_dMx1.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_dMx1.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_dMx2.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_dMx4.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_dMx8.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_dMx2.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_dMx4.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_dMx6.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_dMx8.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_d6xk.c
-     ${CMAKE_CURRENT_SOURCE_DIR}/bli_packm_haswell_asm_d8xk.c
- )
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_r_haswell_ref_dMx1.c
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_dMx1.c
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_dMx2.c
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_dMx4.c
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_dMx8.c
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_dMx2.c
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_dMx4.c
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_dMx6.c
+${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_dMx8.c
+    )
 
 

kernels/haswell/3/sup/s6x16/CMakeLists.txt

@@ -0,0 +1,20 @@
+##Copyright (C) 2020-2021, Advanced Micro Devices, Inc. All rights reserved.## 
+
+target_sources("${PROJECT_NAME}" 
+     PRIVATE
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_r_haswell_ref_sMx1.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_sMx1.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_sMx12.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_sMx16.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_sMx2.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_sMx4.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rd_haswell_asm_sMx8.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_sMx12.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_sMx16.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_sMx2.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_sMx4.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_sMx6.c
+     ${CMAKE_CURRENT_SOURCE_DIR}/bli_gemmsup_rv_haswell_asm_sMx8.c
+ )
+
+

kernels/haswell/CMakeLists.txt

@@ -1,4 +1,5 @@
-##Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.##
+##Copyright (C) 2020-2021, Advanced Micro Devices, Inc. All rights reserved.##
 
 add_subdirectory(3)
+add_subdirectory(1m)
 

kernels/zen/1f/CMakeLists.txt

@@ -1,8 +1,9 @@
-##Copyright (C) 2020, Advanced Micro Devices, Inc. All rights reserved.##
+##Copyright (C) 2020-2021, Advanced Micro Devices, Inc. All rights reserved.##
 
 target_sources("${PROJECT_NAME}"
      PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/bli_axpyf_zen_int_8.c
     ${CMAKE_CURRENT_SOURCE_DIR}/bli_dotxf_zen_int_8.c
     ${CMAKE_CURRENT_SOURCE_DIR}/bli_axpyf_zen_int_5.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/bli_axpyf_zen_int_4.c
     )

windows/zen2/bli_config.h

@@ -1,180 +0,0 @@
-/*
-
-   BLIS
-   An object-based framework for developing high-performance BLAS-like
-   libraries.
-
-   Copyright (C) 2014, The University of Texas at Austin
-   Copyright (C) 2018 - 2019, Advanced Micro Devices, Inc.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-    - Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    - Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    - Neither the name(s) of the copyright holder(s) nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*/
-
-#ifndef BLIS_CONFIG_H
-#define BLIS_CONFIG_H
-
-// Enabled configuration "family" (config_name)
-#define BLIS_FAMILY_ZEN2
-
-
-// Enabled sub-configurations (config_list)
-#define BLIS_CONFIG_ZEN2
-
-
-// Enabled kernel sets (kernel_list)
-#define BLIS_KERNELS_ZEN2
-#define BLIS_KERNELS_ZEN
-#define BLIS_KERNELS_HASWELL
-
-
-//This macro is enabled only for ZEN family configurations.
-//This enables us to use different cache-blocking sizes for TRSM instead of common level-3 cache-block sizes.
-#if 1
-#define AOCL_BLIS_ZEN
-#endif
-
-#if 0
-#define BLIS_ENABLE_OPENMP
-#endif
-
-#if 0
-#define BLIS_ENABLE_PTHREADS
-#endif
-
-#if 1
-#define BLIS_ENABLE_JRIR_SLAB
-#endif
-
-#if 0
-#define BLIS_ENABLE_JRIR_RR
-#endif
-
-#if 1
-#define BLIS_ENABLE_PBA_POOLS
-#else
-#define BLIS_DISABLE_PBA_POOLS
-#endif
-
-#if 1
-#define BLIS_ENABLE_SBA_POOLS
-#else
-#define BLIS_DISABLE_SBA_POOLS
-#endif
-
-#if 0
-#define BLIS_ENABLE_MEM_TRACING
-#else
-#define BLIS_DISABLE_MEM_TRACING
-#endif
-
-#if 0 == 64
-#define BLIS_INT_TYPE_SIZE 64
-#elif 0 == 32
-#define BLIS_INT_TYPE_SIZE 32
-#else
-// determine automatically
-#endif
-
-#if 32 == 64
-#define BLIS_BLAS_INT_TYPE_SIZE 64
-#elif 32 == 32
-#define BLIS_BLAS_INT_TYPE_SIZE 32
-#else
-// determine automatically
-#endif
-
-#ifndef BLIS_ENABLE_BLAS
-#ifndef BLIS_DISABLE_BLAS
-#if 1
-#define BLIS_ENABLE_BLAS
-#else
-#define BLIS_DISABLE_BLAS
-#endif
-#endif
-#endif
-
-#ifndef BLIS_ENABLE_CBLAS
-#ifndef BLIS_DISABLE_CBLAS
-#if 0
-#define BLIS_ENABLE_CBLAS
-#else
-#define BLIS_DISABLE_CBLAS
-#endif
-#endif
-#endif
-
-#ifndef BLIS_ENABLE_MIXED_DT
-#ifndef BLIS_DISABLE_MIXED_DT
-#if 1
-#define BLIS_ENABLE_MIXED_DT
-#else
-#define BLIS_DISABLE_MIXED_DT
-#endif
-#endif
-#endif
-
-#ifndef BLIS_ENABLE_MIXED_DT_EXTRA_MEM
-#ifndef BLIS_DISABLE_MIXED_DT_EXTRA_MEM
-#if 1
-#define BLIS_ENABLE_MIXED_DT_EXTRA_MEM
-#else
-#define BLIS_DISABLE_MIXED_DT_EXTRA_MEM
-#endif
-#endif
-#endif
-
-#if 1
-#define BLIS_ENABLE_SUP_HANDLING
-#else
-#define BLIS_DISABLE_SUP_HANDLING
-#endif
-
-#if 0
-#define BLIS_ENABLE_MEMKIND
-#else
-#define BLIS_DISABLE_MEMKIND
-#endif
-
-#if 1
-#define BLIS_ENABLE_PRAGMA_OMP_SIMD
-#else
-#define BLIS_DISABLE_PRAGMA_OMP_SIMD
-#endif
-
-#if 0
-#define BLIS_ENABLE_SANDBOX
-#else
-#define BLIS_DISABLE_SANDBOX
-#endif
-
-#if 1
-#define BLIS_ENABLE_SHARED
-#else
-#define BLIS_DISABLE_SHARED
-#endif
-
-
-#endif