From 7cf81a6d9a52f1eb37ef59ad99920cf37cf23a2e Mon Sep 17 00:00:00 2001
From: Ryan Oldenburg <ryan@guzba.com>
Date: Sat, 23 Jul 2022 12:57:23 -0500
Subject: [PATCH] update macro procSignature

---
 src/pixie/masks.nim         |  2 +-
 src/pixie/simd.nim          |  4 ++--
 src/pixie/simd/internal.nim | 24 ++++++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/pixie/masks.nim b/src/pixie/masks.nim
index 9927088..ea52af1 100644
--- a/src/pixie/masks.nim
+++ b/src/pixie/masks.nim
@@ -1,4 +1,4 @@
-import common, internal, simd, system/memory, vmath
+import common, internal, simd, vmath
 
 export Mask, newMask
 
diff --git a/src/pixie/simd.nim b/src/pixie/simd.nim
index 57b0b8d..f039b1a 100644
--- a/src/pixie/simd.nim
+++ b/src/pixie/simd.nim
@@ -1,6 +1,6 @@
-import simd/internal
+import simd/internal, system/memory
 
-export internal
+export internal, memory
 
 const allowSimd* = not defined(pixieNoSimd) and not defined(tcc)
 
diff --git a/src/pixie/simd/internal.nim b/src/pixie/simd/internal.nim
index ce804a7..1808ac8 100644
--- a/src/pixie/simd/internal.nim
+++ b/src/pixie/simd/internal.nim
@@ -21,9 +21,9 @@ proc procReturnType(procedure: NimNode): NimNode =
   ## Given a procedure this gets the return type.
   procedure[3][0]
 
-proc procSignature(procName: string, procedure: NimNode): string =
+proc procSignature(procedure: NimNode): string =
   ## Given a procedure this returns the signature as a string.
-  result = procName & "("
+  result = "("
 
   for i, arg in procedure[3]:
     if i > 0:
@@ -35,6 +35,10 @@ proc procSignature(procName: string, procedure: NimNode): string =
 
   result &= ")"
 
+  let ret = procedure.procReturnType()
+  if ret.kind != nnkEmpty:
+    result &= ": " & ret.repr
+
 proc callAndReturn(name: NimNode, procedure: NimNode): NimNode =
   ## Produces a procedure call with arguments.
   let
@@ -52,7 +56,7 @@ proc callAndReturn(name: NimNode, procedure: NimNode): NimNode =
       return `call`
 
 macro simd*(procedure: untyped) =
-  let signature = procSignature(procedure.procName(), procedure)
+  let signature = procedure.procName() & procSignature(procedure)
   simdProcs[signature] = procedure.copy()
   return procedure
 
@@ -72,26 +76,26 @@ macro hasSimd*(procedure: untyped) =
     body = newStmtList()
 
   when defined(amd64) and not defined(pixieNoAvx):
-    if procSignature(nameAvx2, procedure) in simdProcs:
+    if nameAvx2 & procSignature(procedure) in simdProcs:
       foundSimd = true
       body.add quote do:
         if cpuHasAvx2:
           `callAvx2`
 
-    if procSignature(nameAvx, procedure) in simdProcs:
+    if nameAvx & procSignature(procedure) in simdProcs:
       foundSimd = true
       body.add quote do:
         if cpuHasAvx2:
           `callAvx`
 
-  if procSignature(nameSse2, procedure) in simdProcs:
+  if nameSse2 & procSignature(procedure) in simdProcs:
     foundSimd = true
-    let bodySse2 = simdProcs[procSignature(nameSse2, procedure)][6]
+    let bodySse2 = simdProcs[nameSse2 & procSignature(procedure)][6]
     body.add quote do:
       `bodySse2`
-  elif procSignature(nameNeon, procedure) in simdProcs:
+  elif nameNeon & procSignature(procedure) in simdProcs:
     foundSimd = true
-    let bodyNeon = simdProcs[procSignature(nameNeon, procedure)][6]
+    let bodyNeon = simdProcs[nameNeon & procSignature(procedure)][6]
     body.add quote do:
       `bodyNeon`
   else:
@@ -102,6 +106,6 @@ macro hasSimd*(procedure: untyped) =
 
   when not defined(pixieNoSimd):
     if not foundSimd:
-      echo "No SIMD found for " & procSignature(name, procedure)
+      echo "No SIMD found for " & name & procSignature(procedure)
 
   return procedure