Attachment #175867 for bug #213567

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

Lines 2-8 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libflatarray	4	PORTNAME= libflatarray
5	PORTVERSION= 0.2.0	5	PORTVERSION= 0.3.0
6	CATEGORIES= devel science	6	CATEGORIES= devel science
7	MASTER_SITES= http://www.libgeodecomp.org/archive/	7	MASTER_SITES= http://www.libgeodecomp.org/archive/
8		8
Lines 13-19 Link Here
13		13
14	BUILD_DEPENDS= boost-libs>=1.48:devel/boost-libs	14	BUILD_DEPENDS= boost-libs>=1.48:devel/boost-libs
15		15
16	USES= cmake:outsource	16	USES= cmake:outsource compiler:c++11-lib
17		17
18	CMAKE_ARGS+= -DWITH_CUDA:BOOL=FALSE	18	CMAKE_ARGS+= -DWITH_CUDA:BOOL=FALSE
19		19

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (libflatarray-0.2.0.tar.gz) = 6ab2aee30e4bd0c8eed876e68c8865c6b981e22481a870154d60e1c520ed9203	1	SHA256 (libflatarray-0.3.0.tar.gz) = 25bb7244c4defddc1458d465f1d78ceaf06166c3e45b54aef5693424de4b4d02
2	SIZE (libflatarray-0.2.0.tar.gz) = 41804	2	SIZE (libflatarray-0.3.0.tar.gz) = 143859




--- examples/performance_tests/main.cpp.orig	2016-02-02 20:14:50 UTC
+++ examples/performance_tests/main.cpp
@@ -10,7 +10,14 @@
 #include <libflatarray/short_vec.hpp>
 #include <libflatarray/testbed/cpu_benchmark.hpp>
 #include <libflatarray/testbed/evaluate.hpp>
+
+#ifdef __SSE__
+#include <xmmintrin.h>
+#endif
+
+#ifdef __AVX__
 #include <immintrin.h>
+#endif
 
 #define WEIGHT_S 0.11
 #define WEIGHT_T 0.12
@@ -118,6 +125,7 @@ private:
     }
 };
 
+#ifdef __SSE__
 class JacobiD3Q7Pepper : public JacobiD3Q7
 {
 public:
@@ -292,6 +300,7 @@ private:
         }
     }
 };
+#endif
 
 class JacobiCell
 {
@@ -416,6 +425,7 @@ private:
     }
 };
 
+#ifdef __SSE__
 class JacobiD3Q7Silver : public JacobiD3Q7
 {
 public:
@@ -634,6 +644,7 @@ private:
         }
     }
 };
+#endif
 
 class Particle
 {
@@ -1477,7 +1488,7 @@ int main(int argc, char **argv)
         eval(JacobiD3Q7Vanilla(), *i);
     }
 
-#ifdef __AVX__
+#ifdef __SSE__
     for (std::vector<std::vector<int> >::iterator i = sizes.begin(); i != sizes.end(); ++i) {
         eval(JacobiD3Q7Pepper(), *i);
     }
@@ -1487,9 +1498,11 @@ int main(int argc, char **argv)
         eval(JacobiD3Q7Bronze(), *i);
     }
 
+#ifdef __SSE__
     for (std::vector<std::vector<int> >::iterator i = sizes.begin(); i != sizes.end(); ++i) {
         eval(JacobiD3Q7Silver(), *i);
     }
+#endif
 
     sizes.clear();
 




--- src/aligned_allocator.hpp.orig	2014-10-28 09:12:31 UTC
+++ src/aligned_allocator.hpp
@@ -8,13 +8,7 @@
 #ifndef FLAT_ARRAY_ALIGNED_ALLOCATOR_HPP
 #define FLAT_ARRAY_ALIGNED_ALLOCATOR_HPP
 
-#ifdef __APPLE__
 #include <cstddef>
-#include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
-
 #include <memory>
 
 namespace LibFlatArray {




lib/cmake/libflatarray/libflatarrayConfigVersion.cmake
lib/cmake/libflatarray/libflatarrayConfig.cmake
include/libflatarray/aggregated_member_size.hpp
include/libflatarray/aligned_allocator.hpp
include/libflatarray/api_traits.hpp
include/libflatarray/coord.hpp
include/libflatarray/cuda_allocator.hpp
include/libflatarray/cuda_array.hpp
include/libflatarray/estimate_optimum_short_vec_type.hpp
include/libflatarray/flat_array.hpp
include/libflatarray/loop_peeler.hpp
include/libflatarray/macros.hpp
include/libflatarray/member_ptr_to_offset.hpp
include/libflatarray/number_of_members.hpp
include/libflatarray/preprocessor.hpp
include/libflatarray/short_vec.hpp
include/libflatarray/soa_accessor.hpp
include/libflatarray/soa_array.hpp
include/libflatarray/soa_grid.hpp
include/libflatarray/streaming_short_vec.hpp
include/libflatarray/detail/construct_functor.hpp
include/libflatarray/detail/copy_functor.hpp
include/libflatarray/detail/destroy_functor.hpp
include/libflatarray/detail/dual_callback_helper.hpp
include/libflatarray/detail/generate_cuda_launch_config.hpp
include/libflatarray/detail/generic_destruct.hpp
include/libflatarray/detail/get_instance_functor.hpp
include/libflatarray/detail/load_functor.hpp
include/libflatarray/detail/macros.hpp
include/libflatarray/detail/offset.hpp
include/libflatarray/detail/preprocessor.hpp
include/libflatarray/detail/save_functor.hpp
include/libflatarray/detail/set_byte_size_functor.hpp
include/libflatarray/detail/set_instance_functor.hpp
include/libflatarray/detail/short_vec_avx512_double_16.hpp
include/libflatarray/detail/short_vec_avx512_double_32.hpp
include/libflatarray/detail/short_vec_avx512_double_8.hpp
include/libflatarray/detail/short_vec_avx512_float_16.hpp
include/libflatarray/detail/short_vec_avx512_float_32.hpp
include/libflatarray/detail/short_vec_avx512_int_16.hpp
include/libflatarray/detail/short_vec_avx512_int_32.hpp
include/libflatarray/detail/short_vec_avx_double_16.hpp
include/libflatarray/detail/short_vec_avx_double_32.hpp
include/libflatarray/detail/short_vec_avx_double_4.hpp
include/libflatarray/detail/short_vec_avx_double_8.hpp
include/libflatarray/detail/short_vec_avx_float_16.hpp
include/libflatarray/detail/short_vec_avx_float_32.hpp
include/libflatarray/detail/short_vec_avx_float_8.hpp
include/libflatarray/detail/short_vec_avx_int_16.hpp
include/libflatarray/detail/short_vec_avx_int_32.hpp
include/libflatarray/detail/short_vec_avx_int_8.hpp
include/libflatarray/detail/short_vec_helpers.hpp
include/libflatarray/detail/short_vec_mic_double_16.hpp
include/libflatarray/detail/short_vec_mic_double_32.hpp
include/libflatarray/detail/short_vec_mic_double_8.hpp
include/libflatarray/detail/short_vec_mic_float_16.hpp
include/libflatarray/detail/short_vec_mic_float_32.hpp
include/libflatarray/detail/short_vec_neon_float_16.hpp
include/libflatarray/detail/short_vec_neon_float_32.hpp
include/libflatarray/detail/short_vec_neon_float_4.hpp
include/libflatarray/detail/short_vec_neon_float_8.hpp
include/libflatarray/detail/short_vec_qpx_double_16.hpp
include/libflatarray/detail/short_vec_qpx_double_32.hpp
include/libflatarray/detail/short_vec_qpx_double_4.hpp
include/libflatarray/detail/short_vec_qpx_double_8.hpp
include/libflatarray/detail/short_vec_scalar_double_1.hpp
include/libflatarray/detail/short_vec_scalar_double_16.hpp
include/libflatarray/detail/short_vec_scalar_double_2.hpp
include/libflatarray/detail/short_vec_scalar_double_32.hpp
include/libflatarray/detail/short_vec_scalar_double_4.hpp
include/libflatarray/detail/short_vec_scalar_double_8.hpp
include/libflatarray/detail/short_vec_scalar_float_1.hpp
include/libflatarray/detail/short_vec_scalar_float_16.hpp
include/libflatarray/detail/short_vec_scalar_float_2.hpp
include/libflatarray/detail/short_vec_scalar_float_32.hpp
include/libflatarray/detail/short_vec_scalar_float_4.hpp
include/libflatarray/detail/short_vec_scalar_float_8.hpp
include/libflatarray/detail/short_vec_scalar_int_1.hpp
include/libflatarray/detail/short_vec_scalar_int_16.hpp
include/libflatarray/detail/short_vec_scalar_int_2.hpp
include/libflatarray/detail/short_vec_scalar_int_32.hpp
include/libflatarray/detail/short_vec_scalar_int_4.hpp
include/libflatarray/detail/short_vec_scalar_int_8.hpp
include/libflatarray/detail/short_vec_sse_double_16.hpp
include/libflatarray/detail/short_vec_sse_double_2.hpp
include/libflatarray/detail/short_vec_sse_double_32.hpp
include/libflatarray/detail/short_vec_sse_double_4.hpp
include/libflatarray/detail/short_vec_sse_double_8.hpp
include/libflatarray/detail/short_vec_sse_float_16.hpp
include/libflatarray/detail/short_vec_sse_float_32.hpp
include/libflatarray/detail/short_vec_sse_float_4.hpp
include/libflatarray/detail/short_vec_sse_float_8.hpp
include/libflatarray/detail/short_vec_sse_int_16.hpp
include/libflatarray/detail/short_vec_sse_int_32.hpp
include/libflatarray/detail/short_vec_sse_int_4.hpp
include/libflatarray/detail/short_vec_sse_int_8.hpp
include/libflatarray/detail/sibling_short_vec_switch.hpp
include/libflatarray/detail/simple_streak.hpp
include/libflatarray/detail/soa_array_member_copy_helper.hpp
include/libflatarray/detail/sqrt_reference.hpp
include/libflatarray/detail/staging_buffer.hpp
include/libflatarray/detail/streaming_short_vec_switch.hpp
include/libflatarray/member_ptr_to_offset.hpp
include/libflatarray/number_of_members.hpp
include/libflatarray/short_vec.hpp
include/libflatarray/soa_accessor.hpp
include/libflatarray/soa_array.hpp
include/libflatarray/soa_grid.hpp
include/libflatarray/testbed/benchmark.hpp
include/libflatarray/testbed/cpu_benchmark.hpp
include/libflatarray/testbed/evaluate.hpp
include/libflatarray/testbed/gpu_benchmark.hpp
include/libflatarray/config.h
lib/cmake/libflatarray/libflatarrayConfigVersion.cmake

Return to bug 213567

Lines 1-70 Link Here

(-)files/patch-examples_performance__tests_main.cpp (-70 lines)
1	--- examples/performance_tests/main.cpp.orig 2016-02-02 20:14:50 UTC
2	+++ examples/performance_tests/main.cpp
3	@@ -10,7 +10,14 @@
4	#include <libflatarray/short_vec.hpp>
5	#include <libflatarray/testbed/cpu_benchmark.hpp>
6	#include <libflatarray/testbed/evaluate.hpp>
7	+
8	+#ifdef __SSE__
9	+#include <xmmintrin.h>
10	+#endif
11	+
12	+#ifdef __AVX__
13	#include <immintrin.h>
14	+#endif
15
16	#define WEIGHT_S 0.11
17	#define WEIGHT_T 0.12
18	@@ -118,6 +125,7 @@ private:
19	}
20	};
21
22	+#ifdef __SSE__
23	class JacobiD3Q7Pepper : public JacobiD3Q7
24	{
25	public:
26	@@ -292,6 +300,7 @@ private:
27	}
28	}
29	};
30	+#endif
31
32	class JacobiCell
33	{
34	@@ -416,6 +425,7 @@ private:
35	}
36	};
37
38	+#ifdef __SSE__
39	class JacobiD3Q7Silver : public JacobiD3Q7
40	{
41	public:
42	@@ -634,6 +644,7 @@ private:
43	}
44	}
45	};
46	+#endif
47
48	class Particle
49	{
50	@@ -1477,7 +1488,7 @@ int main(int argc, char **argv)
51	eval(JacobiD3Q7Vanilla(), *i);
52	}
53
54	-#ifdef __AVX__
55	+#ifdef __SSE__
56	for (std::vector<std::vector<int> >::iterator i = sizes.begin(); i != sizes.end(); ++i) {
57	eval(JacobiD3Q7Pepper(), *i);
58	}
59	@@ -1487,9 +1498,11 @@ int main(int argc, char **argv)
60	eval(JacobiD3Q7Bronze(), *i);
61	}
62
63	+#ifdef __SSE__
64	for (std::vector<std::vector<int> >::iterator i = sizes.begin(); i != sizes.end(); ++i) {
65	eval(JacobiD3Q7Silver(), *i);
66	}
67	+#endif
68
69	sizes.clear();
70

Lines 1-16 Link Here

(-)files/patch-src_aligned__allocator.hpp (-16 lines)
1	--- src/aligned_allocator.hpp.orig 2014-10-28 09:12:31 UTC
2	+++ src/aligned_allocator.hpp
3	@@ -8,13 +8,7 @@
4	#ifndef FLAT_ARRAY_ALIGNED_ALLOCATOR_HPP
5	#define FLAT_ARRAY_ALIGNED_ALLOCATOR_HPP
6
7	-#ifdef __APPLE__
8	#include <cstddef>
9	-#include <stdlib.h>
10	-#else
11	-#include <malloc.h>
12	-#endif
13	-
14	#include <memory>
15
16	namespace LibFlatArray {

Lines 1-31 Link Here

(-)pkg-plist (-12 / +88 lines)
		1	lib/cmake/libflatarray/libflatarrayConfigVersion.cmake
		2	lib/cmake/libflatarray/libflatarrayConfig.cmake
1	include/libflatarray/aggregated_member_size.hpp	3	include/libflatarray/aggregated_member_size.hpp
2	include/libflatarray/aligned_allocator.hpp	4	include/libflatarray/aligned_allocator.hpp
3	include/libflatarray/api_traits.hpp	5	include/libflatarray/api_traits.hpp
4	include/libflatarray/coord.hpp	6	include/libflatarray/coord.hpp
5	include/libflatarray/cuda_allocator.hpp	7	include/libflatarray/cuda_allocator.hpp
		8	include/libflatarray/cuda_array.hpp
		9	include/libflatarray/estimate_optimum_short_vec_type.hpp
		10	include/libflatarray/flat_array.hpp
		11	include/libflatarray/loop_peeler.hpp
		12	include/libflatarray/macros.hpp
		13	include/libflatarray/member_ptr_to_offset.hpp
		14	include/libflatarray/number_of_members.hpp
		15	include/libflatarray/preprocessor.hpp
		16	include/libflatarray/short_vec.hpp
		17	include/libflatarray/soa_accessor.hpp
		18	include/libflatarray/soa_array.hpp
		19	include/libflatarray/soa_grid.hpp
		20	include/libflatarray/streaming_short_vec.hpp
		21	include/libflatarray/detail/construct_functor.hpp
		22	include/libflatarray/detail/copy_functor.hpp
		23	include/libflatarray/detail/destroy_functor.hpp
6	include/libflatarray/detail/dual_callback_helper.hpp	24	include/libflatarray/detail/dual_callback_helper.hpp
7	include/libflatarray/detail/get_set_instance_functor.hpp	25	include/libflatarray/detail/generate_cuda_launch_config.hpp
8	include/libflatarray/detail/load_save_functor.hpp	26	include/libflatarray/detail/generic_destruct.hpp
		27	include/libflatarray/detail/get_instance_functor.hpp
		28	include/libflatarray/detail/load_functor.hpp
9	include/libflatarray/detail/macros.hpp	29	include/libflatarray/detail/macros.hpp
10	include/libflatarray/detail/offset.hpp	30	include/libflatarray/detail/offset.hpp
		31	include/libflatarray/detail/preprocessor.hpp
		32	include/libflatarray/detail/save_functor.hpp
11	include/libflatarray/detail/set_byte_size_functor.hpp	33	include/libflatarray/detail/set_byte_size_functor.hpp
		34	include/libflatarray/detail/set_instance_functor.hpp
		35	include/libflatarray/detail/short_vec_avx512_double_16.hpp
		36	include/libflatarray/detail/short_vec_avx512_double_32.hpp
		37	include/libflatarray/detail/short_vec_avx512_double_8.hpp
		38	include/libflatarray/detail/short_vec_avx512_float_16.hpp
		39	include/libflatarray/detail/short_vec_avx512_float_32.hpp
		40	include/libflatarray/detail/short_vec_avx512_int_16.hpp
		41	include/libflatarray/detail/short_vec_avx512_int_32.hpp
		42	include/libflatarray/detail/short_vec_avx_double_16.hpp
		43	include/libflatarray/detail/short_vec_avx_double_32.hpp
		44	include/libflatarray/detail/short_vec_avx_double_4.hpp
		45	include/libflatarray/detail/short_vec_avx_double_8.hpp
		46	include/libflatarray/detail/short_vec_avx_float_16.hpp
		47	include/libflatarray/detail/short_vec_avx_float_32.hpp
12	include/libflatarray/detail/short_vec_avx_float_8.hpp	48	include/libflatarray/detail/short_vec_avx_float_8.hpp
		49	include/libflatarray/detail/short_vec_avx_int_16.hpp
		50	include/libflatarray/detail/short_vec_avx_int_32.hpp
		51	include/libflatarray/detail/short_vec_avx_int_8.hpp
		52	include/libflatarray/detail/short_vec_helpers.hpp
		53	include/libflatarray/detail/short_vec_mic_double_16.hpp
		54	include/libflatarray/detail/short_vec_mic_double_32.hpp
		55	include/libflatarray/detail/short_vec_mic_double_8.hpp
		56	include/libflatarray/detail/short_vec_mic_float_16.hpp
		57	include/libflatarray/detail/short_vec_mic_float_32.hpp
		58	include/libflatarray/detail/short_vec_neon_float_16.hpp
		59	include/libflatarray/detail/short_vec_neon_float_32.hpp
		60	include/libflatarray/detail/short_vec_neon_float_4.hpp
		61	include/libflatarray/detail/short_vec_neon_float_8.hpp
		62	include/libflatarray/detail/short_vec_qpx_double_16.hpp
		63	include/libflatarray/detail/short_vec_qpx_double_32.hpp
13	include/libflatarray/detail/short_vec_qpx_double_4.hpp	64	include/libflatarray/detail/short_vec_qpx_double_4.hpp
		65	include/libflatarray/detail/short_vec_qpx_double_8.hpp
		66	include/libflatarray/detail/short_vec_scalar_double_1.hpp
		67	include/libflatarray/detail/short_vec_scalar_double_16.hpp
		68	include/libflatarray/detail/short_vec_scalar_double_2.hpp
		69	include/libflatarray/detail/short_vec_scalar_double_32.hpp
		70	include/libflatarray/detail/short_vec_scalar_double_4.hpp
		71	include/libflatarray/detail/short_vec_scalar_double_8.hpp
		72	include/libflatarray/detail/short_vec_scalar_float_1.hpp
		73	include/libflatarray/detail/short_vec_scalar_float_16.hpp
		74	include/libflatarray/detail/short_vec_scalar_float_2.hpp
		75	include/libflatarray/detail/short_vec_scalar_float_32.hpp
		76	include/libflatarray/detail/short_vec_scalar_float_4.hpp
		77	include/libflatarray/detail/short_vec_scalar_float_8.hpp
		78	include/libflatarray/detail/short_vec_scalar_int_1.hpp
		79	include/libflatarray/detail/short_vec_scalar_int_16.hpp
		80	include/libflatarray/detail/short_vec_scalar_int_2.hpp
		81	include/libflatarray/detail/short_vec_scalar_int_32.hpp
		82	include/libflatarray/detail/short_vec_scalar_int_4.hpp
		83	include/libflatarray/detail/short_vec_scalar_int_8.hpp
		84	include/libflatarray/detail/short_vec_sse_double_16.hpp
		85	include/libflatarray/detail/short_vec_sse_double_2.hpp
		86	include/libflatarray/detail/short_vec_sse_double_32.hpp
		87	include/libflatarray/detail/short_vec_sse_double_4.hpp
14	include/libflatarray/detail/short_vec_sse_double_8.hpp	88	include/libflatarray/detail/short_vec_sse_double_8.hpp
15	include/libflatarray/detail/short_vec_sse_float_16.hpp	89	include/libflatarray/detail/short_vec_sse_float_16.hpp
		90	include/libflatarray/detail/short_vec_sse_float_32.hpp
		91	include/libflatarray/detail/short_vec_sse_float_4.hpp
16	include/libflatarray/detail/short_vec_sse_float_8.hpp	92	include/libflatarray/detail/short_vec_sse_float_8.hpp
		93	include/libflatarray/detail/short_vec_sse_int_16.hpp
		94	include/libflatarray/detail/short_vec_sse_int_32.hpp
		95	include/libflatarray/detail/short_vec_sse_int_4.hpp
		96	include/libflatarray/detail/short_vec_sse_int_8.hpp
		97	include/libflatarray/detail/sibling_short_vec_switch.hpp
		98	include/libflatarray/detail/simple_streak.hpp
		99	include/libflatarray/detail/soa_array_member_copy_helper.hpp
17	include/libflatarray/detail/sqrt_reference.hpp	100	include/libflatarray/detail/sqrt_reference.hpp
18	include/libflatarray/flat_array.hpp	101	include/libflatarray/detail/staging_buffer.hpp
19	include/libflatarray/macros.hpp	102	include/libflatarray/detail/streaming_short_vec_switch.hpp
20	include/libflatarray/member_ptr_to_offset.hpp
21	include/libflatarray/number_of_members.hpp
22	include/libflatarray/short_vec.hpp
23	include/libflatarray/soa_accessor.hpp
24	include/libflatarray/soa_array.hpp
25	include/libflatarray/soa_grid.hpp
26	include/libflatarray/testbed/benchmark.hpp	103	include/libflatarray/testbed/benchmark.hpp
27	include/libflatarray/testbed/cpu_benchmark.hpp	104	include/libflatarray/testbed/cpu_benchmark.hpp
28	include/libflatarray/testbed/evaluate.hpp	105	include/libflatarray/testbed/evaluate.hpp
29	include/libflatarray/testbed/gpu_benchmark.hpp	106	include/libflatarray/testbed/gpu_benchmark.hpp
30	lib/cmake/libflatarray/libflatarrayConfig.cmake	107	include/libflatarray/config.h
31	lib/cmake/libflatarray/libflatarrayConfigVersion.cmake