Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

core.simd: Fix simd templates to take parameters by reference #3155

Closed
ibuclaw wants to merge 2 commits into from
Closed

core.simd: Fix simd templates to take parameters by reference #3155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0426d3
core.simd: Fix simd templates to take parameters by reference
ibuclaw Jul 10, 2020
f786981
core.internal.array.operations: Use simd templates
ibuclaw Jul 10, 2020
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
12 changes: 6 additions & 6 deletions src/core/internal/array/operations.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ version (DigitalMars)
alias vec = __vector(T[N]);

static if (is(T == float))
cast(void) __simd_sto(XMM.STOUPS, *cast(vec*) p, val);
cast(void) simd_sto!(XMM.STOUPS)(*cast(vec*) p, val);
else static if (is(T == double))
cast(void) __simd_sto(XMM.STOUPD, *cast(vec*) p, val);
cast(void) simd_sto!(XMM.STOUPD)(*cast(vec*) p, val);
else
cast(void) __simd_sto(XMM.STODQU, *cast(vec*) p, val);
cast(void) simd_sto!(XMM.STODQU)(*cast(vec*) p, val);
}

const(__vector(T[N])) load(T, size_t N)(const scope T* p)
Expand All @@ -103,11 +103,11 @@ version (DigitalMars)
alias vec = __vector(T[N]);

static if (is(T == float))
return __simd(XMM.LODUPS, *cast(const vec*) p);
return simd!(XMM.LODUPS)(*cast(const vec*) p);
else static if (is(T == double))
return __simd(XMM.LODUPD, *cast(const vec*) p);
return simd!(XMM.LODUPD)(*cast(const vec*) p);
else
return __simd(XMM.LODDQU, *cast(const vec*) p);
return simd!(XMM.LODDQU)(*cast(const vec*) p);
}

__vector(T[N]) binop(string op, T, size_t N)(const scope __vector(T[N]) a, const scope __vector(T[N]) b)
Expand Down
22 changes: 11 additions & 11 deletions src/core/simd.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ version (D_SIMD)
* Returns:
* result of opcode
*/
pure @safe V1 simd(XMM opcode, V1, V2)(V1 op1, V2 op2)
pure @safe V1 simd(XMM opcode, V1, V2)(ref V1 op1, ref V2 op2)
if (is(V1 == __vector) && is(V2 == __vector))
{
pragma(inline, true);
Expand All @@ -427,23 +427,23 @@ version (D_SIMD)
/**
* Unary SIMD instructions.
*/
pure @safe V1 simd(XMM opcode, V1)(V1 op1)
pure @safe V1 simd(XMM opcode, V1)(ref V1 op1)
if (is(V1 == __vector))
{
pragma(inline, true);
return cast(V1)__simd(opcode, op1);
}

///
pure @safe V1 simd(XMM opcode, V1)(double d)
pure @safe V1 simd(XMM opcode, V1)(ref double d)
if (is(V1 == __vector))
{
pragma(inline, true);
return cast(V1)__simd(opcode, d);
}

///
pure @safe V1 simd(XMM opcode, V1)(float f)
pure @safe V1 simd(XMM opcode, V1)(ref float f)
if (is(V1 == __vector))
{
pragma(inline, true);
Expand Down Expand Up @@ -476,7 +476,7 @@ version (D_SIMD)
* Returns:
* result of opcode
*/
pure @safe V1 simd(XMM opcode, ubyte imm8, V1, V2)(V1 op1, V2 op2)
pure @safe V1 simd(XMM opcode, ubyte imm8, V1, V2)(ref V1 op1, ref V2 op2)
if (is(V1 == __vector) && is(V2 == __vector))
{
pragma(inline, true);
Expand All @@ -503,7 +503,7 @@ version (D_SIMD)
* Returns:
* result of opcode
*/
pure @safe V1 simd(XMM opcode, ubyte imm8, V1)(V1 op1)
pure @safe V1 simd(XMM opcode, ubyte imm8, V1)(ref V1 op1)
if (is(V1 == __vector))
{
pragma(inline, true);
Expand All @@ -526,23 +526,23 @@ version (D_SIMD)
* op2
* These cannot be marked as pure, as semantic() doesn't check them.
*/
@safe V1 simd_sto(XMM opcode, V1, V2)(V1 op1, V2 op2)
@safe V1 simd_sto(XMM opcode, V1, V2)(ref V1 op1, V2 op2)
if (is(V1 == __vector) && is(V2 == __vector))
{
pragma(inline, true);
return cast(V1)__simd_sto(opcode, op1, op2);
}

///
@safe V1 simd_stod(XMM opcode, V1, V2)(double op1, V1 op2)
@safe V1 simd_stod(XMM opcode, V1)(ref double op1, V1 op2)
if (is(V1 == __vector))
{
pragma(inline, true);
return cast(V1)__simd_sto(opcode, op1, op2);
}

///
@safe V1 simd_stof(XMM opcode, V1)(float op1, V1 op2)
@safe V1 simd_stof(XMM opcode, V1)(ref float op1, V1 op2)
if (is(V1 == __vector))
{
pragma(inline, true);
Expand All @@ -561,8 +561,8 @@ version (D_SIMD)
double d = 1;

cast(void)simd_sto!(XMM.STOUPS)(a, a);
//simd_sto!(XMM.STOUPS)(f, a);
//simd_sto!(XMM.STOUPS)(d, a);
cast(void)simd_stof!(XMM.STOUPS)(f, a);
cast(void)simd_stod!(XMM.STOUPS)(d, a);
}

/* The following use overloading to ensure correct typing.
Expand Down