Use ICX for Intel CPU/GPU platforms (#3558)

Author: minitu

CMakeLists.txt

@@ -42,7 +42,11 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     string(REGEX REPLACE ".*(-.*)" "\\1" CMK_COMPILER_SUFFIX ${mytmp})
   endif()
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  set(CMK_COMPILER clang)
+  if(CMAKE_CXX_COMPILER MATCHES "(icpx)$")
+    set(CMK_COMPILER icx)
+  else()
+    set(CMK_COMPILER clang)
+  endif()
   get_filename_component(mytmp ${CMAKE_CXX_COMPILER} NAME)
   if(mytmp MATCHES "-")
     string(REGEX REPLACE ".*(-.*)" "\\1" CMK_COMPILER_SUFFIX ${mytmp})
@@ -606,8 +610,8 @@ endif()
 configure_file(src/arch/common/cc-bluegene.sh                include/ COPYONLY)
 configure_file(src/arch/common/cc-clang.sh                   include/ COPYONLY)
 configure_file(src/arch/common/cc-clang.h                    include/ COPYONLY)
-configure_file(src/arch/common/cc-dpcpp.sh                   include/ COPYONLY)
-configure_file(src/arch/common/cc-dpcpp.h                    include/ COPYONLY)
+configure_file(src/arch/common/cc-icx.sh                     include/ COPYONLY)
+configure_file(src/arch/common/cc-icx.h                      include/ COPYONLY)
 configure_file(src/arch/common/cc-craycc.h                   include/ COPYONLY)
 configure_file(src/arch/common/cc-craycc.sh                  include/ COPYONLY)
 configure_file(src/arch/common/cc-msvc.h                     include/ COPYONLY)

README.md

@@ -173,7 +173,7 @@ for more information:
 
      will give:
 
-      Supported compilers: clang craycc gcc icc iccstatic msvc pgcc xlc xlc64 dpcpp
+      Supported compilers: clang craycc gcc icc iccstatic msvc pgcc xlc xlc64 icx
       Supported options: common cuda flang gfortran ifort local nolb omp ooc papi perftools persistent pgf90 pxshm smp syncft sysvshm tcp tsan
 
 

buildcmake

@@ -226,9 +226,9 @@ function parse_platform_compilers() {
       opt_FC=flang
       opt_compiler+=("$arg")
       ;;
-    dpcpp)
+    icx)
       opt_CC=icx
-      opt_CXX=dpcpp
+      opt_CXX=icpx
       opt_compiler+=("$arg")
       ;;
     icc|iccstatic)

buildold

@@ -36,7 +36,7 @@ syntax() {
   ( cd "$src" ; ls -1 | egrep -v '(^mpi$)|(^netlrts?$)|(^multicore$)|(^util$)|(^common$)|(^win$)|(^gni$)|(^pami(lrts)?$)|(^verbs$)|(^ofi$)|(^ucx$)|(^template$)|(^cuda$)' | pr -3 -t )
   echo ''
   echo '<options>: compiler and platform specific options'
-  echo 'icc iccstatic xlc xlc64 gcc clang dpcpp pgcc cc mpicxx'
+  echo 'icc iccstatic xlc xlc64 gcc clang icx pgcc cc mpicxx'
   echo 'help smp omp tcp ooc syncft papi pthreads'
   echo '--incdir --libdir --basedir --build-shared --destination --suffix -j'
   if test $more = 1
@@ -50,7 +50,7 @@ syntax() {
   echo '  xlc, xlc64      IBM XL compilers (with 64-bit option on architectures with 32-bit modes)'
   echo '  gcc             GNU compiler collection (on platforms where the default differs)'
   echo '  clang           Clang C/C++ compiler (including bgclang)'
-  echo '  dpcpp           Intel oneAPI DPC++/C++ compiler'
+  echo '  icx             Intel oneAPI DPC++/C++ compiler'
   echo '  pgcc            Portland Group compilers'
   echo ''
   echo 'Choose an alternative fortran compiler (only one option is allowed from this section):'

src/arch/common/cc-dpcpp.h renamed to src/arch/common/cc-icx.h

@@ -2,8 +2,8 @@ CMK_CPP_CHARM="cpp -P"
 CMK_CPP_C="icx$CMK_COMPILER_SUFFIX"
 CMK_CC="icx$CMK_COMPILER_SUFFIX"
 CMK_LD="icx$CMK_COMPILER_SUFFIX"
-CMK_CXX="dpcpp$CMK_COMPILER_SUFFIX"
-CMK_LDXX="dpcpp$CMK_COMPILER_SUFFIX"
+CMK_CXX="icpx$CMK_COMPILER_SUFFIX"
+CMK_LDXX="icpx$CMK_COMPILER_SUFFIX"
 
 CMK_CPP_C_FLAGS="-E"