Attachment 189556 Details for Bug 224584 – Update of ohartman works

[patch] Update of ohartman works

pocl_diff_patch (text/plain), 9.34 KB, created by Loïc Bartoletti on 2018-01-09 05:29:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Bartoletti

Created: 2018-01-09 05:29:06 UTC

Size: 9.34 KB

patch

obsolete

>diff -ruN /usr/ports/lang/pocl/distinfo pocl/distinfo
>--- /usr/ports/lang/pocl/distinfo	2017-05-12 19:08:26.000000000 +0200
>+++ pocl/distinfo	2018-01-09 05:57:30.634422000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1491868935
>-SHA256 (pocl-0.14.tar.gz) = 2127bf925a91fbbe3daf2f1bac0da5c8aceb16e2a9434977a3057eade974106a
>-SIZE (pocl-0.14.tar.gz) = 1231630
>+TIMESTAMP = 1513954395
>+SHA256 (pocl-1.0.tar.gz) = 94bd86a2f9847c03e6c3bf8dca12af3734f8b272ffeacbc3fa8fcca58844b1d4
>+SIZE (pocl-1.0.tar.gz) = 1536827
>diff -ruN /usr/ports/lang/pocl/files/patch-CMakeLists.txt pocl/files/patch-CMakeLists.txt
>--- /usr/ports/lang/pocl/files/patch-CMakeLists.txt	2017-05-12 19:08:26.000000000 +0200
>+++ pocl/files/patch-CMakeLists.txt	2018-01-09 06:00:14.405105000 +0100
>@@ -1,15 +1,15 @@
>---- CMakeLists.txt.orig	2017-04-05 14:15:40 UTC
>+--- CMakeLists.txt.orig	2018-01-08 09:09:03 UTC
> +++ CMakeLists.txt
>-@@ -70,7 +70,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a
>-   set(ARMV6 1)
>+@@ -97,7 +97,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a
>  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
>    set(ARM64 1)
>+   set(ARM 1)
> -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i.86|AMD64|x86_64)")
> +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i.86|amd64|AMD64|x86_64)")
>+   set(X86 1)
>    if(POCL_DEVICE_ADDRESS_BITS MATCHES "32")
>      set(I386 1)
>-   else()
>-@@ -318,6 +318,9 @@ include(CheckFunctionExists)
>+@@ -395,6 +395,9 @@ include(CheckFunctionExists)
>  check_function_exists(fork HAVE_FORK)
>  check_function_exists(vfork HAVE_VFORK)
>  
>@@ -18,4 +18,4 @@
> +
>  ######################################################################################
>  
>- if(NOT DEFINED DEFAULT_USE_VECMATHLIB)
>+ if((DEFINED ENABLE_VECMATHLIB) AND (DEFINED ENABLE_SLEEF))
>diff -ruN /usr/ports/lang/pocl/files/patch-config.h.in.cmake pocl/files/patch-config.h.in.cmake
>--- /usr/ports/lang/pocl/files/patch-config.h.in.cmake	2017-05-12 19:08:26.000000000 +0200
>+++ pocl/files/patch-config.h.in.cmake	2018-01-09 06:00:14.365508000 +0100
>@@ -1,6 +1,6 @@
>---- config.h.in.cmake.orig	2017-04-05 14:15:40 UTC
>+--- config.h.in.cmake.orig	2018-01-08 09:11:14 UTC
> +++ config.h.in.cmake
>-@@ -44,6 +44,8 @@
>+@@ -36,6 +36,8 @@
>  
>  #cmakedefine HAVE_VFORK
>  
>diff -ruN /usr/ports/lang/pocl/files/patch-lib_CL_devices_cpuinfo.c pocl/files/patch-lib_CL_devices_cpuinfo.c
>--- /usr/ports/lang/pocl/files/patch-lib_CL_devices_cpuinfo.c	2017-05-12 19:08:26.000000000 +0200
>+++ pocl/files/patch-lib_CL_devices_cpuinfo.c	2018-01-09 06:00:14.379872000 +0100
>@@ -1,4 +1,4 @@
>---- lib/CL/devices/cpuinfo.c.orig	2017-04-05 14:15:40 UTC
>+--- lib/CL/devices/cpuinfo.c.orig	2018-01-08 09:13:55 UTC
> +++ lib/CL/devices/cpuinfo.c
> @@ -34,6 +34,12 @@
>  #include "config.h"
>@@ -13,10 +13,11 @@
>  static const char* cpuinfo = "/proc/cpuinfo";
>  #define MAX_CPUINFO_SIZE 64*1024
>  //#define DEBUG_POCL_CPUINFO
>-@@ -153,8 +159,51 @@ pocl_cpuinfo_detect_max_clock_frequency(
>-     } 
>+@@ -154,7 +160,51 @@ pocl_cpuinfo_detect_max_clock_frequency(
>    return -1;  
>  }
>+ 
>+-
> +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
> +/**
> + * Detects the maximum clock frequency of the CPU.
>@@ -25,7 +26,7 @@
> + *
> + * @return The clock frequency in MHz.
> + */
>-+int
>++static int
> +pocl_cpuinfo_detect_max_clock_frequency()
> +{
> +  const char mib1[] = "dev.cpu.0.freq_levels";
>@@ -33,7 +34,7 @@
> +  int clockrate = 0;
> +  size_t size = 0;
> +  char *value = NULL;
>- 
>++ 
> +  if (!sysctlbyname(mib1, NULL, &size, NULL, 0) &&
> +      (value = (char*)malloc(++size)) &&
> +      !sysctlbyname(mib1, (void*)value, &size, NULL, 0))
>@@ -54,21 +55,21 @@
> +/**
> + * Unimplemented for other platforms.
> + */
>-+ int
>++static int
> +pocl_cpuinfo_detect_max_clock_frequency()
> +{
>-+  return 0;
>++  return -1;
> +}
> +#endif
>- 
>++ 
> +#ifdef __linux__
>  /**
>   * Detects the number of parallel hardware threads supported by
>   * the CPU by parsing the cpuinfo.
>-@@ -232,6 +281,19 @@ pocl_cpuinfo_detect_compute_unit_count()
>-     } 
>+@@ -233,6 +283,20 @@ pocl_cpuinfo_detect_compute_unit_count()
>    return -1;  
>  }
>+ 
> +#else
> +/**
> + * Detects the number of parallel hardware threads supported by
>@@ -76,32 +77,33 @@
> + *
> + * @return The number of hardware threads.
> + */
>-+ int
>++static int
> +pocl_cpuinfo_detect_compute_unit_count()
> +{
> +  return sysconf(_SC_NPROCESSORS_ONLN);
> +}
> +#endif
>- 
>++ 
>  #ifdef POCL_ANDROID
>  
>-@@ -270,6 +332,7 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_
>+ #define SYSFS_CPU_NUM_CORES_NODE    "/sys/devices/system/cpu/possible"
>+@@ -326,6 +390,7 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_
>     * short_name is in the .data anyways.*/
>    device->long_name = device->short_name;
>  
>-+#ifdef __linux__ 
>++#ifdef __linux__
>    /* default vendor and vendor_id, in case it cannot be found by other means */
>    device->vendor = cpuvendor_default;
>    if (device->vendor_id == 0)
>-@@ -318,7 +381,25 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_
>+@@ -425,6 +490,25 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_
>    char *new_name = (char*)malloc (len);
>    snprintf (new_name, len, "%s-%s", device->short_name, start);
>    device->long_name = new_name;
>-+#elif defined(HAVE_SYSCTL_H)
>++  #elif defined(HAVE_SYSCTL_H)
> +  int mib[2];
> +  size_t len = 0;
> +  char *model;
>- 
>++
> +  mib[0] = CTL_HW;
> +  mib[1] = HW_MODEL;
> +  if (sysctl(mib, 2, NULL, &len, NULL, 0))
>diff -ruN /usr/ports/lang/pocl/files/patch-lib_CL_pocl__binary.c pocl/files/patch-lib_CL_pocl__binary.c
>--- /usr/ports/lang/pocl/files/patch-lib_CL_pocl__binary.c	2017-05-12 19:08:26.000000000 +0200
>+++ pocl/files/patch-lib_CL_pocl__binary.c	2018-01-09 06:00:14.392418000 +0100
>@@ -1,4 +1,4 @@
>---- lib/CL/pocl_binary.c.orig	2017-04-05 14:15:40 UTC
>+--- lib/CL/pocl_binary.c.orig	2018-01-08 09:12:28 UTC
> +++ lib/CL/pocl_binary.c
> @@ -36,7 +36,7 @@
>  #include <libgen.h>
>diff -ruN /usr/ports/lang/pocl/files/patch-tests_regression_test__issue__445.cpp pocl/files/patch-tests_regression_test__issue__445.cpp
>--- /usr/ports/lang/pocl/files/patch-tests_regression_test__issue__445.cpp	2017-05-12 19:08:26.000000000 +0200
>+++ pocl/files/patch-tests_regression_test__issue__445.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- tests/regression/test_issue_445.cpp.orig	2017-04-05 14:15:40 UTC
>-+++ tests/regression/test_issue_445.cpp
>-@@ -29,7 +29,7 @@ private_local_array(__global int *__rest
>- }
>- )CLC";
>- 
>--int main(int, char *)
>-+int main(int, char **)
>- {
>-   try {
>-     int N = 9;
>diff -ruN /usr/ports/lang/pocl/Makefile pocl/Makefile
>--- /usr/ports/lang/pocl/Makefile	2017-12-18 22:53:28.000000000 +0100
>+++ pocl/Makefile	2018-01-09 06:13:43.515776000 +0100
>@@ -1,10 +1,9 @@
>-# $FreeBSD: head/lang/pocl/Makefile 456680 2017-12-18 21:53:28Z antoine $
>+# $FreeBSD: head/lang/pocl/Makefile 440691 2017-05-12 17:08:26Z rezny $
> 
> PORTNAME=	pocl
>-PORTVERSION=	0.14
>+PORTVERSION=	1.0
> CATEGORIES=	lang
>-MASTER_SITES=	SF/pocl \
>-		http://portablecl.org/downloads/
>+MASTER_SITES=	http://portablecl.org/downloads/
> 
> MAINTAINER=	ohartman@zedat.fu-berlin.de
> COMMENT=	POrtable Computing Language (POCL)
>@@ -12,8 +11,6 @@
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BROKEN=		fails to package
>-
> BUILD_DEPENDS=	llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION} \
> 		opencl>=2.1:devel/opencl
> LIB_DEPENDS=	libhwloc.so:devel/hwloc \
>@@ -22,14 +19,14 @@
> RUN_DEPENDS=	llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION}
> 
> BROKEN_FreeBSD_10=	pocl is not supported on 10.x
>-ONLY_FOR_ARCHS=		i386 amd64
>+ONLY_FOR_ARCHS=		amd64 i386
> ONLY_FOR_ARCHS_REASON=	only tested on x86
> 
> LLVM_VERSION=	${MESA_LLVM_VER:U40}
> 
>+USES=		cmake localbase:ldflags ncurses pkgconfig
> USE_LDCONFIG=	yes
> USE_CXXSTD=	gnu++11
>-USES=		cmake localbase:ldflags ncurses pkgconfig
> 
> CMAKE_ARGS=	-DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \
> 		-DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \
>diff -ruN /usr/ports/lang/pocl/pkg-plist pocl/pkg-plist
>--- /usr/ports/lang/pocl/pkg-plist	2017-05-12 19:08:26.000000000 +0200
>+++ pocl/pkg-plist	2018-01-09 06:00:14.337157000 +0100
>@@ -2,13 +2,14 @@
> etc/OpenCL/vendors/pocl.icd
> include/poclu.h
> lib/libpocl.so
>-lib/libpocl.so.1
>-lib/libpocl.so.1.7.0
>+lib/libpocl.so.2
>+lib/libpocl.so.2.0.0
> lib/libpoclu.so
>-lib/libpoclu.so.1
>-lib/libpoclu.so.1.7.0
>+lib/libpoclu.so.2
>+lib/libpoclu.so.2.0.0
> lib/pocl/libllvmopencl.so
> libdata/pkgconfig/pocl.pc
>+%%DATADIR%%/include/_builtin_renames.h
> %%DATADIR%%/include/_enable_all_exts.h
> %%DATADIR%%/include/_kernel.h
> %%DATADIR%%/include/_kernel_c.h
>@@ -16,10 +17,11 @@
> %%DATADIR%%/include/pocl.h
> %%DATADIR%%/include/pocl_device.h
> %%DATADIR%%/include/pocl_types.h
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-avx.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-avx2.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-avx512.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-avx_fma4.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-sse2.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-sse41.bc
>-%%DATADIR%%/kernel-%%ARCH%%-unknown-%%OPSYS%%%%OSREL%%-ssse3.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx2.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx512.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx_f16c.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx_fma4.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-sse2.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-sse41.bc
>+%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-ssse3.bc

Actions: View | Diff

Attachments on bug 224584: 189095 | 189556 | 190869 | 192103 | 196942 | 197659 | 197660 | 197701 | 204140 | 204838