simd 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f6ffe0659b15461fbf3bfc7657bd72b8e0d6eb
-  data.tar.gz: 289421206f7343fed00e5fbcf214d0908e835882
+  metadata.gz: 459e978d4372f815dc06ad340ce39283369909e7
+  data.tar.gz: 7621df63dd917b69b6222f4f5b9fc72a430c8a21
 SHA512:
-  metadata.gz: 1c2353151fa088f7ebcb535d095211e83517fd2436e2acee2b5d42e43f776d8df4931007e2a50c0f11026bed64c99be20d25f6e3598e52f10b30301e532420ea
-  data.tar.gz: 1e0ef0af7c81a176fc908163f6c7d68a09ae651a9d852fecfdf0185a3aed1d1732d4636670576964537f27c687f1c9765d214b75f8d15bcab8e89e1124bcf224
+  metadata.gz: ea9d3e2b0366a7b377cea2c7412420b44170613b9704069883e7226982b643c9fb9aaefa16e39f842fce4b446725d85719cea1f16a19a951141d23ac5a2754e4
+  data.tar.gz: 99554543164a275329ec030fd482f175e96feb7d74985aee3b4b78c0991d1f55a903ef88c3295522f017016c8cf2edca8a21597ff1c8b6566fab339915b031fc

data/ext/simd/extconf.rb

@@ -1,6 +1,12 @@
 # Makes Makefiles for Ruby extensions.
 require 'mkmf'
 
+cpu = RbConfig::CONFIG['arch'].downcase
+if cpu.include?('arm')
+  ver = cpu.gsub(/[^\d]*(\d+).*/, '\\1').to_i
+  $CFLAGS << ' -mfpu=neon' if ver >= 6
+end
+
 extension_name = 'simd'
 dir_config(extension_name)
 create_makefile(extension_name)

data/ext/simd/simd_common.c

@@ -38,7 +38,7 @@ VALUE method_length(VALUE self)
 }
 
 /* Internal: Allocate memory for the data array. */
-void *internal_allocate_vector_array(unsigned long count)
+void *internal_allocate_vector_array(unsigned long long int count)
 {
 	void *vector = malloc((count + 1) * XMM_BYTES);
 	if(vector == NULL)
@@ -51,7 +51,7 @@ void *internal_allocate_vector_array(unsigned long count)
 
 /* Internal: Determine if two arrays can be acted upon, by being of equal
  * lengths or with the operand's length being a multiple of the data array's. */
-int internal_align_vectors(unsigned long v1, unsigned long v2, unsigned int modulo)
+int internal_align_vectors(unsigned long long int v1, unsigned long long int v2, unsigned int modulo)
 {
 	if((v1 % modulo) != (v2 % modulo))
 	{
@@ -85,7 +85,7 @@ int internal_align_vectors(unsigned long v1, unsigned long v2, unsigned int modu
 #pragma GCC diagnostic ignored "-Wpointer-arith"
 VALUE internal_apply_operation(VALUE self, VALUE obj, size_t size, VALUE klass, b_operation func)
 {
-	unsigned long length, i, j;
+	unsigned long long int length, i, j;
 	int align;
 	vector_t *v1, *v2, *rv;
 	void *data;
@@ -141,7 +141,7 @@ VALUE internal_apply_operation(VALUE self, VALUE obj, size_t size, VALUE klass,
 #pragma GCC diagnostic ignored "-Wpointer-arith"
 void internal_sanitize_unaligned_final_vector(vector_t *rv, size_t size)
 {
-	unsigned long i;
+	unsigned long long int i;
 
 	if((rv->len * size) % XMM_BYTES)
 	{

data/ext/simd/simd_common.h

@@ -8,7 +8,7 @@ void deallocate(vector_t *vector);
 
 VALUE method_length(VALUE self);
 
-void *internal_allocate_vector_array(unsigned long count);
-int internal_align_vectors(unsigned long v1, unsigned long v2, unsigned int modulo);
+void *internal_allocate_vector_array(unsigned long long int count);
+int internal_align_vectors(unsigned long long int v1, unsigned long long int v2, unsigned int modulo);
 VALUE internal_apply_operation(VALUE self, VALUE obj, size_t size, VALUE klass, b_operation func);
 void internal_sanitize_unaligned_final_vector(vector_t *rv, size_t size);

data/ext/simd/simd_floatarray.c

@@ -12,6 +12,9 @@ void Init_SIMD_FloatArray(VALUE parent)
 	rb_define_method(SIMD_FloatArray, "/", method_divide, 1);
 	rb_define_method(SIMD_FloatArray, "+", method_add, 1);
 	rb_define_method(SIMD_FloatArray, "-", method_subtract, 1);
+	rb_define_method(SIMD_FloatArray, "&", method_and, 1);
+	rb_define_method(SIMD_FloatArray, "|", method_or, 1);
+	rb_define_method(SIMD_FloatArray, "^", method_xor, 1);
 	rb_define_method(SIMD_FloatArray, "length", method_length, 0);
 	rb_define_method(SIMD_FloatArray, "to_a", method_to_a, 0);
 }
@@ -22,7 +25,7 @@ static VALUE method_initialize(VALUE self, VALUE rb_array)
 {
 	vector_t *vector;
 	d2v_t *data;
-	unsigned long n,i;
+	unsigned long long int n,i;
 
 	Check_Type(rb_array, T_ARRAY);
 	Data_Get_Struct(self, vector_t, vector);
@@ -75,10 +78,31 @@ static VALUE method_subtract(VALUE self, VALUE obj)
 	return(internal_apply_operation(self, obj, sizeof(double), SIMD_FloatArray, func_subtract));
 }
 
+/* Public: and values contained in the data array with those contained in
+ * another FloatArray object, returning a new FloatArray. */
+static VALUE method_and(VALUE self, VALUE obj)
+{
+	return(internal_apply_operation(self, obj, sizeof(double), SIMD_FloatArray, func_and));
+}
+
+/* Public: or values contained in the data array with those contained in
+ * another FloatArray object, returning a new FloatArray. */
+static VALUE method_or(VALUE self, VALUE obj)
+{
+	return(internal_apply_operation(self, obj, sizeof(double), SIMD_FloatArray, func_or));
+}
+
+/* Public: xor values contained in the data array with those contained in
+ * another FloatArray object, returning a new FloatArray. */
+static VALUE method_xor(VALUE self, VALUE obj)
+{
+	return(internal_apply_operation(self, obj, sizeof(double), SIMD_FloatArray, func_xor));
+}
+
 /* Public: Return a Ruby Array containing the doubles within the data array. */
 static VALUE method_to_a(VALUE self)
 {
-	unsigned long i;
+	unsigned long long int i;
 	vector_t *vector;
 	d2v_t *data;
 	VALUE rb_array = rb_ary_new();
@@ -116,3 +140,21 @@ static void func_subtract(void *v1, void *v2, void *r)
 {
 	*(d2v *)r = *(d2v *)v1 - *(d2v *)v2;
 }
+
+/* Function: Perform a binary AND on two vectors. */
+static void func_and(void *v1, void *v2, void *r)
+{
+	*(l2v *)r = *(l2v *)v1 & *(l2v *)v2;
+}
+
+/* Function: Perform a binary OR on two vectors. */
+static void func_or(void *v1, void *v2, void *r)
+{
+	*(l2v *)r = *(l2v *)v1 | *(l2v *)v2;
+}
+
+/* Function: Perform a binary XOR on two vectors. */
+static void func_xor(void *v1, void *v2, void *r)
+{
+	*(l2v *)r = *(l2v *)v1 ^ *(l2v *)v2;
+}

data/ext/simd/simd_floatarray.h

@@ -6,9 +6,15 @@ static VALUE method_multiply(VALUE self, VALUE obj);
 static VALUE method_divide(VALUE self, VALUE obj);
 static VALUE method_add(VALUE self, VALUE obj);
 static VALUE method_subtract(VALUE self, VALUE obj);
+static VALUE method_and(VALUE self, VALUE obj);
+static VALUE method_or(VALUE self, VALUE obj);
+static VALUE method_xor(VALUE self, VALUE obj);
 static VALUE method_to_a(VALUE self);
 
 static void func_multiply(void *v1, void *v2, void *r);
 static void func_divide(void *v1, void *v2, void *r);
 static void func_add(void *v1, void *v2, void *r);
 static void func_subtract(void *v1, void *v2, void *r);
+static void func_and(void *v1, void *v2, void *r);
+static void func_or(void *v1, void *v2, void *r);
+static void func_xor(void *v1, void *v2, void *r);

data/ext/simd/simd_intarray.c

@@ -25,7 +25,7 @@ static VALUE method_initialize(VALUE self, VALUE rb_array)
 {
 	vector_t *vector;
 	i4v_t *data;
-	unsigned long n,i;
+	unsigned long long int n,i;
 
 	Check_Type(rb_array, T_ARRAY);
 	Data_Get_Struct(self, vector_t, vector);
@@ -102,7 +102,7 @@ static VALUE method_subtract(VALUE self, VALUE obj)
 /* Public: Return a Ruby Array containing the doubles within the data array. */
 static VALUE method_to_a(VALUE self)
 {
-	unsigned long i;
+	unsigned long long int i;
 	vector_t *vector;
 	i4v_t *data;
 	VALUE rb_array = rb_ary_new();

data/ext/simd/simd_intarray.h

@@ -5,10 +5,10 @@ static VALUE method_initialize(VALUE self, VALUE rb_array);
 static VALUE method_multiply(VALUE self, VALUE obj);
 static VALUE method_divide(VALUE self, VALUE obj);
 static VALUE method_add(VALUE self, VALUE obj);
+static VALUE method_subtract(VALUE self, VALUE obj);
 static VALUE method_and(VALUE self, VALUE obj);
 static VALUE method_or(VALUE self, VALUE obj);
 static VALUE method_xor(VALUE self, VALUE obj);
-static VALUE method_subtract(VALUE self, VALUE obj);
 static VALUE method_to_a(VALUE self);
 
 static void func_multiply(void *v1, void *v2, void *r);

data/ext/simd/simd_longarray.c

@@ -25,7 +25,7 @@ static VALUE method_initialize(VALUE self, VALUE rb_array)
 {
 	vector_t *vector;
 	l2v_t *data;
-	unsigned long n,i;
+	unsigned long long int n,i;
 
 	Check_Type(rb_array, T_ARRAY);
 	Data_Get_Struct(self, vector_t, vector);
@@ -45,7 +45,7 @@ static VALUE method_initialize(VALUE self, VALUE rb_array)
 		data[i/2].f[i%2] = NUM2LONG(rb_ary_entry(rb_array, i));
 	}
 
-	internal_sanitize_unaligned_final_vector(vector, sizeof(long));
+	internal_sanitize_unaligned_final_vector(vector, sizeof(long long int));
 
 	return(self);
 }
@@ -54,55 +54,55 @@ static VALUE method_initialize(VALUE self, VALUE rb_array)
  * another FloatArray object, returning a new FloatArray. */
 static VALUE method_multiply(VALUE self, VALUE obj)
 {
-	return(internal_apply_operation(self, obj, sizeof(long), SIMD_LongArray, func_multiply));
+	return(internal_apply_operation(self, obj, sizeof(long long int), SIMD_LongArray, func_multiply));
 }
 
 /* Public: Divide values contained in the data array by those contained in
  * another FloatArray object, returning a new FloatArray. */
 static VALUE method_divide(VALUE self, VALUE obj)
 {
-	return(internal_apply_operation(self, obj, sizeof(long), SIMD_LongArray, func_divide));
+	return(internal_apply_operation(self, obj, sizeof(long long int), SIMD_LongArray, func_divide));
 }
 
 /* Public: add values contained in the data array with those contained in
  * another FloatArray object, returning a new FloatArray. */
 static VALUE method_add(VALUE self, VALUE obj)
 {
-	return(internal_apply_operation(self, obj, sizeof(long), SIMD_LongArray, func_add));
+	return(internal_apply_operation(self, obj, sizeof(long long int), SIMD_LongArray, func_add));
 }
 
 /* Public: and values contained in the data array with those contained in
  * another FloatArray object, returning a new FloatArray. */
 static VALUE method_and(VALUE self, VALUE obj)
 {
-	return(internal_apply_operation(self, obj, sizeof(long), SIMD_LongArray, func_and));
+	return(internal_apply_operation(self, obj, sizeof(long long int), SIMD_LongArray, func_and));
 }
 
 /* Public: or values contained in the data array with those contained in
  * another FloatArray object, returning a new FloatArray. */
 static VALUE method_or(VALUE self, VALUE obj)
 {
-	return(internal_apply_operation(self, obj, sizeof(long), SIMD_LongArray, func_or));
+	return(internal_apply_operation(self, obj, sizeof(long long int), SIMD_LongArray, func_or));
 }
 
 /* Public: xor values contained in the data array with those contained in
  * another FloatArray object, returning a new FloatArray. */
 static VALUE method_xor(VALUE self, VALUE obj)
 {
-	return(internal_apply_operation(self, obj, sizeof(long), SIMD_LongArray, func_xor));
+	return(internal_apply_operation(self, obj, sizeof(long long int), SIMD_LongArray, func_xor));
 }
 
 /* Public: Subtract values contained in another FloatArray object from those
  * contained in the current data array object, returning a new FloatArray. */
 static VALUE method_subtract(VALUE self, VALUE obj)
 {
-	return(internal_apply_operation(self, obj, sizeof(long), SIMD_LongArray, func_subtract));
+	return(internal_apply_operation(self, obj, sizeof(long long int), SIMD_LongArray, func_subtract));
 }
 
 /* Public: Return a Ruby Array containing the doubles within the data array. */
 static VALUE method_to_a(VALUE self)
 {
-	unsigned long i;
+	unsigned long long int i;
 	vector_t *vector;
 	l2v_t *data;
 	VALUE rb_array = rb_ary_new();

data/ext/simd/simd_smallfloatarray.c

@@ -12,6 +12,9 @@ void Init_SIMD_SmallFloatArray(VALUE parent)
 	rb_define_method(SIMD_SmallFloatArray, "/", method_divide, 1);
 	rb_define_method(SIMD_SmallFloatArray, "+", method_add, 1);
 	rb_define_method(SIMD_SmallFloatArray, "-", method_subtract, 1);
+	rb_define_method(SIMD_SmallFloatArray, "&", method_and, 1);
+	rb_define_method(SIMD_SmallFloatArray, "|", method_or, 1);
+	rb_define_method(SIMD_SmallFloatArray, "^", method_xor, 1);
 	rb_define_method(SIMD_SmallFloatArray, "length", method_length, 0);
 	rb_define_method(SIMD_SmallFloatArray, "to_a", method_to_a, 0);
 }
@@ -22,7 +25,7 @@ static VALUE method_initialize(VALUE self, VALUE rb_array)
 {
 	vector_t *vector;
 	f4v_t *data;
-	unsigned long n,i;
+	unsigned long long int n,i;
 
 	Check_Type(rb_array, T_ARRAY);
 	Data_Get_Struct(self, vector_t, vector);
@@ -75,10 +78,31 @@ static VALUE method_subtract(VALUE self, VALUE obj)
 	return(internal_apply_operation(self, obj, sizeof(float), SIMD_SmallFloatArray, func_subtract));
 }
 
+/* Public: and values contained in the data array with those contained in
+ * another FloatArray object, returning a new FloatArray. */
+static VALUE method_and(VALUE self, VALUE obj)
+{
+	return(internal_apply_operation(self, obj, sizeof(float), SIMD_SmallFloatArray, func_and));
+}
+
+/* Public: or values contained in the data array with those contained in
+ * another FloatArray object, returning a new FloatArray. */
+static VALUE method_or(VALUE self, VALUE obj)
+{
+	return(internal_apply_operation(self, obj, sizeof(float), SIMD_SmallFloatArray, func_or));
+}
+
+/* Public: xor values contained in the data array with those contained in
+ * another FloatArray object, returning a new FloatArray. */
+static VALUE method_xor(VALUE self, VALUE obj)
+{
+	return(internal_apply_operation(self, obj, sizeof(float), SIMD_SmallFloatArray, func_xor));
+}
+
 /* Public: Return a Ruby Array containing the doubles within the data array. */
 static VALUE method_to_a(VALUE self)
 {
-	unsigned long i;
+	unsigned long long int i;
 	vector_t *vector;
 	f4v_t *data;
 	VALUE rb_array = rb_ary_new();
@@ -116,3 +140,21 @@ static void func_subtract(void *v1, void *v2, void *r)
 {
 	*(f4v *)r = *(f4v *)v1 - *(f4v *)v2;
 }
+
+/* Function: Perform a binary AND on two vectors. */
+static void func_and(void *v1, void *v2, void *r)
+{
+	*(i4v *)r = *(i4v *)v1 & *(i4v *)v2;
+}
+
+/* Function: Perform a binary OR on two vectors. */
+static void func_or(void *v1, void *v2, void *r)
+{
+	*(i4v *)r = *(i4v *)v1 | *(i4v *)v2;
+}
+
+/* Function: Perform a binary XOR on two vectors. */
+static void func_xor(void *v1, void *v2, void *r)
+{
+	*(i4v *)r = *(i4v *)v1 ^ *(i4v *)v2;
+}

data/ext/simd/simd_smallfloatarray.h

@@ -6,9 +6,15 @@ static VALUE method_multiply(VALUE self, VALUE obj);
 static VALUE method_divide(VALUE self, VALUE obj);
 static VALUE method_add(VALUE self, VALUE obj);
 static VALUE method_subtract(VALUE self, VALUE obj);
+static VALUE method_and(VALUE self, VALUE obj);
+static VALUE method_or(VALUE self, VALUE obj);
+static VALUE method_xor(VALUE self, VALUE obj);
 static VALUE method_to_a(VALUE self);
 
 static void func_multiply(void *v1, void *v2, void *r);
 static void func_divide(void *v1, void *v2, void *r);
 static void func_add(void *v1, void *v2, void *r);
 static void func_subtract(void *v1, void *v2, void *r);
+static void func_and(void *v1, void *v2, void *r);
+static void func_or(void *v1, void *v2, void *r);
+static void func_xor(void *v1, void *v2, void *r);

data/ext/simd/simd_types.h

@@ -40,17 +40,17 @@ typedef union i4v_t
 /*
  * Types for LongArray
  */
-typedef long int __attribute__ ((vector_size (16))) l2v;
+typedef long long int __attribute__ ((vector_size (16))) l2v;
 typedef union l2v_t
 {
 	l2v v;
-	long int f[2];
+	long long int f[2];
 } l2v_t;
 
 typedef struct vector_t
 {
 	void *data;
-	unsigned long len;
+	unsigned long long int len;
 } vector_t;
 
 typedef void (b_operation)(void *v1, void *v2, void *r);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simd
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tina Wuest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: SIMD instructions in ruby