Use new name for Intel compiler: icx

icc.spec

@@ -1,4 +1,4 @@
-### RPM external icc 2017.2.174
+### RPM external icc 2022
 ## NOCOMPILER
 Source: none
 Provides: libimf.so()(64bit)
@@ -10,5 +10,5 @@ Provides: libsvml.so()(64bit)
 %build
 %install
 %post
-ln -s /cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2017/compilers_and_libraries_%{realversion}/linux $RPM_INSTALL_PREFIX/%{pkgrel}/installation
+ln -s /cvmfs/projects.cern.ch/intelsw/oneAPI/linux/x86_64/%{realversion}/compiler/latest/linux $RPM_INSTALL_PREFIX/%{pkgrel}/installation
 

intel-vtune.spec

@@ -1,4 +1,4 @@
-### RPM external intel-vtune 2018.0.2.525261
+### RPM external intel-vtune 2022
 ## NOCOMPILER
 
 %prep
@@ -11,11 +11,11 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/intel-vtune.xml
 <tool name="intel-vtune" version="%{realversion}">
   <info url="https://software.intel.com/en-us/intel-vtune-amplifier-xe"/>
   <client>
-    <environment name="INTEL_VTUNE_BASE" default="/cvmfs/projects.cern.ch/intelsw/psxe/linux/x86_64/2018/vtune_amplifier_%{realversion}"/>
+    <environment name="INTEL_VTUNE_BASE" default="/cvmfs/projects.cern.ch/intelsw/oneAPI/linux/x86_64/%{realversion}/vtune/latest/bin64"/>
     <environment name="BINDIR" default="$INTEL_VTUNE_BASE/bin64"/>
   </client>
   <runtime name="PATH" value="$INTEL_VTUNE_BASE/bin64" type="path"/>
-  <runtime name="VTUNE_AMPLIFIER_2018_DIR" value="$INTEL_VTUNE_BASE"/>
+  <runtime name="VTUNE_PROFILER_%{realversion}_DIR" value="$INTEL_VTUNE_BASE"/>
 </tool>
 EOF_TOOLFILE
 

scram-tools.file/tools/icx/env.sh

@@ -0,0 +1,2 @@
+source ${SCRAM_TOOLS_BIN_DIR}/os_libdir.sh
+export AT="@"

scram-tools.file/tools/icx/icx-ccompiler.xml

@@ -0,0 +1,10 @@
+  <tool name="icx-ccompiler" version="@TOOL_VERSION@" type="compiler">
+    <use name="gcc-ccompiler"/>
+    <client>
+      <environment name="ICX_CCOMPILER_BASE" default="@TOOL_ROOT@/installation" handler="warn"/>
+      <environment name="CC" value="$ICX_CCOMPILER_BASE/bin/icx" handler="warn"/>
+    </client>
+    <architecture name="_mic_">
+      <flags CFLAGS="-mmic"/>
+    </architecture>
+  </tool>

scram-tools.file/tools/icx/icx-cxxcompiler.xml

@@ -0,0 +1,28 @@
+  <tool name="icx-cxxcompiler" version="@TOOL_VERSION@" type="compiler">
+    <use name="gcc-cxxcompiler"/>
+    <client>
+      <environment name="ICX_CXXCOMPILER_BASE" default="@TOOL_ROOT@/installation" handler="warn"/>
+      <environment name="CXX" value="$ICX_CXXCOMPILER_BASE/bin/icpx" handler="warn"/>
+      <environment name="LIBDIR" default="$ICX_CXXCOMPILER_BASE/compiler/lib"/>
+    </client>
+    <flags REM_CXXFLAGS="-felide-constructors"/>
+    <flags REM_CXXFLAGS="-ftree-vectorize"/>
+    <flags REM_CXXFLAGS="-Wstrict-overflow"/>
+    <flags REM_CXXFLAGS="-fno-crossjumping"/>
+    <flags REM_CXXFLAGS="-Wno-non-template-friend"/>
+    <flags REM_CXXFLAGS="-Wno-psabi"/>
+    <flags REM_CXXFLAGS="-Wno-unused-local-typedefs"/>
+    <flags REM_CXXFLAGS="-Wno-vla"/>
+    <flags REM_CXXFLAGS="--param vect-max-version-for-alias-checks=50"/>
+    <flags REM_CXXFLAGS="-Werror=format-contains-nul"/>
+    <flags REM_CXXFLAGS="-Wclass-memaccess"/>
+    <flags REM_CXXFLAGS="-Werror=return-local-addr"/>
+    <flags REM_LDFLAGS="-Wl,--icf=all"/>
+    <flags CXXFLAGS="-Wno-unknown-pragmas"/>
+    <architecture name="_mic_">
+      <flags CXXFLAGS="-mmic"/>
+      <flags LDFLAGS="-mmic"/>
+    </architecture>
+    <runtime name="@OS_RUNTIME_LDPATH_NAME@" value="$ICX_CXXCOMPILER_BASE/compiler/lib" type="path" handler="warn"/>
+    <runtime name="PATH" value="$ICX_CXXCOMPILER_BASE/bin" type="path" handler="warn"/>
+  </tool>

scram-tools.file/tools/icx/icx-f77compiler.xml

@@ -0,0 +1,6 @@
+  <tool name="icx-f77compiler" version="@TOOL_VERSION@" type="compiler">
+    <use name="gcc-f77compiler"/>
+    <client>
+      <environment name="FC" default="@GCC_ROOT@/bin/gfortran"/>
+    </client>
+  </tool>