diff --git a/configure b/configure
index 01faef615a3d5e..4b59c5ac8e735e 100755
--- a/configure
+++ b/configure
@@ -6390,8 +6390,8 @@ else case e in #(
 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)
@@ -6859,7 +6859,7 @@ else
   CXX="$ac_cv_path_CXX"
 fi
  ;;
-        clang)             if test -n "$ac_tool_prefix"; then
+        clang)  if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}clang++", so it can be a program name with args.
 set dummy ${ac_tool_prefix}clang++; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -6969,9 +6969,9 @@ else
   CXX="$ac_cv_path_CXX"
 fi
  ;;
-        icc)               if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}icpc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}icpc; ac_word=$2
+        icx)    if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}icpx", so it can be a program name with args.
+set dummy ${ac_tool_prefix}icpx; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_CXX+y}
@@ -7019,8 +7019,8 @@ fi
 fi
 if test -z "$ac_cv_path_CXX"; then
   ac_pt_CXX=$CXX
-  # Extract the first word of "icpc", so it can be a program name with args.
-set dummy icpc; ac_word=$2
+  # Extract the first word of "icpx", so it can be a program name with args.
+set dummy icpx; ac_word=$2
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 printf %s "checking for $ac_word... " >&6; }
 if test ${ac_cv_path_ac_pt_CXX+y}
@@ -9117,7 +9117,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\""
@@ -9231,12 +9231,6 @@ fi
     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.
@@ -10699,11 +10693,6 @@ then :
   BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"
 fi
 
-    # ICC doesn't recognize the option, but only emits a warning
-    ## XXX does it emit an unused result warning and can it be disabled?
-    case "$ac_cv_cc_name" in #(
-  icc) :
-    ac_cv_disable_unused_result_warning=no
 
 
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can disable $CC unused-result warning" >&5
@@ -10741,10 +10730,7 @@ fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_disable_unused_result_warning" >&5
 printf "%s\n" "$ac_cv_disable_unused_result_warning" >&6; }
 
- ;; #(
-  *) :
-     ;;
-esac
+
     if test "x$ac_cv_disable_unused_result_warning" = xyes
 then :
   BASECFLAGS="$BASECFLAGS -Wno-unused-result"
@@ -11405,9 +11391,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"
@@ -26841,7 +26827,7 @@ esac
 # 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.
 
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can use gcc inline assembler to get and set x87 control word" >&5
diff --git a/configure.ac b/configure.ac
index a9fe5c269618fc..f550c63f1dc68f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
@@ -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
@@ -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\""
@@ -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.
@@ -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"])
@@ -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"
@@ -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], [