Skip to content

Commit 2fd0e24

Browse files
authored
Merge branch 'OpenMathLib:develop' into issue5713-2
2 parents 3cde598 + 45e5426 commit 2fd0e24

3 files changed

Lines changed: 16 additions & 7 deletions

File tree

cmake/arch.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ if (DYNAMIC_ARCH)
5858
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
5959
set(DYNAMIC_CORE ARMV8 NEOVERSEN1)
6060
if (${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 19 OR (${CMAKE_C_COMPILER_ID} MATCHES AppleClang AND ${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 17) ) # SME ACLE supported in LLVM >= 19 and AppleClang >= 17
61-
set(DYNAMIC_CORE ${DYNAMIC_CORE} ARMV9SME VORTEXM4)
61+
set(DYNAMIC_CORE ${DYNAMIC_CORE} VORTEXM4)
62+
endif()
63+
if (${CMAKE_C_COMPILER_VERSION} VERSION_GREATER_EQUAL 14) # SME ACLE supported in GCC >= 14
64+
set(DYNAMIC_CORE ${DYNAMIC_CORE} ARMV9SME)
6265
endif()
6366
endif()
6467

driver/others/dynamic_arm64.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@
3838
/*********************************************************************/
3939

4040
#include "common.h"
41+
42+
#ifndef _MSC_VER
4143
#include <strings.h>
44+
#else
45+
#define strncasecmp _strnicmp
46+
#endif
47+
4248
#if (defined OS_LINUX || defined OS_ANDROID)
4349
#include <asm/hwcap.h>
4450
#include <sys/auxv.h>

test/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -473,24 +473,24 @@ endif
473473

474474
ifeq ($(BUILD_BFLOAT16),1)
475475
test_bgemm : compare_sgemm_bgemm.c test_helpers.h ../$(LIBNAME)
476-
$(CC) $(CLDFLAGS) -DIBFLOAT16 -DOBFLOAT16 -o test_bgemm compare_sgemm_bgemm.c ../$(LIBNAME) $(EXTRALIB) $(CEXTRALIB)
476+
$(CC) $(CLDFLAGS) -DIBFLOAT16 -DOBFLOAT16 -o test_bgemm compare_sgemm_bgemm.c ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB) $(CEXTRALIB)
477477

478478
test_bgemv : compare_sgemv_bgemv.c ../$(LIBNAME)
479-
$(CC) $(CLDFLAGS) -DIBFLOAT16 -DOBFLOAT16 -o test_bgemv compare_sgemv_bgemv.c ../$(LIBNAME) $(EXTRALIB) $(CEXTRALIB)
479+
$(CC) $(CLDFLAGS) -DIBFLOAT16 -DOBFLOAT16 -o test_bgemv compare_sgemv_bgemv.c ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB) $(CEXTRALIB)
480480

481481
test_sbgemm : compare_sgemm_sbgemm.c test_helpers.h ../$(LIBNAME)
482-
$(CC) $(CLDFLAGS) -DIBFLOAT16 -o test_sbgemm compare_sgemm_sbgemm.c ../$(LIBNAME) $(EXTRALIB) $(CEXTRALIB)
482+
$(CC) $(CLDFLAGS) -DIBFLOAT16 -o test_sbgemm compare_sgemm_sbgemm.c ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB) $(CEXTRALIB)
483483

484484
test_sbgemv : compare_sgemv_sbgemv.c ../$(LIBNAME)
485-
$(CC) $(CLDFLAGS) -DIBFLOAT16 -o test_sbgemv compare_sgemv_sbgemv.c ../$(LIBNAME) $(EXTRALIB) $(CEXTRALIB)
485+
$(CC) $(CLDFLAGS) -DIBFLOAT16 -o test_sbgemv compare_sgemv_sbgemv.c ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB) $(CEXTRALIB)
486486
endif
487487

488488
ifeq ($(BUILD_HFLOAT16),1)
489489
test_shgemm : compare_sgemm_shgemm.c test_helpers.h ../$(LIBNAME)
490-
$(CC) $(CLDFLAGS) -DIHFLOAT16 -o test_shgemm compare_sgemm_shgemm.c ../$(LIBNAME) $(EXTRALIB) $(CEXTRALIB)
490+
$(CC) $(CLDFLAGS) -DIHFLOAT16 -o test_shgemm compare_sgemm_shgemm.c ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB) $(CEXTRALIB)
491491

492492
test_shgemv : compare_sgemv_shgemv.c ../$(LIBNAME)
493-
$(CC) $(CLDFLAGS) -o test_shgemv compare_sgemv_shgemv.c ../$(LIBNAME) $(EXTRALIB) $(CEXTRALIB)
493+
$(CC) $(CLDFLAGS) -o test_shgemv compare_sgemv_shgemv.c ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB) $(CEXTRALIB)
494494
endif
495495

496496

0 commit comments

Comments
 (0)