Skip to content

Removed superfluous SIMD wrappers #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stefanatwork wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed superfluous SIMD wrappers #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 0 additions & 68 deletions common/simd/arm/simd_wrapper_types.h
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions common/simd/vboolf4_sse2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#pragma once

#include "arm/simd_wrapper_types.h"

#define vboolf vboolf_impl
#define vboold vboold_impl
#define vint vint_impl
Expand All @@ -26,7 +24,7 @@ namespace embree
typedef vfloat4 Float;

enum { size = 4 }; // number of SIMD elements
union { __m128_wrapper v; int i[4]; }; // data
union { __m128 v; int i[4]; }; // data

////////////////////////////////////////////////////////////////////////////////
/// Constructors, Assignment & Cast Operators
Expand All @@ -37,10 +35,10 @@ namespace embree
__forceinline vboolf4& operator =(const vboolf4& other) { v = other.v; return *this; }

__forceinline vboolf(__m128 input) : v(input) {}
__forceinline operator const __m128&() const { return v.data; }
__forceinline operator const __m128&() const { return v; }
#if !defined(__EMSCRIPTEN__)
__forceinline const __m128i m128i() const { return _mm_castps_si128(v.data); }
__forceinline const __m128d m128d() const { return _mm_castps_pd(v.data); }
__forceinline const __m128i m128i() const { return _mm_castps_si128(v); }
__forceinline const __m128d m128d() const { return _mm_castps_pd(v); }
#endif

__forceinline vboolf(bool a)
Expand Down
8 changes: 3 additions & 5 deletions common/simd/vfloat4_sse2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

#pragma once

#include "arm/simd_wrapper_types.h"

#define vboolf vboolf_impl
#define vboold vboold_impl
#define vint vint_impl
Expand All @@ -26,7 +24,7 @@ namespace embree
typedef vfloat4 Float;

enum { size = 4 }; // number of SIMD elements
union { __m128_wrapper v; float f[4]; int i[4]; }; // data
union { __m128 v; float f[4]; int i[4]; }; // data

////////////////////////////////////////////////////////////////////////////////
/// Constructors, Assignment & Cast Operators
Expand All @@ -39,8 +37,8 @@ namespace embree
__forceinline vfloat4& operator =(const vfloat4& other) { v = other.v; return *this; }

__forceinline vfloat(__m128 a) : v(a) {}
__forceinline operator const __m128&() const { return v.data; }
__forceinline operator __m128&() { return v.data; }
__forceinline operator const __m128&() const { return v; }
__forceinline operator __m128&() { return v; }

__forceinline vfloat(float a) : v(_mm_set1_ps(a)) {}
__forceinline vfloat(float a, float b, float c, float d) : v(_mm_set_ps(d, c, b, a)) {}
Expand Down
7 changes: 3 additions & 4 deletions common/simd/vint4_sse2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include "arm/simd_wrapper_types.h"
#include "../math/emath.h"

#define vboolf vboolf_impl
Expand All @@ -27,7 +26,7 @@ namespace embree
typedef vfloat4 Float;

enum { size = 4 }; // number of SIMD elements
union { __m128i_wrapper v; int i[4]; }; // data
union { __m128i v; int i[4]; }; // data

////////////////////////////////////////////////////////////////////////////////
/// Constructors, Assignment & Cast Operators
Expand All @@ -38,8 +37,8 @@ namespace embree
__forceinline vint4& operator =(const vint4& a) { v = a.v; return *this; }

__forceinline vint(__m128i a) : v(a) {}
__forceinline operator const __m128i&() const { return v.data; }
__forceinline operator __m128i&() { return v.data; }
__forceinline operator const __m128i&() const { return v; }
__forceinline operator __m128i&() { return v; }

__forceinline vint(int a) : v(_mm_set1_epi32(a)) {}
__forceinline vint(int a, int b, int c, int d) : v(_mm_set_epi32(d, c, b, a)) {}
Expand Down
7 changes: 3 additions & 4 deletions common/simd/vuint4_sse2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#pragma once

#include "arm/simd_wrapper_types.h"
#include "../math/emath.h"

#define vboolf vboolf_impl
Expand All @@ -27,7 +26,7 @@ namespace embree
typedef vfloat4 Float;

enum { size = 4 }; // number of SIMD elements
union { __m128i_wrapper v; unsigned int i[4]; }; // data
union { __m128i v; unsigned int i[4]; }; // data

////////////////////////////////////////////////////////////////////////////////
/// Constructors, Assignment & Cast Operators
Expand All @@ -38,8 +37,8 @@ namespace embree
__forceinline vuint4& operator =(const vuint4& a) { v = a.v; return *this; }

__forceinline vuint(const __m128i a) : v(a) {}
__forceinline operator const __m128i&() const { return v.data; }
__forceinline operator __m128i&() { return v.data; }
__forceinline operator const __m128i&() const { return v; }
__forceinline operator __m128i&() { return v; }


__forceinline vuint(unsigned int a) : v(_mm_set1_epi32(a)) {}
Expand Down
Loading