[OpenMP] Add entry for Intel Compiler 18

[AndreyChurbanov]

LGTM

[Hahnfeld]

Question to Intel: At the moment we have to add a new compiler version each year. Can we switch to the same process used for Clang and GCC, i.e. automatically getting the version and composing the string?

[omalyshe]

In D40386#939020, @Hahnfeld wrote:

Question to Intel: At the moment we have to add a new compiler version each year. Can we switch to the same process used for Clang and GCC, i.e. automatically getting the version and composing the string?

Intel compiler provides just two version-related macros, e.g.
#define INTEL_COMPILER 1800
#define INTEL_COMPILER_UPDATE 1

Is there a simple way to turn them into "18.0.1" (and also "9999" into "mainline")?

[Hahnfeld]

In D40386#940287, @omalyshe wrote:

In D40386#939020, @Hahnfeld wrote:

Question to Intel: At the moment we have to add a new compiler version each year. Can we switch to the same process used for Clang and GCC, i.e. automatically getting the version and composing the string?

Intel compiler provides just two version-related macros, e.g.

#define __INTEL_COMPILER 1800
#define __INTEL_COMPILER_UPDATE 1

Is there a simple way to turn them into "18.0.1" (and also "9999" into "mainline")?

You probably need to special case 9998 and 9999 - which is fine because these values don't change. For released versions (at least for the current way of defining the macros) the following should be possible (not tested):

#define KMP_COMPILER "Intel C++ Compiler " stringer(__INTEL_COMPILER / 100) "." stringer(__INTEL_COMPILER % 100) "." stringer(__INTEL_COMPILER_UPDATE)

Maybe you need to assign the temporary values to other defines for the macro magic to work, I'm not too familiar with how it works...

[protze.joachim]

LGTM

In D40386#940428, @Hahnfeld wrote:

For released versions (at least for the current way of defining the macros) the following should be possible (not tested):

#define KMP_COMPILER "Intel C++ Compiler " stringer(__INTEL_COMPILER / 100) "." stringer(__INTEL_COMPILER % 100) "." stringer(__INTEL_COMPILER_UPDATE)

Maybe you need to assign the temporary values to other defines for the macro magic to work, I'm not too familiar with how it works...

The preprocessor cannot do arithmetic replacements. So stringer will not work.
One way would be to calculate the value on execution.
Since CMake has the information, we could configure the source and let CMake provide the compiler version.

[Hahnfeld]

In D40386#944942, @protze.joachim wrote:

LGTM

I didn't want to block this revision, I agree that this needs to be done with the current code.

In D40386#940428, @Hahnfeld wrote:

For released versions (at least for the current way of defining the macros) the following should be possible (not tested):

#define KMP_COMPILER "Intel C++ Compiler " stringer(__INTEL_COMPILER / 100) "." stringer(__INTEL_COMPILER % 100) "." stringer(__INTEL_COMPILER_UPDATE)

Maybe you need to assign the temporary values to other defines for the macro magic to work, I'm not too familiar with how it works...

The preprocessor cannot do arithmetic replacements. So stringer will not work.
One way would be to calculate the value on execution.
Since CMake has the information, we could configure the source and let CMake provide the compiler version.

You are right, my code doesn't work as intended. So maybe @omalyshe can convince the compiler team to add the macros that would simplify life? :-) (just found out where this information is printed, never used KMP_VERSION=1 before...)

[omalyshe]

So maybe @omalyshe can convince the compiler team to add the macros that would simplify life? :-)

Compiler itself somehow cope with it when printing the version. I'll try find out- how.
$ icc -V
Intel(R) C Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 18.0 Build 20171115
Copyright (C) 1985-2017 Intel Corporation. All rights reserved.

runtime/src/kmp_version.cpp

 #elif __INTEL_COMPILER == 1410
 #define KMP_COMPILER "Intel C++ Compiler 14.1"
 #elif __INTEL_COMPILER == 1500
 #define KMP_COMPILER "Intel C++ Compiler 15.0"
 #elif __INTEL_COMPILER == 1600
 #define KMP_COMPILER "Intel C++ Compiler 16.0"
 #elif __INTEL_COMPILER == 1700
 #define KMP_COMPILER "Intel C++ Compiler 17.0"
+#elif __INTEL_COMPILER == 1800
+#define KMP_COMPILER "Intel C++ Compiler 18.0"
 #elif __INTEL_COMPILER == 9998
 #define KMP_COMPILER "Intel C++ Compiler mainline"
 #elif __INTEL_COMPILER == 9999
 #define KMP_COMPILER "Intel C++ Compiler mainline"
 #endif
 #elif KMP_COMPILER_CLANG
 #define KMP_COMPILER                                                           \
   "Clang " stringer(__clang_major__) "." stringer(__clang_minor__)