diff options
| author | Paul Osmialowski <pawel.osmialowski@arm.com> | 2017-05-25 12:22:17 +0100 |
|---|---|---|
| committer | Paul Osmialowski <pawel.osmialowski@arm.com> | 2017-05-25 17:03:20 +0100 |
| commit | 42bbe74791bfd2b92e7011d54f8b4725413a9fa4 (patch) | |
| tree | 39256a6712cf49c5edd9a209c88a522fa5895351 | |
| parent | c8322c65e4a7ba9d5f128d2a4e073135f966d241 (diff) | |
| download | openblas-42bbe74791bfd2b92e7011d54f8b4725413a9fa4.tar.gz openblas-42bbe74791bfd2b92e7011d54f8b4725413a9fa4.tar.bz2 openblas-42bbe74791bfd2b92e7011d54f8b4725413a9fa4.zip | |
build: LLVM: Add Flang compiler support and enable OpenMP for Clang
Signed-off-by: Paul Osmialowski <pawel.osmialowski@arm.com>
| -rw-r--r-- | Makefile.system | 18 | ||||
| -rw-r--r-- | cmake/fc.cmake | 15 | ||||
| -rw-r--r-- | common_arm64.h | 4 | ||||
| -rw-r--r-- | f_check | 20 |
4 files changed, 54 insertions, 3 deletions
diff --git a/Makefile.system b/Makefile.system index 8d114f4ff..1a725dbdb 100644 --- a/Makefile.system +++ b/Makefile.system @@ -414,7 +414,6 @@ CCOMMON_OPT += -fopenmp endif ifeq ($(C_COMPILER), CLANG) -$(error OpenBLAS: Clang didn't support OpenMP yet.) CCOMMON_OPT += -fopenmp endif @@ -584,6 +583,23 @@ endif # Fortran Compiler dependent settings # +ifeq ($(F_COMPILER), FLANG) +CCOMMON_OPT += -DF_INTERFACE_FLANG +ifdef BINARY64 +ifdef INTERFACE64 +ifneq ($(INTERFACE64), 0) +FCOMMON_OPT += -i8 +endif +endif +FCOMMON_OPT += -Wall +else +FCOMMON_OPT += -Wall +endif +ifeq ($(USE_OPENMP), 1) +FCOMMON_OPT += -fopenmp +endif +endif + ifeq ($(F_COMPILER), G77) CCOMMON_OPT += -DF_INTERFACE_G77 FCOMMON_OPT += -Wall diff --git a/cmake/fc.cmake b/cmake/fc.cmake index ba156c210..ee9d2051b 100644 --- a/cmake/fc.cmake +++ b/cmake/fc.cmake @@ -3,6 +3,21 @@ ## Description: Ported from portion of OpenBLAS/Makefile.system ## Sets Fortran related variables. +if (${F_COMPILER} STREQUAL "FLANG") + set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_FLANG") + if (BINARY64) + if (INTERFACE64) + set(FCOMMON_OPT "${FCOMMON_OPT} -i8") + endif () + set(FCOMMON_OPT "${FCOMMON_OPT} -Wall") + else () + set(FCOMMON_OPT "${FCOMMON_OPT} -Wall") + endif () + if (USE_OPENMP) + set(FCOMMON_OPT "${FCOMMON_OPT} -fopenmp") + endif () +endif () + if (${F_COMPILER} STREQUAL "G77") set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_G77") set(FCOMMON_OPT "${FCOMMON_OPT} -Wall") diff --git a/common_arm64.h b/common_arm64.h index d9d5d215c..c6ef2fb5d 100644 --- a/common_arm64.h +++ b/common_arm64.h @@ -39,7 +39,11 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define INLINE inline +#ifdef F_INTERFACE_FLANG +#define RETURN_BY_STACK +#else #define RETURN_BY_COMPLEX +#endif #ifndef ASSEMBLER @@ -33,6 +33,7 @@ if ($compiler eq "") { "ppuf77", "ppuf95", "ppuf90", "ppuxlf", "pathf90", "pathf95", "pgf95", "pgf90", "pgf77", + "flang", "ifort"); OUTER: @@ -78,8 +79,13 @@ if ($compiler eq "") { $vendor = GFORTRAN; $openmp = "-fopenmp"; } else { - $vendor = G77; - $openmp = ""; + if ($compiler =~ /flang/) { + $vendor = FLANG; + $openmp = "-fopenmp"; + } else { + $vendor = G77; + $openmp = ""; + } } } @@ -197,6 +203,12 @@ if ($compiler eq "") { $openmp = "-mp"; } + if ($compiler =~ /flang/) { + $vendor = FLANG; + $bu = "_"; + $openmp = "-fopenmp"; + } + if ($vendor eq "") { $nofortran = 1; $compiler = "gfortran"; @@ -331,6 +343,10 @@ if ($vendor eq "INTEL"){ $linker_a .= "-lgfortran" } +if ($vendor eq "FLANG"){ + $linker_a .= "-lflang" +} + open(MAKEFILE, ">> $makefile") || die "Can't append $makefile"; open(CONFFILE, ">> $config" ) || die "Can't append $config"; |