Attachment #141168 for bug #187897

View | Details | Raw Unified | Return to bug 187897
Collapse All | Expand All

Lines 2-9 Link Here

(-)opencl/Makefile (-3 / +2 lines)
2	# $FreeBSD: head/devel/opencl/Makefile 343462 2014-02-09 11:16:12Z riggs $	2	# $FreeBSD: head/devel/opencl/Makefile 343462 2014-02-09 11:16:12Z riggs $
3		3
4	PORTNAME= opencl	4	PORTNAME= opencl
5	PORTVERSION= 1.2	5	PORTVERSION= 2.0
6	PORTREVISION= 7
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://www.khronos.org/registry/cl/api/${PORTVERSION}/	7	MASTER_SITES= http://www.khronos.org/registry/cl/api/${PORTVERSION}/
9	DISTFILES= opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \	8	DISTFILES= opencl.h cl_platform.h cl.h cl_ext.h cl_dx9_media_sharing.h \
Lines 12-18 Link Here
12	EXTRACT_ONLY=	11	EXTRACT_ONLY=
13		12
14	MAINTAINER= ohartman@zedat.fu-berlin.de	13	MAINTAINER= ohartman@zedat.fu-berlin.de
15	COMMENT= Open Computing Language (OpenCL) specifications V1.2 (header files)	14	COMMENT= Open Computing Language (OpenCL) specifications V2.0 (header files)
16		15
17	LICENSE= unknown	16	LICENSE= unknown
18	LICENSE_NAME= BSD-esque license agreement	17	LICENSE_NAME= BSD-esque license agreement




SHA256 (opencl/opencl.h) = fceb7e76d81159caab6308a05ff05d18fbd84718eff4263473ecd148c458987c
SIZE (opencl/opencl.h) = 1754
SHA256 (opencl/cl_platform.h) = 042877b8091bfeeb489018505ce36c37cd3295e691856461b1c0a8fbb6b2cc21
SIZE (opencl/cl_platform.h) = 42192
SHA256 (opencl/cl.h) = d1a78667d6098438fe605f4b6b770eb13a123658e815eef118e50b5ead6712cf
SIZE (opencl/cl.h) = 70744
SHA256 (opencl/cl_ext.h) = be1ff04c63b678383828ab1e69ecf3bec54eec4cf4ae33e210b4a16eff47d809
SIZE (opencl/cl_ext.h) = 14002
SHA256 (opencl/cl_dx9_media_sharing.h) = 41968538b82523ef8fb642a1a4da20a6262ce0448f71541db080f8ccc03971b6
SIZE (opencl/cl_dx9_media_sharing.h) = 5181
SHA256 (opencl/cl_d3d10.h) = 14b00ef68a2d7f471c7ef5b4576bc103888da70fc525b263b49ff7fff150e188
SIZE (opencl/cl_d3d10.h) = 4883
SHA256 (opencl/cl_d3d11.h) = 707709a73b6b43b96c55e813efb2d655efcc82eb103da4b8aea191231df7e1fd
SIZE (opencl/cl_d3d11.h) = 4877
SHA256 (opencl/cl_gl.h) = 40375d991f4e847c94ad56c6c14400e3e7d72620117b49636518a96d57f30647
SIZE (opencl/cl_gl.h) = 7346
SHA256 (opencl/cl_gl_ext.h) = dccb3b45e53bfe0219bb48e6dbe9591bbe6a090a8b0d93a3b8580f526abc4616
SIZE (opencl/cl_gl_ext.h) = 2630
SHA256 (opencl/cl.hpp) = eeacf0fefc51d618dda67d52e2bbff7dc9a67e90bc38166b3fad26d44800013a
SIZE (opencl/cl.hpp) = 915453




--- cl.hpp.orig	2013-08-20 13:33:04.000000000 +0200
+++ cl.hpp	2013-08-20 13:35:49.000000000 +0200
@@ -210,11 +210,9 @@
 #include <string>
 #endif 
 
-#if defined(linux) || defined(__APPLE__) || defined(__MACOSX)
+#if defined(__FreeBSD__) || defined(linux) || defined(__APPLE__) || defined(__MACOSX)
 #include <alloca.h>
 
-#include <emmintrin.h>
-#include <xmmintrin.h>
 #endif // linux
 
 #include <cstring>
@@ -1037,7 +1035,7 @@
 #endif // !_WIN32
     }
 
-    inline void fence() { _mm_mfence(); }
+    inline void fence() { __sync_synchronize(); }
 }; // namespace detail
 
     
@@ -2037,6 +2035,26 @@
 #endif // #if defined(CL_VERSION_1_1)
 };
 
+template <typename Func>
+cl_int detail::GetInfoHelper<Func, VECTOR_CLASS<cl::Device> >::
+    get(Func f, cl_uint name, VECTOR_CLASS<cl::Device>* param)
+    {
+        ::size_t required;
+        cl_int err = f(name, 0, NULL, &required);
+        if (err != CL_SUCCESS) {
+            return err;
+        }
+
+        cl_device_id* value = (cl_device_id*) alloca(required);
+        err = f(name, required, value, NULL);
+        if (err != CL_SUCCESS) {
+            return err;
+        }
+
+        param->assign(&value[0], &value[required/sizeof(cl_device_id)]);
+        return CL_SUCCESS;
+    }
+
 /*! \brief Class interface for cl_platform_id.
  *
  *  \note Copies of these objects are inexpensive, since they don't 'own'

Lines 3-8 Link Here

(-)opencl/pkg-descr (-3 / +1 lines)
3	other processors, giving software developers portable and efficient	3	other processors, giving software developers portable and efficient
4	access to the power of these heterogeneous processing platforms.	4	access to the power of these heterogeneous processing platforms.
5		5
6	This is OpenCL 1.2	6	This is OpenCL 2.0
7
8	WWW: http://www.khronos.org/opencl/

Lines 1-4 Link Here

(-)opencl/pkg-message (-2 lines)
1	OpenCL is the first open, royalty-free standard for cross-platform,	1	OpenCL is the first open, royalty-free standard for cross-platform,
2	parallel programming of modern processors.	2	parallel programming of modern processors.
3
4	Patchset provided by POCL developers for cl.hpp applied.

Return to bug 187897

Lines 1-20 Link Here

(-)opencl/distinfo (-18 / +18 lines)
1	SHA256 (opencl/opencl.h) = be1bf717e103678292d6718b3608c9e54a48588c02d3d387a48656fac46ec8d9	1	SHA256 (opencl/opencl.h) = fceb7e76d81159caab6308a05ff05d18fbd84718eff4263473ecd148c458987c
2	SIZE (opencl/opencl.h) = 1754	2	SIZE (opencl/opencl.h) = 1754
3	SHA256 (opencl/cl_platform.h) = e212b89bba54f7a4e090a2b2f58f779241ffb3b45b870eee790689fc2ca0e0ae	3	SHA256 (opencl/cl_platform.h) = 042877b8091bfeeb489018505ce36c37cd3295e691856461b1c0a8fbb6b2cc21
4	SIZE (opencl/cl_platform.h) = 41127	4	SIZE (opencl/cl_platform.h) = 42192
5	SHA256 (opencl/cl.h) = a5465c2ed1a0687878c8f7aa25f94626d7cd3a3868163ecaa6e8b36d6ed52368	5	SHA256 (opencl/cl.h) = d1a78667d6098438fe605f4b6b770eb13a123658e815eef118e50b5ead6712cf
6	SIZE (opencl/cl.h) = 61545	6	SIZE (opencl/cl.h) = 70744
7	SHA256 (opencl/cl_ext.h) = ab8dcf1e04ac63cc5a68fdfb4787a44a25a9c0c129ed7eda046e7911af3d4ebd	7	SHA256 (opencl/cl_ext.h) = be1ff04c63b678383828ab1e69ecf3bec54eec4cf4ae33e210b4a16eff47d809
8	SIZE (opencl/cl_ext.h) = 13766	8	SIZE (opencl/cl_ext.h) = 14002
9	SHA256 (opencl/cl_dx9_media_sharing.h) = 26fb40bac8e229747bdc27b350b836e3703c1e946cb40893f4c8ab2289203920	9	SHA256 (opencl/cl_dx9_media_sharing.h) = 41968538b82523ef8fb642a1a4da20a6262ce0448f71541db080f8ccc03971b6
10	SIZE (opencl/cl_dx9_media_sharing.h) = 5157	10	SIZE (opencl/cl_dx9_media_sharing.h) = 5181
11	SHA256 (opencl/cl_d3d10.h) = c7adb38a19663ee240977afc64903f4638d9c5c03ca478793c9f7a15c1c6ac2b	11	SHA256 (opencl/cl_d3d10.h) = 14b00ef68a2d7f471c7ef5b4576bc103888da70fc525b263b49ff7fff150e188
12	SIZE (opencl/cl_d3d10.h) = 4859	12	SIZE (opencl/cl_d3d10.h) = 4883
13	SHA256 (opencl/cl_d3d11.h) = 8ade5d641e1acd12fa37bac36abf41f24985f4e38ceb32da9c01cc0e4fc3742f	13	SHA256 (opencl/cl_d3d11.h) = 707709a73b6b43b96c55e813efb2d655efcc82eb103da4b8aea191231df7e1fd
14	SIZE (opencl/cl_d3d11.h) = 4853	14	SIZE (opencl/cl_d3d11.h) = 4877
15	SHA256 (opencl/cl_gl.h) = aa49d380177ac538b8ab00196381301fac6178e5b931398e3da43067ac3c33c4	15	SHA256 (opencl/cl_gl.h) = 40375d991f4e847c94ad56c6c14400e3e7d72620117b49636518a96d57f30647
16	SIZE (opencl/cl_gl.h) = 7343	16	SIZE (opencl/cl_gl.h) = 7346
17	SHA256 (opencl/cl_gl_ext.h) = 4d663bbfc932ab405623e5f5d1bba3f438351d0ead65e1ccdd9bb769caf7a7d0	17	SHA256 (opencl/cl_gl_ext.h) = dccb3b45e53bfe0219bb48e6dbe9591bbe6a090a8b0d93a3b8580f526abc4616
18	SIZE (opencl/cl_gl_ext.h) = 2630	18	SIZE (opencl/cl_gl_ext.h) = 2630
19	SHA256 (opencl/cl.hpp) = a726d674bfa4ee7f71d1287d86afa15db2e360518fd58594257a80f25642d6b4	19	SHA256 (opencl/cl.hpp) = eeacf0fefc51d618dda67d52e2bbff7dc9a67e90bc38166b3fad26d44800013a
20	SIZE (opencl/cl.hpp) = 281446	20	SIZE (opencl/cl.hpp) = 915453

Lines 1-51 Link Here

(-)opencl/files/patch-cl.hpp (-51 lines)
1	--- cl.hpp.orig 2013-08-20 13:33:04.000000000 +0200
2	+++ cl.hpp 2013-08-20 13:35:49.000000000 +0200
3	@@ -210,11 +210,9 @@
4	#include <string>
5	#endif
6
7	-#if defined(linux) \|\| defined(__APPLE__) \|\| defined(__MACOSX)
8	+#if defined(__FreeBSD__) \|\| defined(linux) \|\| defined(__APPLE__) \|\| defined(__MACOSX)
9	#include <alloca.h>
10
11	-#include <emmintrin.h>
12	-#include <xmmintrin.h>
13	#endif // linux
14
15	#include <cstring>
16	@@ -1037,7 +1035,7 @@
17	#endif // !_WIN32
18	}
19
20	- inline void fence() { _mm_mfence(); }
21	+ inline void fence() { __sync_synchronize(); }
22	}; // namespace detail
23
24
25	@@ -2037,6 +2035,26 @@
26	#endif // #if defined(CL_VERSION_1_1)
27	};
28
29	+template <typename Func>
30	+cl_int detail::GetInfoHelper<Func, VECTOR_CLASS<cl::Device> >::
31	+ get(Func f, cl_uint name, VECTOR_CLASS<cl::Device>* param)
32	+ {
33	+ ::size_t required;
34	+ cl_int err = f(name, 0, NULL, &required);
35	+ if (err != CL_SUCCESS) {
36	+ return err;
37	+ }
38	+
39	+ cl_device_id* value = (cl_device_id*) alloca(required);
40	+ err = f(name, required, value, NULL);
41	+ if (err != CL_SUCCESS) {
42	+ return err;
43	+ }
44	+
45	+ param->assign(&value[0], &value[required/sizeof(cl_device_id)]);
46	+ return CL_SUCCESS;
47	+ }
48	+
49	/*! \brief Class interface for cl_platform_id.
50	*
51	* \note Copies of these objects are inexpensive, since they don't 'own'