Skip to content

gh-152902: Update Intel compiler from icc to icx #152825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hpkfft wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −48
Open

gh-152902: Update Intel compiler from icc to icx #152825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 10 additions & 20 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,8 +1090,8 @@ AC_CACHE_CHECK([for CC compiler name], [ac_cv_cc_name], [
cat > conftest.c <<EOF
#if defined(__EMSCRIPTEN__)
emcc
#elif defined(__INTEL_COMPILER) || defined(__ICC)
icc
#elif defined(__INTEL_CLANG_COMPILER) || defined(__INTEL_LLVM_COMPILER)
icx
#elif defined(__ibmxl__) || defined(__xlc__) || defined(__xlC__)
xlc
#elif defined(_MSC_VER)
Expand Down Expand Up @@ -1139,8 +1139,8 @@ then
case "$ac_cv_cc_name" in
gcc) AC_PATH_TOOL([CXX], [g++], [notfound]) ;;
cc) AC_PATH_TOOL([CXX], [c++], [notfound]) ;;
clang) AC_PATH_TOOL([CXX], [clang++], [notfound]) ;;
icc) AC_PATH_TOOL([CXX], [icpc], [notfound]) ;;
clang) AC_PATH_TOOL([CXX], [clang++], [notfound]) ;;
icx) AC_PATH_TOOL([CXX], [icpx], [notfound]) ;;
esac
if test "$CXX" = "notfound"
then
Expand Down Expand Up @@ -2085,7 +2085,7 @@ fi
LLVM_PROF_ERR=no

case "$ac_cv_cc_name" in
clang)
clang|icx)
# Any changes made here should be reflected in the GCC+Darwin case below
PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
PGO_PROF_USE_FLAG="-fprofile-instr-use=\"\$(shell pwd)/code.profclangd\""
Expand Down Expand Up @@ -2135,12 +2135,6 @@ case "$ac_cv_cc_name" in
LLVM_PROF_MERGER="true"
LLVM_PROF_FILE=""
;;
icc)
PGO_PROF_GEN_FLAG="-prof-gen"
PGO_PROF_USE_FLAG="-prof-use"
LLVM_PROF_MERGER="true"
LLVM_PROF_FILE=""
;;
esac

# BOLT optimization. Always configured after PGO since it always runs after PGO.
Expand Down Expand Up @@ -2667,11 +2661,7 @@ AS_VAR_IF([ac_cv_gcc_compat], [yes], [
AS_VAR_IF([ac_cv_no_strict_aliasing], [yes],
[BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"])

# ICC doesn't recognize the option, but only emits a warning
## XXX does it emit an unused result warning and can it be disabled?
AS_CASE(["$ac_cv_cc_name"],
[icc], [ac_cv_disable_unused_result_warning=no]
[PY_CHECK_CC_WARNING([disable], [unused-result])])
PY_CHECK_CC_WARNING([disable], [unused-result])
AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes],
[BASECFLAGS="$BASECFLAGS -Wno-unused-result"
CFLAGS_NODIST="$CFLAGS_NODIST -Wno-unused-result"])
Expand Down Expand Up @@ -2967,9 +2957,9 @@ case "$ac_cv_cc_name" in
mpicc)
CFLAGS_NODIST="$CFLAGS_NODIST"
;;
icc)
# ICC needs -fp-model strict or floats behave badly
CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
icx)
# ICX needs fp-model=precise (the default in clang) or floats behave badly
CFLAGS_NODIST="$CFLAGS_NODIST -ffp-model=precise"
;;
xlc)
CFLAGS_NODIST="$CFLAGS_NODIST -qalias=noansi -qmaxmem=-1"
Expand Down Expand Up @@ -6296,7 +6286,7 @@ AX_C_FLOAT_WORDS_BIGENDIAN(
# rounding precision of 64 bits. For gcc/x86, we can fix this by
# using inline assembler to get and set the x87 FPU control word.

# This inline assembler syntax may also work for suncc and icc,
# This inline assembler syntax may also work for suncc and icx,
# so we try it on all platforms.

AC_CACHE_CHECK([whether we can use gcc inline assembler to get and set x87 control word], [ac_cv_gcc_asm_for_x87], [
Expand Down
Loading