cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to flang-6.0.0.20180725. Note the major bump to libpgmath. This

Browse Source 
update also brings in an MD version of libpgmath for arm64 (like it is on
amd64); however, this arm64 MD version is currently disabled until I am
able to test it.
This commit is contained in:
bcallah 2018-07-25 21:08:47 +00:00
parent 3e7e90572c
commit c6b3f865f1
9 changed files with 57 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/flang/flang/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.19 2018/07/24 00:59:31 bcallah Exp $
# $OpenBSD: Makefile,v 1.20 2018/07/25 21:08:47 bcallah Exp $
COMMENT = LLVM Fortran compiler passes and runtime library
DISTNAME = flang-6.0.0.20180723
DISTNAME = flang-6.0.0.20180725
SHARED_LIBS += flang 1.3 # 6.0
SHARED_LIBS += flangrti 1.0 # 6.0
SHARED_LIBS += ompstub 0.0 # 6.0
GH_PROJECT = flang
GH_COMMIT = bbd3674a72a92cb86aeb12a5ee8070ec5d8ab730
GH_COMMIT = 319d989eb02a4ccbded63955793f0320f8084214
WANTLIB += aio_compat c execinfo m pgmath pthread

4
lang/flang/flang/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (flang-6.0.0.20180723-bbd3674a.tar.gz) = JgZGX5o8zt1pG+mx9CiYxvFFlj+VcC8siJTGZDrejkY=
SIZE (flang-6.0.0.20180723-bbd3674a.tar.gz) = 4575440
SHA256 (flang-6.0.0.20180725-319d989e.tar.gz) = Ya/pApM0hUpze/mrSVt5IUo0fPa5/tUoyLkpraf5lHw=
SIZE (flang-6.0.0.20180725-319d989e.tar.gz) = 4594738

8
lang/flang/libpgmath/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.7 2018/07/09 00:30:07 bcallah Exp $
# $OpenBSD: Makefile,v 1.8 2018/07/25 21:08:47 bcallah Exp $
# Sync version with lang/flang/flang always!
COMMENT = LLVM Fortran math library
DISTNAME = flang-6.0.0.20180707
DISTNAME = flang-6.0.0.20180725
PKGNAME = ${DISTNAME:S/flang/libpgmath/}
SHARED_LIBS += pgmath 1.0 # 6.0
SHARED_LIBS += pgmath 2.0 # 6.0
GH_PROJECT = flang
GH_COMMIT = 45d7aeb5886c5965a8e793ef3fa632e7e73de56c
GH_COMMIT = 319d989eb02a4ccbded63955793f0320f8084214
WANTLIB += ${COMPILER_LIBCXX} m

4
lang/flang/libpgmath/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (flang-6.0.0.20180707-45d7aeb5.tar.gz) = 3nmB0ZJxnT46QWei2X4NbVYOnXgotCpo9WXDfREHFAs=
SIZE (flang-6.0.0.20180707-45d7aeb5.tar.gz) = 4574863
SHA256 (flang-6.0.0.20180725-319d989e.tar.gz) = Ya/pApM0hUpze/mrSVt5IUo0fPa5/tUoyLkpraf5lHw=
SIZE (flang-6.0.0.20180725-319d989e.tar.gz) = 4594738

4
lang/flang/libpgmath/patches/patch-CMakeLists_txt
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/06/16 20:08:28 bcallah Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.3 2018/07/25 21:08:47 bcallah Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -74,7 +74,7 @@ set(LIBPGMATH_TOOLS_DIR ${LIBPGMATH_BASE_DIR}/tools)
@@ -101,7 +101,7 @@ set(LIBPGMATH_TOOLS_DIR ${LIBPGMATH_BASE_DIR}/tools)
set(LIBPGMATH_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(LIBPGMATH_RUNTIME_PATH ${CMAKE_BINARY_DIR}/lib)
set(LIBPGMATH_LIBRARY_NAME pgmath)

41
lang/flang/libpgmath/patches/patch-lib_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-lib_CMakeLists_txt,v 1.3 2018/06/27 00:09:26 bcallah Exp $
$OpenBSD: patch-lib_CMakeLists_txt,v 1.4 2018/07/25 21:08:47 bcallah Exp $
Some ugly hacks here.
@ -9,13 +9,13 @@ Index: lib/CMakeLists.txt
# This value will be the same as CMAKE_SYSTEM_PROCESSOR
set(PROCESSOR ${CMAKE_SYSTEM_PROCESSOR})
-if(${LIBPGMATH_WITH_GENERIC} OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64"))
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "amd64")
+ set(PROCESSOR "x86_64")
+endif()
+if(${LIBPGMATH_WITH_GENERIC} OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64"))
-if(${LIBPGMATH_WITH_GENERIC} OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|aarch64"))
+if(${LIBPGMATH_WITH_GENERIC} OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64|aarch64"))
set(PROCESSOR "generic")
endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" AND ${PROCESSOR} MATCHES "amd64")
+ set(PROCESSOR "x86_64")
+endif()
set_property(GLOBAL APPEND PROPERTY "TARGET_OBJECTS")
@ -41,22 +41,37 @@ Index: lib/CMakeLists.txt
# common
# Definitions and compiler flags for level 1 directories
@@ -151,12 +154,12 @@ else()
@@ -151,12 +154,12 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
set(DEFINITIONS_L1 HOST_LINUX MAXCPUS=8192 MAXCPUSL=128 MAXCPUSR=128
TARGET_LINUX TARGET_LINUX_ARM TARGET_LINUX_ARM64 TARGET_LLVM
TARGET_LLVM_LINUXAARCH64 TM_I8)
- set(FLAGS_L1 "-O3 -mcpu=${LLVM_FLANG_CPU_TARGET} -ffast-math -funroll-loops ")
+ set(FLAGS_L1 "-mcpu=${LLVM_FLANG_CPU_TARGET} -ffast-math -funroll-loops ")
set(FLAGS_L1 "${FLAGS_L1} -ffp-contract=fast")
set(DEFINITIONS_L2 HOST_LINUX MAXCPUS=8192 MAXCPUSL=128 MAXCPUSR=128
TARGET_LINUX TARGET_LINUX_ARM TARGET_LINUX_ARM64 TARGET_LLVM TM_I8)
- set(FLAGS_L2 "-O3 -mcpu=${LLVM_FLANG_CPU_TARGET} -ffast-math -funroll-loops -ffp-contract=fast")
+ set(FLAGS_L2 "-mcpu=${LLVM_FLANG_CPU_TARGET} -ffast-math -funroll-loops -ffp-contract=fast")
# common
# Definitions and compiler flags for level 1 directories
@@ -181,12 +184,12 @@ else()
set(DEFINITIONS_L1 HOST_LINUX MAXCPUS=256 MAXCPUSL=8 MAXCPUSR=8 TARGET_LINUX
TARGET_LINUX_64 TARGET_LLVM TARGET_LLVM_64 TARGET_LLVM_LINUX64
TARGET_LINUX_GENERIC TARGET_64 PG_PIC)
- set(FLAGS_L1 "-O3 -mfma -ffp-contract=fast ")
+ set(FLAGS_L1 " ")
- set(FLAGS_L1 "-O3 -ffp-contract=fast ")
+ set(FLAGS_L1 "-ffp-contract=fast ")
set(DEFINITIONS_L2 HOST_LINUX MAXCPUS=256 MAXCPUSL=8 MAXCPUSR=8 TARGET_LINUX
TARGET_LINUX_64 TARGET_LLVM TARGET_LLVM_64 TARGET_LLVM_LINUX64
TARGET_LINUX_GENERIC TARGET_64 PG_PIC)
- set(FLAGS_L2 "-O3 -mfma -ffp-contract=fast ")
+ set(FLAGS_L2 " ")
- set(FLAGS_L2 "-O3 -ffp-contract=fast ")
+ set(FLAGS_L2 "-ffp-contract=fast ")
# common
# Definitions and compiler flags for level 1 directories
@@ -180,7 +183,7 @@ else()
@@ -210,7 +213,7 @@ else()
endif()
include_directories(common)
@ -65,7 +80,7 @@ Index: lib/CMakeLists.txt
include_directories(x86_64)
# elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le")
# include_directories(ppc64le)
@@ -190,7 +193,7 @@ endif()
@@ -223,7 +226,7 @@ endif()
# Add directories to build
add_subdirectory(common)

20
lang/flang/libpgmath/patches/patch-lib_common_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-lib_common_CMakeLists_txt,v 1.2 2018/06/16 20:08:28 bcallah Exp $
$OpenBSD: patch-lib_common_CMakeLists_txt,v 1.3 2018/07/25 21:08:47 bcallah Exp $
Index: lib/common/CMakeLists.txt
--- lib/common/CMakeLists.txt.orig
@ -7,8 +7,8 @@ Index: lib/common/CMakeLists.txt
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|ppc64le" AND NOT ${LIBPGMATH_WITH_GENERIC})
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64|ppc64le" AND NOT ${LIBPGMATH_WITH_GENERIC})
- if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|ppc64le|aarch64" AND NOT ${LIBPGMATH_WITH_GENERIC})
+ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|amd64|ppc64le|aarch64" AND NOT ${LIBPGMATH_WITH_GENERIC})
add_subdirectory("acos")
add_subdirectory("asin")
add_subdirectory("exp")
@ -23,7 +23,7 @@ Index: lib/common/CMakeLists.txt
add_subdirectory("cos")
add_subdirectory("cosf")
add_subdirectory("sincosf")
@@ -260,13 +260,13 @@ libmath_add_object_library("${SRCS}" "${FLAGS}" "${DEF
@@ -278,13 +278,13 @@ libmath_add_object_library("${SRCS}" "${FLAGS}" "${DEF
set(DEFINITIONS_CMPLX ${DEFINITIONS} MTH_CMPLX_C99_ABI)
libmath_add_object_library("${MTH_CMPLX_SRCS}" "${FLAGS}" "${DEFINITIONS_CMPLX}" "common_mth_cmplx")
@ -39,7 +39,7 @@ Index: lib/common/CMakeLists.txt
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-march=core2")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-msse2")
@@ -279,7 +279,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
@@ -297,7 +297,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
COMMAND awk -v MAX_VREG_SIZE=128 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_generic_frp.awk > ${TARGET_NAME}.c)
add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
@ -48,7 +48,7 @@ Index: lib/common/CMakeLists.txt
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-march=core2")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-msse2")
@@ -292,7 +292,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
@@ -310,7 +310,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
COMMAND awk -v MAX_VREG_SIZE=256 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_mask.awk > ${TARGET_NAME}.c)
add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
@ -57,7 +57,7 @@ Index: lib/common/CMakeLists.txt
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-march=sandybridge")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx")
@@ -305,7 +305,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
@@ -323,7 +323,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
COMMAND awk -v MAX_VREG_SIZE=256 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_generic_frp.awk > ${TARGET_NAME}.c)
add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
@ -66,7 +66,7 @@ Index: lib/common/CMakeLists.txt
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-march=sandybridge")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx")
@@ -319,7 +319,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
@@ -337,7 +337,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
COMMAND awk -v MAX_VREG_SIZE=512 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_mask.awk > ${TARGET_NAME}.c)
add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "")
@ -75,7 +75,7 @@ Index: lib/common/CMakeLists.txt
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mtune=knl -march=knl")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx512f -mfma")
@@ -332,7 +332,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
@@ -350,7 +350,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
COMMAND awk -v MAX_VREG_SIZE=512 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_generic_frp.awk > ${TARGET_NAME}.c)
add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")
@ -84,7 +84,7 @@ Index: lib/common/CMakeLists.txt
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mtune=knl -march=knl")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set_property(SOURCE ${TARGET_NAME}.c APPEND_STRING PROPERTY COMPILE_FLAGS "-mavx512f -mfma")
@@ -345,7 +345,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
@@ -363,7 +363,7 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND NOT
add_custom_command(OUTPUT ${TARGET_NAME}.c PRE_BUILD
COMMAND awk -v MAX_VREG_SIZE=512 -v TARGET=X8664 -f ${LIBPGMATH_TOOLS_DIR}/mth_z2yy.awk > ${TARGET_NAME}.c)
add_custom_target(${TARGET_NAME} ALL DEPENDS "${TARGET_NAME}.c")

6
lang/flang/libpgmath/patches/patch-lib_common_dispatch_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-lib_common_dispatch_c,v 1.2 2018/06/16 20:08:28 bcallah Exp $
$OpenBSD: patch-lib_common_dispatch_c,v 1.3 2018/07/25 21:08:47 bcallah Exp $
Index: lib/common/dispatch.c
--- lib/common/dispatch.c.orig
+++ lib/common/dispatch.c
@@ -61,11 +61,7 @@
#include <string.h>
@@ -62,11 +62,7 @@
#include <time.h>
#include <unistd.h>
#include <inttypes.h>
-#ifdef TARGET_LINUX_X8664

6
lang/flang/libpgmath/patches/patch-lib_common_sincos_CMakeLists_txt
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-lib_common_sincos_CMakeLists_txt,v 1.1.1.1 2018/05/09 22:26:14 bcallah Exp $
$OpenBSD: patch-lib_common_sincos_CMakeLists_txt,v 1.2 2018/07/25 21:08:47 bcallah Exp $
Index: lib/common/sincos/CMakeLists.txt
--- lib/common/sincos/CMakeLists.txt.orig
+++ lib/common/sincos/CMakeLists.txt
@@ -21,8 +21,8 @@ get_property(FLAGS GLOBAL PROPERTY "FLAGS_L1")
set(SRCS gsincos.c)
@@ -26,8 +26,8 @@ else()
endif()
# Set source files, compiler flags and definitions
-if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")