From f9082b18545ba9766e00fa1cb5b93d8430690ea0 Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Sat, 11 Jul 2020 00:53:49 +0200
Subject: [PATCH] Revert #1900 - Add overrides for __simd intrinsics

---
 src/core/simd.d | 99 ++++++++-----------------------------------------
 1 file changed, 16 insertions(+), 83 deletions(-)

diff --git a/src/core/simd.d b/src/core/simd.d
index fb612e7906..473a6e1fbe 100644
--- a/src/core/simd.d
+++ b/src/core/simd.d
@@ -408,57 +408,27 @@ version (D_SIMD)
     * Returns:
     *      result of opcode
     */
-    pure @safe V1 simd(XMM opcode, V1, V2)(V1 op1, V2 op2)
-        if (is(V1 == __vector) && is(V2 == __vector))
-    {
-        pragma(inline, true);
-        return cast(V1)__simd(opcode, op1, op2);
-    }
-
-    pure @safe void16 __simd(XMM opcode, void16 op1, void16 op2); // intrinsic
+    pure @safe void16 __simd(XMM opcode, void16 op1, void16 op2);
 
     ///
     unittest
     {
         float4 a;
-        a = simd!(XMM.PXOR)(a, a);
+        a = cast(float4)__simd(XMM.PXOR, a, a);
     }
 
     /**
     * Unary SIMD instructions.
     */
-    pure @safe V1 simd(XMM opcode, V1)(V1 op1)
-        if (is(V1 == __vector))
-    {
-        pragma(inline, true);
-        return cast(V1)__simd(opcode, op1);
-    }
-
-    ///
-    pure @safe V1 simd(XMM opcode, V1)(double d)
-        if (is(V1 == __vector))
-    {
-        pragma(inline, true);
-        return cast(V1)__simd(opcode, d);
-    }
-
-    ///
-    pure @safe V1 simd(XMM opcode, V1)(float f)
-        if (is(V1 == __vector))
-    {
-        pragma(inline, true);
-        return cast(V1)__simd(opcode, f);
-    }
-
-    pure @safe void16 __simd(XMM opcode, void16 op1); // intrinsic
-    pure @safe void16 __simd(XMM opcode, double d);   // intrinsic
-    pure @safe void16 __simd(XMM opcode, float f);    // intrinsic
+    pure @safe void16 __simd(XMM opcode, void16 op1);
+    pure @safe void16 __simd(XMM opcode, double d);   ///
+    pure @safe void16 __simd(XMM opcode, float f);    ///
 
     ///
     unittest
     {
         float4 a;
-        a = simd!(XMM.LODSS)(a);
+        a = cast(float4)__simd(XMM.LODSS, a);
     }
 
     /****
@@ -476,20 +446,13 @@ version (D_SIMD)
     * Returns:
     *      result of opcode
     */
-    pure @safe V1 simd(XMM opcode, ubyte imm8, V1, V2)(V1 op1, V2 op2)
-        if (is(V1 == __vector) && is(V2 == __vector))
-    {
-        pragma(inline, true);
-        return cast(V1)__simd(opcode, op1, op2, imm8);
-    }
-
-    pure @safe void16 __simd(XMM opcode, void16 op1, void16 op2, ubyte imm8); // intrinsic
+    pure @safe void16 __simd(XMM opcode, void16 op1, void16 op2, ubyte imm8);
 
     ///
     unittest
     {
         float4 a;
-        a = simd!(XMM.CMPPD, 0x7A)(a, a);
+        a = cast(float4)__simd(XMM.CMPPD, a, a, 0x7A);
     }
 
     /***
@@ -503,20 +466,13 @@ version (D_SIMD)
     * Returns:
     *      result of opcode
     */
-    pure @safe V1 simd(XMM opcode, ubyte imm8, V1)(V1 op1)
-        if (is(V1 == __vector))
-    {
-        pragma(inline, true);
-        return cast(V1)__simd_ib(opcode, op1, imm8);
-    }
-
-    pure @safe void16 __simd_ib(XMM opcode, void16 op1, ubyte imm8);  // intrinsic
+    pure @safe void16 __simd_ib(XMM opcode, void16 op1, ubyte imm8);
 
     ///
     unittest
     {
         float4 a;
-        a = simd!(XMM.PSRLQ, 0x7A)(a);
+        a = cast(float4) __simd_ib(XMM.PSRLQ, a, 0x7A);
     }
 
     /*****
@@ -526,32 +482,9 @@ 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)
-        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)
-        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)
-        if (is(V1 == __vector))
-    {
-        pragma(inline, true);
-        return cast(V1)__simd_sto(opcode, op1, op2);
-    }
-
-    @safe void16 __simd_sto(XMM opcode, void16 op1, void16 op2);  // intrinsic
-    @safe void16 __simd_sto(XMM opcode, double op1, void16 op2);  // intrinsic
-    @safe void16 __simd_sto(XMM opcode, float op1, void16 op2);   // intrinsic
+    @safe void16 __simd_sto(XMM opcode, void16 op1, void16 op2);
+    @safe void16 __simd_sto(XMM opcode, double op1, void16 op2); ///
+    @safe void16 __simd_sto(XMM opcode, float op1, void16 op2);  ///
 
     ///
     unittest
@@ -560,9 +493,9 @@ version (D_SIMD)
         float f = 1;
         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_sto(XMM.STOUPS, a, a);
+        cast(void)__simd_sto(XMM.STOUPS, f, a);
+        cast(void)__simd_sto(XMM.STOUPS, d, a);
     }
 
     /* The following use overloading to ensure correct typing.