AOCL 5.2.2 GA Release

Author: kvaragan

CMakeLists.txt

@@ -48,6 +48,10 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+# Packages to include.
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
 # Enable IDE folders for targets.
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -747,14 +751,52 @@ else()
     # Remove duplicates in the addon list, if they exist.
     list(REMOVE_DUPLICATES ENABLE_ADDON)
     message("   Configuring with addons:")
+    # Check compiler version requirements for each addon
+    set(FILTERED_ADDON_LIST "")
     foreach(ADDON ${ENABLE_ADDON})
         message("   ${ADDON}")
         if(NOT (EXISTS ${PROJECT_SOURCE_DIR}/addon/${ADDON}))
             message(FATAL_ERROR "Requested addon sub-directory does not exist! Cannot continue. \
                                     *** Please verify addon existence and name.")
         endif()
+
+        # Check if this is aocl_gemm addon and verify compiler version
+        if("${ADDON}" STREQUAL "aocl_gemm")
+            if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
+                # aocl_gemm addon (LPGEMM) requires GCC 11.2 or newer
+                # due to AVX-512 intrinsics and optimization requirements.
+                if(CMAKE_C_COMPILER_VERSION VERSION_LESS 11.2.0)
+                    message(WARNING "aocl_gemm addon requires GCC 11.2 or newer.")
+                    message(WARNING "Current GCC version is ${CMAKE_C_COMPILER_VERSION}.")
+                    message(WARNING "Skipping aocl_gemm addon.")
+                    continue()
+                endif()
+            elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
+                # aocl_gemm addon (LPGEMM) requires Clang 12.0 or newer
+                # due to AVX-512 intrinsics and C++17 requirements.
+                if(CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0.0)
+                    message(WARNING "aocl_gemm addon requires Clang 12.0 or newer.")
+                    message(WARNING "Current Clang version is ${CMAKE_C_COMPILER_VERSION}.")
+                    message(WARNING "Skipping aocl_gemm addon.")
+                    continue()
+                endif()
+            endif()
+        endif()
+        list(APPEND FILTERED_ADDON_LIST ${ADDON})
     endforeach()
-    set(ENABLE_ADDONS_01 1)
+
+    # Update ENABLE_ADDON with filtered list
+    set(ENABLE_ADDON ${FILTERED_ADDON_LIST})
+    # Also update the cache to reflect the filtered list
+    set(ENABLE_ADDON ${FILTERED_ADDON_LIST} CACHE STRING "Filtered addon list" FORCE)
+    
+    list(LENGTH ENABLE_ADDON addon_count)
+    if(addon_count GREATER 0)
+        set(ENABLE_ADDONS_01 1)
+    else()
+        message("   All addons were filtered out due to compatibility issues.")
+        set(ENABLE_ADDONS_01 0)
+    endif()
 endif()
 cmake_print_variables(ENABLE_SANDBOX)
 if(ENABLE_SANDBOX STREQUAL "")
@@ -1332,69 +1374,133 @@ if(NOT WIN32)
         @ONLY
     )
 endif()
-include(GNUInstallDirs)
 
 if(BUILD_SHARED_LIBS)
-    # Build shared library.
-    add_library(libblis-shared SHARED ${OBJECT_LIBRARIES})
-    target_link_libraries(libblis-shared PRIVATE ${LDFLAGS})
-    set_target_properties(libblis-shared PROPERTIES LINKER_LANGUAGE C VERSION ${VERSION} SOVERSION ${SO_VERSION_MAJOR})
-    set_target_properties(libblis-shared PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    if(THREADING_MODEL STREQUAL "openmp")
-        if((NOT ${OpenMP_libomp_LIBRARY} STREQUAL "") AND (NOT WIN32))
-            target_link_libraries(libblis-shared PRIVATE ${OpenMP_libomp_LIBRARY})
-        else()
-            target_link_libraries(libblis-shared PRIVATE OpenMP::OpenMP_C)
-        endif()
-    endif()
-    add_dependencies(libblis-shared flat-header)
-    if(ENABLE_CBLAS)
-        add_dependencies(libblis-shared flat-cblas-header)
-    endif()
-    # Add headers as a property to the library.
-    set_target_properties(libblis-shared PROPERTIES PUBLIC_HEADER "${BLIS_PUBLIC_HEADERS}")
-    set_target_properties(libblis-shared PROPERTIES OUTPUT_NAME ${LIBBLIS_SHARED})
-    # Install targets for shared.
-    install(TARGETS libblis-shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-            RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-            PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-    set(libblis_depends libblis-shared)
+    # Build shared library with proper target name
+    add_library(blis_shared SHARED ${OBJECT_LIBRARIES})
+    set_target_properties(blis_shared PROPERTIES
+                        VERSION ${VERSION}
+                        SOVERSION ${SO_VERSION_MAJOR}
+                        OUTPUT_NAME ${LIBBLIS_SHARED}
+                    )
 endif()
 if(BUILD_STATIC_LIBS OR NOT BUILD_SHARED_LIBS)
-    # Build static library.
-    add_library(libblis-static STATIC ${OBJECT_LIBRARIES})
-    set_target_properties(libblis-static PROPERTIES LINKER_LANGUAGE C)
-    # Setting this for static to fix issues where test programs built with gcc 9.4.0 fail to link versions of BLIS build with AOCC 4.0.0.
-    set_target_properties(libblis-static PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    add_dependencies(libblis-static flat-header)
-    if(ENABLE_CBLAS)
-        add_dependencies(libblis-static flat-cblas-header)
+    # Build static library with proper target name.
+    add_library(blis_static STATIC ${OBJECT_LIBRARIES})
+    set_target_properties(blis_static PROPERTIES
+                        OUTPUT_NAME ${LIBBLIS_STATIC}
+                    )
+endif()
+
+# Create the main blis target that points to the preferred library type
+# Priority: shared if available, otherwise static
+if(BUILD_SHARED_LIBS AND TARGET blis_shared)
+    add_library(blis ALIAS blis_shared)
+    # Create the AOCL::BLIS alias pointing directly to the real target
+    add_library(AOCL::BLIS ALIAS blis_shared) # Point to real target, not alias
+    # Create the AOCL::BLAS alias pointing directly to the real target
+    add_library(AOCL::BLAS ALIAS blis_shared) # Point to real target, not alias
+elseif(TARGET blis_static)
+    add_library(blis ALIAS blis_static)
+    # Create the AOCL::BLIS alias pointing directly to the real target
+    add_library(AOCL::BLIS ALIAS blis_static) # Point to real target, not alias
+    # Create the AOCL::BLAS alias pointing directly to the real target
+    add_library(AOCL::BLAS ALIAS blis_static) # Point to real target, not alias
+endif()
+
+# Also create specific aliases for explicit usage
+if(TARGET blis_shared)
+    add_library(AOCL::BLIS_shared ALIAS blis_shared)
+    # Create the AOCL::BLAS_shared alias as well
+    add_library(AOCL::BLAS_shared ALIAS blis_shared)
+endif()
+if(TARGET blis_static)
+    add_library(AOCL::BLIS_static ALIAS blis_static)
+    # Create the AOCL::BLAS_static alias as well
+    add_library(AOCL::BLAS_static ALIAS blis_static)
+endif()
+
+foreach(target IN ITEMS blis_shared blis_static)
+    if(TARGET ${target})
+        target_include_directories(${target}
+            PUBLIC
+                $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include/${BLIS_CONFIG_FAMILY}>
+                $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+            PRIVATE
+                $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/frame/include>
+        )
+
+        add_dependencies(${target} flat-header)
+        if(ENABLE_CBLAS)
+            add_dependencies(${target} flat-cblas-header)
+        endif()
+
+        target_link_libraries(${target} PUBLIC ${LDFLAGS})
+
+        if(THREADING_MODEL STREQUAL "openmp")
+            if((NOT ${OpenMP_libomp_LIBRARY} STREQUAL "") AND (NOT WIN32))
+                target_link_libraries(${target} PUBLIC ${OpenMP_libomp_LIBRARY})
+            else()
+                target_link_libraries(${target} PUBLIC OpenMP::OpenMP_C)
+            endif()
+        endif()
+
+        set_target_properties(${target} PROPERTIES
+                    LINKER_LANGUAGE C
+                    POSITION_INDEPENDENT_CODE ON
+                )
     endif()
-    # Add headers as a property to the library.
-    set_target_properties(libblis-static PROPERTIES PUBLIC_HEADER "${BLIS_PUBLIC_HEADERS}")
-    set_target_properties(libblis-static PROPERTIES OUTPUT_NAME ${LIBBLIS_STATIC})
-    # Install targets.
-    install(TARGETS libblis-static LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-            ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-            RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
-            PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-    list(APPEND libblis_depends libblis-static)
+endforeach()
+
+# Installation rules
+if(BUILD_SHARED_LIBS AND TARGET blis_shared)
+    install(TARGETS blis_shared
+        EXPORT blisTargets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+        RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+        INCLUDES DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+    )
 endif()
 
+if((BUILD_STATIC_LIBS OR NOT BUILD_SHARED_LIBS) AND TARGET blis_static)
+    install(TARGETS blis_static
+        EXPORT blisTargets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+        RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+        INCLUDES DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+    )
+endif()
+
+# Install headers
+install(FILES ${BLIS_PUBLIC_HEADERS}
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+)
+
 if(NOT WIN32)
     # Install package-config file.
     install(FILES ${CMAKE_BINARY_DIR}/${PC_OUT_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
 endif()
 
 # Set libblis to the shared or static libblis depending on the option setting.
-if(TEST_WITH_SHARED)
-    set(libblis_link libblis-shared)
+if(TEST_WITH_SHARED AND TARGET blis_shared)
+    set(libblis_link blis_shared)
+elseif(TARGET blis_static)
+    set(libblis_link blis_static)
 else()
-    set(libblis_link libblis-static)
+    message(FATAL_ERROR "No suitable BLIS library target found")
 endif()
 
 # --- Primary targets ---
+set(libblis_depends "")
+if(TARGET blis_shared)
+    list(APPEND libblis_depends blis_shared)
+endif()
+if(TARGET blis_static)
+    list(APPEND libblis_depends blis_static)
+endif()
+
 add_custom_target(libblis DEPENDS ${libblis_depends})
 add_custom_target(libs DEPENDS ${libblis})
 

Makefile

@@ -1247,6 +1247,10 @@ endif # ifeq ($(IS_WIN),no)
 # --- Query current configuration ---
 
 showconfig: check-env
+	@echo "CC (C compiler):             $(CC)"
+	@echo "CXX (C++ compiler):          $(CXX)"
+	@echo "CFLAGS:                      $(CFLAGS)"
+	@echo "-------------------------"
 	@echo "configuration family:        $(CONFIG_NAME)"
 	@echo "sub-configurations:          $(CONFIG_LIST)"
 	@echo "requisite kernels sets:      $(KERNEL_LIST)"

addon/CMakeLists.txt

@@ -166,10 +166,11 @@ function(generate_addon_targets addon_target)
         set_target_properties(${addon_target}_C99_KERNEL_ADDON PROPERTIES FOLDER object-libs-targets)
     endif()
 
-    if(("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_LESS 11.2.0))
-        # Collect all subdirectory paths that have at least one file with suffix in ADDON_CXX_SUFS list.
-        get_filepaths_with_suffixes(LOCAL_SOURCE_CXX_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${addon_target}" "${ADDON_CXX_SUFS}")
-    endif()
+    # Note: C++ files (JIT code) are not collected here.
+    # The main CMakeLists.txt already filters out aocl_gemm addon for compilers
+    # that don't support BF16 intrinsics (GCC < 11.2, Clang < 12.0).
+    # For supported compilers, we only use C files with intrinsics, not JIT.
+    set(LOCAL_SOURCE_CXX_FILES "")
 
     # Only generate the object library if there is at least one source file.
     list(LENGTH LOCAL_SOURCE_CXX_FILES size)

addon/aocl_gemm/frame/bf16bf16f32/lpgemm_bf16.c

@@ -343,7 +343,8 @@ LPGEMM_5LOOP_AVX512BF16(bfloat16,bfloat16,float,bf16bf16f32of32)
 #if (defined(BLIS_KERNELS_ZEN4) && (!defined(LPGEMM_BF16_JIT)))
 	// Handle using LPGEMV when m or/and n equal to 1
 	// The avx512 check will be removed when avx2 kernels added in future
-	if ( (n == 1) || ( m == 1 ) )
+	// Avoiding m == 1 rerouting on AVX512 codepath for now
+	if ( n == 1 )
 	{
 		lpgemv_rowvar_bf16bf16f32of32( m, n, k,
 		                               a, rs_a, cs_a, mtag_a,

bench/Makefile

@@ -94,7 +94,7 @@ endif
 #BLIS_LIB       := $(BLIS_LIB_PATH)/libblis-mt.a
 
 # BLAS library path(s). This is where the BLAS libraries reside.
-BLAS_LIB_PATH  := $(HOME)/mylibs/openblas/lib
+BLAS_LIB_PATH  := /usr/lib/x86_64-linux-gnu
 
 MKL_LIB_PATH   := ${MKLROOT}/lib/intel64
 

bench/bench_amaxv.c

@@ -94,6 +94,10 @@ int main( int argc, char** argv )
         printf("Error opening output file %s\n", argv[2]);
         exit(1);
     }
+    if (argc > 3)
+    {
+        n_repeats = atoi(argv[3]);
+    }
 
     fprintf(fout, "Func Dt n incx max_index gflops\n");
 
@@ -102,7 +106,7 @@ int main( int argc, char** argv )
     char tmp[256]; // to store function name, line no present in logs.
 
     // {S,D,C,Z} {n incx}
-    while (fscanf(fin, "%s %c " INT_FS INT_FS " \n",
+    while (fscanf(fin, "%s %c " INT_FS INT_FS"%*[^\n]",
         tmp, &dt_ch, &n, &incx) == 4)
     {
 

bench/bench_asumv.c

@@ -67,25 +67,29 @@ int main( int argc, char** argv )
     FILE* fin  = NULL;
     FILE* fout = NULL;
 
-    n_repeats = N_REPEAT;  // This macro will get from Makefile.
+    n_repeats = N_REPEAT; // This macro will get from Makefile.
 
     if (argc < 3)
-      {
-        printf("Usage: ./test_asumv_XX.x input.csv output.csv\n");
-        exit(1);
-      }
+    {
+      printf("Usage: ./test_asumv_XX.x input.csv output.csv\n");
+      exit(1);
+    }
     fin = fopen(argv[1], "r");
     if (fin == NULL)
-      {
-        printf("Error opening the file %s\n", argv[1]);
-        exit(1);
-      }
+    {
+      printf("Error opening the file %s\n", argv[1]);
+      exit(1);
+    }
     fout = fopen(argv[2], "w");
     if (fout == NULL)
-      {
-        printf("Error opening output file %s\n", argv[2]);
-        exit(1);
-      }
+    {
+      printf("Error opening output file %s\n", argv[2]);
+      exit(1);
+    }
+    if (argc > 3)
+    {
+      n_repeats = atoi(argv[3]);
+    }
 
     fprintf(fout, "Func Dt n incx gflops\n");
 
@@ -95,7 +99,7 @@ int main( int argc, char** argv )
 
 
     // {S,D,C,Z} {n incx}
-    while (fscanf(fin, "%s %c " INT_FS INT_FS "\n",
+    while (fscanf(fin, "%s %c " INT_FS INT_FS"%*[^\n]",
         tmp, &dt_ch, &n, &incx) == 4)
       {
 

bench/bench_axpbyv.c

@@ -83,6 +83,10 @@ int main( int argc, char** argv )
 		printf( "Error opening output file %s\n", argv[2] );
 		exit( 1 );
 	}
+	if (argc > 3)
+    {
+      n_repeats = atoi(argv[3]);
+    }
 
 #ifdef DEBUG
 	fprintf( fout, "gflops\n" );
@@ -98,7 +102,7 @@ int main( int argc, char** argv )
 
 	// {function name} {S, D, C, Z} {n} 
 	// {alpha_r} {alpha_i} {incx} {beta_r} {beta_i} {incy}
-	while ( fscanf( fin, "%s %c " INT_FS " %lf %lf " INT_FS " %lf %lf " INT_FS "\n",
+	while ( fscanf( fin, "%s %c " INT_FS " %lf %lf " INT_FS " %lf %lf " INT_FS"%*[^\n]",
 			tmp, &dt_ch, &n,
 			&alpha_r, &alpha_i, &incx, &beta_r, &beta_i, &incy ) == 9 )
 	{