@@ -143,7 +143,7 @@ AS_IF([test "x$enable_psm3_rc" = "xcheck"],
143143AS_IF ( [ test "x$enable_psm3_rc" = "xyes"] ,
144144 [
145145 AS_IF ( [ test "x$enable_psm3_verbs" = "xyes"] ,
146- [ CPPFLAGS="$CPPFLAGS -DUSE_RC"] ,
146+ [ CPPFLAGS="$CPPFLAGS -DUSE_RC -DUSE_RDMA_READ "] ,
147147 [ AC_MSG_ERROR ( [ User RC QPs requires Verbs HAL active] ) ] )
148148 ] )
149149AS_IF ( [ test "x$enable_psm3_src" = "xyes"] ,
@@ -690,21 +690,25 @@ AS_IF([test "$have_oneapi_ze" = "1"],
690690 LIBS="$LIBS $ze_LIBS"
691691
692692 dnl - Check for zeMemPutIpcHandle after ZE added to LIBS/*FLAGS
693+ save_LDFLAGS="$LDFLAGS"
694+ LDFLAGS="$LDFLAGS -lze_loader"
693695 AC_MSG_CHECKING ( [ for zeMemPutIpcHandle support in level-zero] )
694696 AC_LINK_IFELSE (
695697 [ AC_LANG_PROGRAM ( [ [
696698 #include <level_zero/ze_api.h>
697699 ] ] ,[ [
698- ze_context_handle_t hContext;
700+ ze_context_handle_t hContext = NULL ;
699701 ze_ipc_mem_handle_t handle;
700702 (void)zeMemPutIpcHandle(hContext, handle);
701703 ] ] )
702704 ] ,[
703705 AC_MSG_RESULT ( yes )
704706 have_oneapi_zeMemPutIpcHandle=1
705707 CPPFLAGS="$CPPFLAGS -DPSM_HAVE_ONEAPI_ZE_PUT_IPCHANDLE"
708+ LDFLAGS="$save_LDFLAGS"
706709 ] ,[
707710 AC_MSG_RESULT ( no )
711+ LDFLAGS="$save_LDFLAGS"
708712 ] )
709713 ] )
710714
@@ -910,12 +914,9 @@ AS_IF([test ! -z "$CC" && ( test "x${CC%% *}" = "xicc" || test "x${CC%% *}" = "x
910914 [ dnl ICC/ICX
911915 CFLAGS="$CFLAGS -Werror -xATOM_SSE4.2 -DPSM_AVX512 -fpic -fPIC -D_GNU_SOURCE -DPACK_STRUCT_STL=packed,"
912916 LDFLAGS="$LDFLAGS -Wc,-static-intel"
913- PSM3_MARCH="avx2"
914917 ] , [ dnl GCC/other
915- CFLAGS="$CFLAGS -Werror -mavx2 -fpic -fPIC -funwind-tables -Wformat -Wformat-security"
916- PSM3_MARCH="avx2"
918+ CFLAGS="$CFLAGS -Werror -msse4.2 -fpic -fPIC -funwind-tables -Wformat -Wformat-security"
917919 ] )
918- AC_DEFINE_UNQUOTED ( [ PSM3_MARCH] , [ "$PSM3_MARCH"] , [ PSM3 built with instruction set] )
919920AS_IF ( [ test ! -z "$PSM_CPPFLAGS"] , [ CPPFLAGS="$CPPFLAGS $PSM_CPPFLAGS"] , [ ] )
920921AS_IF ( [ test ! -z "$PSM_CFLAGS"] , [ CFLAGS="$CFLAGS $PSM_CFLAGS"] , [ ] )
921922
@@ -936,12 +937,10 @@ AC_DEFINE([HAVE_XPMEM], 0, [Ignore HAVE_XPMEM])
936937
937938dnl Provider-specific checks
938939dnl FI_PROVIDER_INIT
939- AC_DEFINE ( [ HAVE_BGQ ] , 0 , [ Ignore HAVE_BGQ ] )
940- AC_DEFINE ( [ HAVE_BGQ_DL ] , 0 , [ Ignore HAVE_BGQ_DL ] )
940+ AC_DEFINE ( [ HAVE_CXI ] , 0 , [ Ignore HAVE_CXI ] )
941+ AC_DEFINE ( [ HAVE_CXI_DL ] , 0 , [ Ignore HAVE_CXI_DL ] )
941942AC_DEFINE ( [ HAVE_EFA] , 0 , [ Ignore HAVE_EFA] )
942943AC_DEFINE ( [ HAVE_EFA_DL] , 0 , [ Ignore HAVE_EFA_DL] )
943- AC_DEFINE ( [ HAVE_GNI] , 0 , [ Ignore HAVE_GNI] )
944- AC_DEFINE ( [ HAVE_GNI_DL] , 0 , [ Ignore HAVE_GNI_DL] )
945944AC_DEFINE ( [ HAVE_MRAIL] , 0 , [ Ignore HAVE_MRAIL] )
946945AC_DEFINE ( [ HAVE_MRAIL_DL] , 0 , [ Ignore HAVE_MRAIL_DL] )
947946AC_DEFINE ( [ HAVE_NET] , 0 , [ Ignore HAVE_NET] )
@@ -954,8 +953,6 @@ AC_DEFINE([HAVE_PSM2_DL], 0, [Ignore HAVE_PSM2_DL])
954953dnl FI_PROVIDER_SETUP([psm3])
955954AC_DEFINE ( [ HAVE_OPX] , 0 , [ Ignore HAVE_OPX] )
956955AC_DEFINE ( [ HAVE_OPX_DL] , 0 , [ Ignore HAVE_OPX_DL] )
957- AC_DEFINE ( [ HAVE_RSTREAM] , 0 , [ Ignore HAVE_RSTREAM] )
958- AC_DEFINE ( [ HAVE_RSTREAM_DL] , 0 , [ Ignore HAVE_RSTREAM_DL] )
959956AC_DEFINE ( [ HAVE_RXD] , 0 , [ Ignore HAVE_RXD] )
960957AC_DEFINE ( [ HAVE_RXD_DL] , 0 , [ Ignore HAVE_RXD_DL] )
961958AC_DEFINE ( [ HAVE_RXM] , 0 , [ Ignore HAVE_RXM] )
@@ -974,8 +971,6 @@ AC_DEFINE([HAVE_UCX], 0, [Ignore HAVE_UCX])
974971AC_DEFINE ( [ HAVE_UCX_DL] , 0 , [ Ignore HAVE_UCX_DL] )
975972AC_DEFINE ( [ HAVE_UDP] , 0 , [ Ignore HAVE_UDP] )
976973AC_DEFINE ( [ HAVE_UDP_DL] , 0 , [ Ignore HAVE_UDP_DL] )
977- AC_DEFINE ( [ HAVE_USNIC] , 0 , [ Ignore HAVE_USNIC] )
978- AC_DEFINE ( [ HAVE_USNIC_DL] , 0 , [ Ignore HAVE_USNIC_DL] )
979974AC_DEFINE ( [ HAVE_VERBS] , 0 , [ Ignore HAVE_VERBS] )
980975AC_DEFINE ( [ HAVE_VERBS_DL] , 0 , [ Ignore HAVE_VERBS_DL] )
981976dnl FI_PROVIDER_FINI
@@ -991,8 +986,12 @@ AM_COND_IF([HAVE_PSM3_SRC],
991986 AS_IF ( [ test -z "${PSM3_IEFS_VERSION}"] , [ PSM3_IEFS_VERSION="${PACKAGE_VERSION}$(whoami)"] )
992987 PSM3_IEFS_VERSION=$(echo "${PSM3_IEFS_VERSION}" | tr '.' '_')
993988 PSM3_GIT_HASH="$(git rev-parse HEAD)"
994- RPM_RELEASE=$(echo "${PSM3_IEFS_VERSION}" | cut -d'_' -f5)
995- RELEASE_VER=$(echo "${PSM3_IEFS_VERSION}" | cut -d'_' -f1-4 | sed 's/_/./g')
989+ RPM_RELEASE=$(echo "${PSM3_IEFS_VERSION}" | tr -s '@<:@ A-Z@:>@ ' '_' | cut -d'_' -f5)
990+ RELEASE_VER=$(echo "${PSM3_IEFS_VERSION}" | tr -s '@<:@ A-Z@:>@ ' '_' | cut -d'_' -f1-4 | sed 's/_/./g')
991+ char=$(echo "${PSM3_IEFS_VERSION}" | tr -dc '@<:@ A-Z@:>@ ' | tr '@<:@ A-Z@:>@ ' '@<:@ a-z@:>@ ')
992+ AS_IF ( [ test -n "$char"] , [
993+ RPM_RELEASE="0${char}${RPM_RELEASE}"
994+ ] )
996995 AS_IF ( [ test x"${RELEASE_VER}" = x"${PACKAGE_VERSION}"] , [ ] , [
997996 AC_MSG_NOTICE ( [ Release Tag does not match VERSION file] )
998997 AC_MSG_NOTICE ( [ ${RELEASE_VER} != ${PACKAGE_VERSION}] )
0 commit comments