Merge branch 'proper-oneapi-icx-support' into 'master'

Add new compiler oneapi to tune for the icx compiler

See merge request !1802

configure.ac

@@ -116,6 +116,12 @@ if test "$enable_ipo" = "yes"; then
       : ${AR="xiar"}
       : ${LD="xild"}
       AC_MSG_RESULT([added Intel interprocedural optimization support])
+   elif test "$ax_cv_c_compiler_vendor" = "oneapi"; then
+      CFLAGS="$CFLAGS -ipo"
+      LDFLAGS="$LDFLAGS -ipo"
+      : ${AR="xiar"}
+      : ${LD="xild"}
+      AC_MSG_RESULT([added oneapi interprocedural optimization support])
    elif test "$ax_cv_c_compiler_vendor" = "gnu"; then
       CFLAGS="$CFLAGS -flto"
       LDFLAGS="$LDFLAGS -flto"
@@ -236,6 +242,8 @@ if test "x$enable_debug" = "xyes"; then
       CFLAGS="$CFLAGS $inline_EXTRA_FLAGS"
    elif test "$ax_cv_c_compiler_vendor" = "intel"; then
       CFLAGS="$CFLAGS -debug inline-debug-info"
+   elif test "$ax_cv_c_compiler_vendor" = "oneapi"; then
+      CFLAGS="$CFLAGS -debug inline-debug-info"
    fi
 fi
 

m4/ax_cc_maxopt.m4

@@ -104,7 +104,7 @@ if test "$ac_test_CFLAGS" != "set"; then
                 echo "******************************************************"])
          ;;
 
-    intel) CFLAGS="$CFLAGS -O3 -ansi-alias"
+    intel | oneapi) CFLAGS="$CFLAGS -O3 -ansi-alias"
 	if test "x$acx_maxopt_portable" = xno; then
 	  icc_archflag=unknown
 	  icc_flags=""

m4/ax_compiler_vendor.m4

@@ -71,6 +71,7 @@ AC_DEFUN([AX_COMPILER_VENDOR], [dnl
 
 	vendors="
 		intel:		__ICC,__ECC,__INTEL_COMPILER
+                oneapi:         __INTEL_LLVM_COMPILER
 		ibm:		__xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__
 		pathscale:	__PATHCC__,__PATHSCALE__
 		clang:		__clang__

m4/ax_compiler_version.m4

@@ -52,6 +52,19 @@ AC_DEFUN([_AX_COMPILER_VERSION_INTEL],
     AC_MSG_FAILURE([[[$0]] unknown intel compiler version]))
   ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
   ])
+AC_DEFUN([_AX_COMPILER_VERSION_ONEAPI],
+  [ dnl
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major,
+    [__INTEL_LLVM_COMPILER/10000],,
+    AC_MSG_FAILURE([[[$0]] unknown oneapi compiler version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor,
+    [(__INTEL_LLVM_COMPILER%10000)/100],,
+    AC_MSG_FAILURE([[[$0]] unknown oneapi compiler version]))
+  AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch,
+    [(__INTEL_LLVM_COMPILER%100)],,
+    AC_MSG_FAILURE([[[$0]] unknown oneapi compiler version]))
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch"
+  ])
 
 # for IBM
 AC_DEFUN([_AX_COMPILER_VERSION_IBM],
@@ -505,6 +518,7 @@ AC_DEFUN([AX_COMPILER_VERSION],[dnl
     [ dnl
       AS_CASE([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor],
         [intel],[_AX_COMPILER_VERSION_INTEL],
+        [oneapi],[_AX_COMPILER_VERSION_ONEAPI],
 	[ibm],[_AX_COMPILER_VERSION_IBM],
 	[pathscale],[_AX_COMPILER_VERSION_PATHSCALE],
 	[clang],[_AX_COMPILER_VERSION_CLANG],