Some changes to hadle different vector width

This commit is contained in:
Vsevolod Livinskiy
2015-02-27 10:27:53 +03:00
parent 0644b4a7fd
commit a98bfdf011
4 changed files with 106 additions and 58 deletions

View File

@@ -159,6 +159,51 @@ PRE_ALIGN(128) struct __vec16_i64 : public vec16<int64_t> {
v8, v9, v10, v11, v12, v13, v14, v15) { }
} POST_ALIGN(128);
template <int num_bits>
struct iN {
int num[num_bits / (sizeof (int) * 8)];
iN () {}
iN (const char *val) {
if (val == NULL)
return;
int length = num_bits / (sizeof (int) * 8);
int val_len = 0;
for (val_len = 0; val[val_len]; (val_len)++);
for (int i = 0; (i < val_len && i < num_bits); i++)
num[i / (sizeof (int) * 8)] = (num[i / (sizeof (int) * 8)] << 1) | (val[i] - '0');
}
~iN () {}
iN operator >> (const iN rhs) {
iN res;
int length = num_bits / (sizeof (int) * 8);
int cells = rhs.num[0] / (sizeof(int) * 8);
for (int i = 0; i < (length - cells); i++)
res.num[i] = this->num[cells + i];
return res;
}
iN operator & (iN rhs) {
iN res;
int length = num_bits / (sizeof (int) * 8);
for (int i = 0; i < length; i++)
res.num[i] = (this->num[i]) & (rhs.num[i]);
return res;
}
operator uint32_t() { return this->num[0]; }
};
template <class T>
T __cast_bits (T to, __vec16_i32 from) {
for (int i = 0; i < 16; i++)
to.num[i] = ((uint32_t*)(&from))[i] ;
return to;
}
///////////////////////////////////////////////////////////////////////////
// macros...

View File

@@ -32,9 +32,7 @@
*/
#include <limits.h> // INT_MIN
#include <cstring>
#include <stdint.h>
#include <stdlib.h>
#include <math.h>
#include <assert.h>
#include <unistd.h>
@@ -82,9 +80,9 @@ extern "C" {
int puts(unsigned char *);
unsigned int putchar(unsigned int);
int fflush(void *);
// uint8_t *memcpy(uint8_t *, uint8_t *, uint64_t);
// uint8_t *memset(uint8_t *, uint8_t, uint64_t);
// void memset_pattern16(void *, const void *, uint64_t);
uint8_t *memcpy(uint8_t *, uint8_t *, uint64_t);
uint8_t *memset(uint8_t *, uint8_t, uint64_t);
void memset_pattern16(void *, const void *, uint64_t);
}
typedef float __vec1_f;
@@ -101,40 +99,19 @@ struct iN {
int num[num_bits / (sizeof (int) * 8)];
iN () {}
iN (int val) {
num [0] = val;
}
template<class T>
iN (T *val) {
int length = num_bits / (sizeof (int) * 8);
for (int i = 0; i < length; i++)
num[i] = val[i];
}
iN (const char *val) {
if (val == NULL)
return;
int length = num_bits / (sizeof (int) * 8);
for (int i = 0; (i < strlen(val) && i < num_bits); i++)
int val_len = 0;
for (val_len = 0; val[val_len]; (val_len)++);
for (int i = 0; (i < val_len && i < num_bits); i++)
num[i / (sizeof (int) * 8)] = (num[i / (sizeof (int) * 8)] << 1) | (val[i] - '0');
}
/*
iN (const iN &a) {
int length = num_bits / (sizeof (int) * 8);
for (int i = 0; i < length; i++)
num[i] = a.num[i];
}
*/
~iN () {}
/*
iN operator >> (const int rhs) {
iN res;
int cells = rhs / (sizeof(int) * 8);
for (int i = 0; i < (this->length - cells); i++)
res.num[i] = this->num[cells + i];
return res;
}
*/
iN operator >> (const iN rhs) {
iN res;
int length = num_bits / (sizeof (int) * 8);
@@ -152,18 +129,6 @@ struct iN {
return res;
}
/*
iN& operator = (iN rhs) {
iN swap;
int length = num_bits / (sizeof (int) * 8);
for (int i = 0; i < length; i++) {
swap.num[i] = this->num[i];
this->num[i] = rhs.num[i];
rhs.num[i] = swap.num[i];
}
return *this;
}
*/
operator uint32_t() { return this->num[0]; }
};

View File

@@ -179,6 +179,50 @@ FORCEINLINE __vec4_i64::__vec4_i64(__vec4_d vd) {
v[1] = _mm_castpd_si128(vd.v[1]);
}
template <int num_bits>
struct iN {
int num[num_bits / (sizeof (int) * 8)];
iN () {}
iN (const char *val) {
if (val == NULL)
return;
int length = num_bits / (sizeof (int) * 8);
int val_len = 0;
for (val_len = 0; val[val_len]; (val_len)++);
for (int i = 0; (i < val_len && i < num_bits); i++)
num[i / (sizeof (int) * 8)] = (num[i / (sizeof (int) * 8)] << 1) | (val[i] - '0');
}
~iN () {}
iN operator >> (const iN rhs) {
iN res;
int length = num_bits / (sizeof (int) * 8);
int cells = rhs.num[0] / (sizeof(int) * 8);
for (int i = 0; i < (length - cells); i++)
res.num[i] = this->num[cells + i];
return res;
}
iN operator & (iN rhs) {
iN res;
int length = num_bits / (sizeof (int) * 8);
for (int i = 0; i < length; i++)
res.num[i] = (this->num[i]) & (rhs.num[i]);
return res;
}
operator uint32_t() { return this->num[0]; }
};
template <class T>
T __cast_bits (T to, __vec4_i32 from) {
for (int i = 0; i < 16; i++)
to.num[i] = ((uint32_t*)(&from))[i] ;
return to;
}
///////////////////////////////////////////////////////////////////////////
// SSE helpers / utility functions